From cd08d8cf1cc9bef54bf74c41357352d114e5416e Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 5 Aug 2007 03:48:09 +0000
Subject: [PATCH] Add missing licence header to all files in res

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@562813 13f79535-47bb-0310-9956-ffa450edef68
---
 res/confinstall/server_1.xml       |  17 ++
 res/confinstall/tomcat-users_1.xml |  16 ++
 res/maven/annotations-api.pom      |  29 +++-
 res/maven/catalina-ha.pom          |  95 ++++++-----
 res/maven/catalina.pom             |  87 ++++++----
 res/maven/coyote.pom               |  71 +++++---
 res/maven/el-api.pom               |  31 +++-
 res/maven/jasper-el.pom            |  19 ++-
 res/maven/jasper-jdt.pom           |  31 +++-
 res/maven/jasper.pom               | 119 +++++++------
 res/maven/jsp-api.pom              |  59 ++++---
 res/maven/juli-adapters.pom        |  59 ++++---
 res/maven/juli-extras.pom          |  31 +++-
 res/maven/juli.pom                 |  31 +++-
 res/maven/mvn-pub.xml              | 340 +++++++++++++++++++------------------
 res/maven/mvn.properties.default   |  71 +++++---
 res/maven/servlet-api.pom          |  31 +++-
 res/maven/tribes.pom               |  47 +++--
 res/tomcat.nsi                     |  14 ++
 res/welcome.bin.html               |  16 ++
 res/welcome.main.html              |  16 ++
 21 files changed, 789 insertions(+), 441 deletions(-)

diff --git a/res/confinstall/server_1.xml b/res/confinstall/server_1.xml
index 110f96885..f997fb786 100644
--- a/res/confinstall/server_1.xml
+++ b/res/confinstall/server_1.xml
@@ -1,3 +1,20 @@
+<?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.
+-->
 <!-- Note:  A "Server" is not itself a "Container", so you may not
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
diff --git a/res/confinstall/tomcat-users_1.xml b/res/confinstall/tomcat-users_1.xml
index c95978b64..c0fae761e 100644
--- a/res/confinstall/tomcat-users_1.xml
+++ b/res/confinstall/tomcat-users_1.xml
@@ -1,2 +1,18 @@
 <?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.
+-->
 <tomcat-users>
diff --git a/res/maven/annotations-api.pom b/res/maven/annotations-api.pom
index d1c1f13e5..8b24b9cf4 100644
--- a/res/maven/annotations-api.pom
+++ b/res/maven/annotations-api.pom
@@ -1,7 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>annotations-api</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Annotations Package</description>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>annotations-api</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Annotations Package</description>
 </project>
\ No newline at end of file
diff --git a/res/maven/catalina-ha.pom b/res/maven/catalina-ha.pom
index 5c1ab5d33..92685fc4b 100644
--- a/res/maven/catalina-ha.pom
+++ b/res/maven/catalina-ha.pom
@@ -1,39 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>catalina-ha</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Tomcat High Availability Implementation</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>coyote</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tribes</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>catalina-ha</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Tomcat High Availability Implementation</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>coyote</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>juli</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tribes</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>catalina</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/res/maven/catalina.pom b/res/maven/catalina.pom
index b2c669b68..1586f96dd 100644
--- a/res/maven/catalina.pom
+++ b/res/maven/catalina.pom
@@ -1,35 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>catalina</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Tomcat Servlet Engine Core Classes and Standard implementations</description>
-  <dependencies>
-    <!--
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>coyote</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    -->
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>annotations-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>catalina</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Tomcat Servlet Engine Core Classes and Standard implementations</description>
+  <dependencies>
+    <!--
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>coyote</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    -->
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>juli</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>annotations-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/res/maven/coyote.pom b/res/maven/coyote.pom
index e6502a3dd..e8727ad24 100644
--- a/res/maven/coyote.pom
+++ b/res/maven/coyote.pom
@@ -1,27 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>coyote</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Tomcat Connectors and HTTP parser</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>coyote</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Tomcat Connectors and HTTP parser</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>catalina</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>juli</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/res/maven/el-api.pom b/res/maven/el-api.pom
index b6790833b..637648fa5 100644
--- a/res/maven/el-api.pom
+++ b/res/maven/el-api.pom
@@ -1,7 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>el-api</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Expression language package</description>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>el-api</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Expression language package</description>
+</project>
diff --git a/res/maven/jasper-el.pom b/res/maven/jasper-el.pom
index 692cc9551..dee9205b4 100644
--- a/res/maven/jasper-el.pom
+++ b/res/maven/jasper-el.pom
@@ -1,4 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?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.
+-->
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.tomcat</groupId>
   <artifactId>jasper-el</artifactId>
diff --git a/res/maven/jasper-jdt.pom b/res/maven/jasper-jdt.pom
index 9c2f50646..5aaed2270 100644
--- a/res/maven/jasper-jdt.pom
+++ b/res/maven/jasper-jdt.pom
@@ -1,7 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>jasper-jdt</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Jasper javac compiler extension for Eclipse JDT</description>
-</project> 
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>jasper-jdt</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Jasper javac compiler extension for Eclipse JDT</description>
+</project> 
diff --git a/res/maven/jasper.pom b/res/maven/jasper.pom
index c6d258e33..6fdcf6f16 100644
--- a/res/maven/jasper.pom
+++ b/res/maven/jasper.pom
@@ -1,51 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>jasper</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Tomcats JSP Parser</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>catalina</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>el-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>jasper-jdt</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>jasper-el</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>jasper</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Tomcats JSP Parser</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>juli</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>catalina</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>el-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>jasper-jdt</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>jasper-el</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/res/maven/jsp-api.pom b/res/maven/jsp-api.pom
index 186018bbc..d96a5e6c6 100644
--- a/res/maven/jsp-api.pom
+++ b/res/maven/jsp-api.pom
@@ -1,21 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>jsp-api</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>JSP package</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>el-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>jsp-api</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>JSP package</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>el-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/res/maven/juli-adapters.pom b/res/maven/juli-adapters.pom
index 6fb12ebaf..81bfddcef 100644
--- a/res/maven/juli-adapters.pom
+++ b/res/maven/juli-adapters.pom
@@ -1,21 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat.extras</groupId>
-  <artifactId>juli-adapters</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Adapters to plug in other logging frameworks in Tomcat</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tomcat.extras</groupId>
-      <artifactId>juli</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat.extras</groupId>
+  <artifactId>juli-adapters</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Adapters to plug in other logging frameworks in Tomcat</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat.extras</groupId>
+      <artifactId>juli</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/res/maven/juli-extras.pom b/res/maven/juli-extras.pom
index 10fa0afe1..aabdebe7e 100644
--- a/res/maven/juli-extras.pom
+++ b/res/maven/juli-extras.pom
@@ -1,7 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat.extras</groupId>
-  <artifactId>juli</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Replacement for Tomcat Core Logging Package</description>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat.extras</groupId>
+  <artifactId>juli</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Replacement for Tomcat Core Logging Package</description>
+</project>
diff --git a/res/maven/juli.pom b/res/maven/juli.pom
index 22ddb975a..b7699de7a 100644
--- a/res/maven/juli.pom
+++ b/res/maven/juli.pom
@@ -1,7 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>juli</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Tomcat Core Logging Package</description>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>juli</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Tomcat Core Logging Package</description>
+</project>
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index e7a96f194..679477382 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -1,162 +1,178 @@
-<?xml version="1.0"?>
-<project name="Tomcat 6.0" default="deploy" basedir=".">
-
-  <!--
-  Properties required to be set:
-  maven.home - full path to Maven2 installation, mvn or mvn.bat is assumed to be in ${maven.home}/bin/
-  maven.bin  - the script to execute for maven, would be mvn or mvn.bat
-  maven.repo.url - the URL of the repository, for example scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
-  maven.repo.repositoryId - the id of the repository, for example apache.snapshots
-  maven.deploy.version - the version that the components will be deployed as, for example @MAVEN.DEPLOY.VERSION@
-  tomcat.lib.path - the path to tomcat JAR files
-  tomcat.bin.path - the path to tomcat's bin directory (for other JAR files)
-  tomcat.pom.path - the path to the POM files
-  All these can be defined by mvn.properties (and defaults are in mvn.properties.default)
-  
-  To do password less upload, you can modify either
-  $MAVE_HOME/conf/settings.xml or ~/.m2/settings.xml and add this snippet
-    <server>
-      <id>apache.snapshots</id>
-      <username>yourusername</username>
-      <privateKey>/home/yourusername/.ssh/id_rsa</privateKey>
-      <passphrase></passphrase>
-    </server>
-  -->
-  <property file="${basedir}/mvn.properties"/>
-  <property file="${basedir}/mvn.properties.default"/>
-  
-  <target name="maven-deploy">
-    <!--replace the version in the pom-->
-    <copy file="${pom}" tofile="${pom}.tmp">
-      <filterset>
-        <filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
-      </filterset>
-    </copy>
-    <exec executable="${maven.home}/bin/${maven.bin}" failonerror="true">
-      <env key="MAVEN_HOME" value="${maven.home}"/>
-      <arg value="deploy:deploy-file"/>
-      <arg value="-Dfile=${file}"/>
-      <arg value="-DgroupId=${groupId}"/>
-      <arg value="-DartifactId=${artifactId}"/>
-      <arg value="-Dversion=${maven.deploy.version}"/>
-      <arg value="-Dpackaging=jar"/>
-      <arg value="-DgeneratePom=false"/>
-      <arg value="-DrepositoryId=${maven.repo.repositoryId}"/>
-      <arg value="-Durl=${maven.repo.url}"/>
-      <arg value="-DpomFile=${pom}.tmp"/>
-    </exec>
-    <delete file="${pom}.tmp"/>
-  </target>
-  
-  <target name="generic-deploy">
-    <antcall target="maven-deploy"><!--Deploy annotations-->
-      <param name="file" value="${tomcat.lib.path}/annotations-api.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="annotations-api"/>
-      <param name="pom" value="${tomcat.pom.path}/annotations-api.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Servlet api-->
-      <param name="file" value="${tomcat.lib.path}/servlet-api.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="servlet-api"/>
-      <param name="pom" value="${tomcat.pom.path}/servlet-api.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy expression lanaguage api-->
-      <param name="file" value="${tomcat.lib.path}/el-api.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="el-api"/>
-      <param name="pom" value="${tomcat.pom.path}/el-api.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy JSP api-->
-      <param name="file" value="${tomcat.lib.path}/jsp-api.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="jsp-api"/>
-      <param name="pom" value="${tomcat.pom.path}/jsp-api.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy JULI-->
-      <param name="file" value="${tomcat.bin.path}/tomcat-juli.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="juli"/>
-      <param name="pom" value="${tomcat.pom.path}/juli.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Tribes-->
-      <param name="file" value="${tomcat.lib.path}/catalina-tribes.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="tribes"/>
-      <param name="pom" value="${tomcat.pom.path}/tribes.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Jasper EL-->
-      <param name="file" value="${tomcat.lib.path}/jasper-el.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="jasper-el"/>
-      <param name="pom" value="${tomcat.pom.path}/jasper-el.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Jasper JDT-->
-      <param name="file" value="${tomcat.lib.path}/jasper-jdt.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="jasper-jdt"/>
-      <param name="pom" value="${tomcat.pom.path}/jasper-jdt.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Coyote-->
-      <param name="file" value="${tomcat.lib.path}/tomcat-coyote.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="coyote"/>
-      <param name="pom" value="${tomcat.pom.path}/coyote.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Catalina-->
-      <param name="file" value="${tomcat.lib.path}/catalina.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="catalina"/>
-      <param name="pom" value="${tomcat.pom.path}/catalina.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Catalina-HA-->
-      <param name="file" value="${tomcat.lib.path}/catalina-ha.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="catalina-ha"/>
-      <param name="pom" value="${tomcat.pom.path}/catalina-ha.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Jasper-->
-      <param name="file" value="${tomcat.lib.path}/jasper.jar"/>
-      <param name="groupId" value="org.apache.tomcat"/>
-      <param name="artifactId" value="jasper"/>
-      <param name="pom" value="${tomcat.pom.path}/jasper.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Extras Juli-->
-      <param name="file" value="${tomcat.extras.path}/tomcat-juli.jar"/>
-      <param name="groupId" value="org.apache.tomcat.extras"/>
-      <param name="artifactId" value="juli"/>
-      <param name="pom" value="${tomcat.pom.path}/juli-extras.pom"/>
-    </antcall>
-    <antcall target="maven-deploy"><!--Deploy Extras Juli Adapters-->
-      <param name="file" value="${tomcat.extras.path}/tomcat-juli-adapters.jar"/>
-      <param name="groupId" value="org.apache.tomcat.extras"/>
-      <param name="artifactId" value="juli-adapters"/>
-      <param name="pom" value="${tomcat.pom.path}/juli-adapters.pom"/>
-    </antcall>
-  </target>
-
-  <target name="deploy-snapshot">
-    <antcall target="generic-deploy">
-      <param name="maven.repo.repositoryId" value="${maven.snapshot.repo.repositoryId}"/>
-      <param name="maven.repo.url" value="${maven.snapshot.repo.url}"/>
-      <param name="maven.deploy.version" value="${maven.snapshot.deploy.version}"/>
-    </antcall>
-  </target>
-
-  <target name="deploy-staging">
-    <antcall target="generic-deploy">
-      <param name="maven.repo.repositoryId" value="${maven.release.repo.repositoryId}"/>
-      <param name="maven.repo.url" value="${maven.release.repo.url}"/>
-      <param name="maven.deploy.version" value="${maven.release.deploy.version}"/>
-    </antcall>
-  </target>
-
-  <target name="deploy-release">
-    <antcall target="generic-deploy">
-      <param name="maven.repo.repositoryId" value="${maven.asf.release.repo.repositoryId}"/>
-      <param name="maven.repo.url" value="${maven.asf.release.repo.url}"/>
-      <param name="maven.deploy.version" value="${maven.asf.release.deploy.version}"/>
-    </antcall>
-  </target>
-
-</project>
+<?xml version="1.0"?>
+<!--
+  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="Tomcat 6.0" default="deploy" basedir=".">
+
+  <!--
+  Properties required to be set:
+  maven.home - full path to Maven2 installation, mvn or mvn.bat is assumed to be in ${maven.home}/bin/
+  maven.bin  - the script to execute for maven, would be mvn or mvn.bat
+  maven.repo.url - the URL of the repository, for example scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
+  maven.repo.repositoryId - the id of the repository, for example apache.snapshots
+  maven.deploy.version - the version that the components will be deployed as, for example @MAVEN.DEPLOY.VERSION@
+  tomcat.lib.path - the path to tomcat JAR files
+  tomcat.bin.path - the path to tomcat's bin directory (for other JAR files)
+  tomcat.pom.path - the path to the POM files
+  All these can be defined by mvn.properties (and defaults are in mvn.properties.default)
+  
+  To do password less upload, you can modify either
+  $MAVE_HOME/conf/settings.xml or ~/.m2/settings.xml and add this snippet
+    <server>
+      <id>apache.snapshots</id>
+      <username>yourusername</username>
+      <privateKey>/home/yourusername/.ssh/id_rsa</privateKey>
+      <passphrase></passphrase>
+    </server>
+  -->
+  <property file="${basedir}/mvn.properties"/>
+  <property file="${basedir}/mvn.properties.default"/>
+  
+  <target name="maven-deploy">
+    <!--replace the version in the pom-->
+    <copy file="${pom}" tofile="${pom}.tmp">
+      <filterset>
+        <filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
+      </filterset>
+    </copy>
+    <exec executable="${maven.home}/bin/${maven.bin}" failonerror="true">
+      <env key="MAVEN_HOME" value="${maven.home}"/>
+      <arg value="deploy:deploy-file"/>
+      <arg value="-Dfile=${file}"/>
+      <arg value="-DgroupId=${groupId}"/>
+      <arg value="-DartifactId=${artifactId}"/>
+      <arg value="-Dversion=${maven.deploy.version}"/>
+      <arg value="-Dpackaging=jar"/>
+      <arg value="-DgeneratePom=false"/>
+      <arg value="-DrepositoryId=${maven.repo.repositoryId}"/>
+      <arg value="-Durl=${maven.repo.url}"/>
+      <arg value="-DpomFile=${pom}.tmp"/>
+    </exec>
+    <delete file="${pom}.tmp"/>
+  </target>
+  
+  <target name="generic-deploy">
+    <antcall target="maven-deploy"><!--Deploy annotations-->
+      <param name="file" value="${tomcat.lib.path}/annotations-api.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="annotations-api"/>
+      <param name="pom" value="${tomcat.pom.path}/annotations-api.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Servlet api-->
+      <param name="file" value="${tomcat.lib.path}/servlet-api.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="servlet-api"/>
+      <param name="pom" value="${tomcat.pom.path}/servlet-api.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy expression lanaguage api-->
+      <param name="file" value="${tomcat.lib.path}/el-api.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="el-api"/>
+      <param name="pom" value="${tomcat.pom.path}/el-api.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy JSP api-->
+      <param name="file" value="${tomcat.lib.path}/jsp-api.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="jsp-api"/>
+      <param name="pom" value="${tomcat.pom.path}/jsp-api.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy JULI-->
+      <param name="file" value="${tomcat.bin.path}/tomcat-juli.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="juli"/>
+      <param name="pom" value="${tomcat.pom.path}/juli.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Tribes-->
+      <param name="file" value="${tomcat.lib.path}/catalina-tribes.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="tribes"/>
+      <param name="pom" value="${tomcat.pom.path}/tribes.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Jasper EL-->
+      <param name="file" value="${tomcat.lib.path}/jasper-el.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="jasper-el"/>
+      <param name="pom" value="${tomcat.pom.path}/jasper-el.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Jasper JDT-->
+      <param name="file" value="${tomcat.lib.path}/jasper-jdt.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="jasper-jdt"/>
+      <param name="pom" value="${tomcat.pom.path}/jasper-jdt.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Coyote-->
+      <param name="file" value="${tomcat.lib.path}/tomcat-coyote.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="coyote"/>
+      <param name="pom" value="${tomcat.pom.path}/coyote.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Catalina-->
+      <param name="file" value="${tomcat.lib.path}/catalina.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="catalina"/>
+      <param name="pom" value="${tomcat.pom.path}/catalina.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Catalina-HA-->
+      <param name="file" value="${tomcat.lib.path}/catalina-ha.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="catalina-ha"/>
+      <param name="pom" value="${tomcat.pom.path}/catalina-ha.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Jasper-->
+      <param name="file" value="${tomcat.lib.path}/jasper.jar"/>
+      <param name="groupId" value="org.apache.tomcat"/>
+      <param name="artifactId" value="jasper"/>
+      <param name="pom" value="${tomcat.pom.path}/jasper.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Extras Juli-->
+      <param name="file" value="${tomcat.extras.path}/tomcat-juli.jar"/>
+      <param name="groupId" value="org.apache.tomcat.extras"/>
+      <param name="artifactId" value="juli"/>
+      <param name="pom" value="${tomcat.pom.path}/juli-extras.pom"/>
+    </antcall>
+    <antcall target="maven-deploy"><!--Deploy Extras Juli Adapters-->
+      <param name="file" value="${tomcat.extras.path}/tomcat-juli-adapters.jar"/>
+      <param name="groupId" value="org.apache.tomcat.extras"/>
+      <param name="artifactId" value="juli-adapters"/>
+      <param name="pom" value="${tomcat.pom.path}/juli-adapters.pom"/>
+    </antcall>
+  </target>
+
+  <target name="deploy-snapshot">
+    <antcall target="generic-deploy">
+      <param name="maven.repo.repositoryId" value="${maven.snapshot.repo.repositoryId}"/>
+      <param name="maven.repo.url" value="${maven.snapshot.repo.url}"/>
+      <param name="maven.deploy.version" value="${maven.snapshot.deploy.version}"/>
+    </antcall>
+  </target>
+
+  <target name="deploy-staging">
+    <antcall target="generic-deploy">
+      <param name="maven.repo.repositoryId" value="${maven.release.repo.repositoryId}"/>
+      <param name="maven.repo.url" value="${maven.release.repo.url}"/>
+      <param name="maven.deploy.version" value="${maven.release.deploy.version}"/>
+    </antcall>
+  </target>
+
+  <target name="deploy-release">
+    <antcall target="generic-deploy">
+      <param name="maven.repo.repositoryId" value="${maven.asf.release.repo.repositoryId}"/>
+      <param name="maven.repo.url" value="${maven.asf.release.repo.url}"/>
+      <param name="maven.deploy.version" value="${maven.asf.release.deploy.version}"/>
+    </antcall>
+  </target>
+
+</project>
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 1d0aa34fc..8681da129 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -1,28 +1,43 @@
-#Maven properties
-maven.home=/development/maven-2.0.4
-#Define mvn for Unix systems and mvn.bat for Windows as ANT exec requires the full name
-maven.bin=mvn
-
-#Maven snapshot properties
-maven.snapshot.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
-maven.snapshot.repo.repositoryId=apache.snapshots
-maven.snapshot.deploy.version=6.0.X-SNAPSHOT
-
-#Maven release properties for Tomcat staging
-maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository
-maven.release.repo.repositoryId=tomcat-staging
-maven.release.deploy.version=6.0.8
-
-#Maven release properties for the main ASF repo
-maven.asf.release.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
-maven.asf.release.repo.repositoryId=apache.releases
-maven.asf.release.deploy.version=6.0.8
-
-
-#Where do we load the libraries from
-tomcat.lib.path=../../output/build/lib
-tomcat.bin.path=../../output/build/bin
-tomcat.extras.path=../../output/extras
-
-#Where do we find the POM files
-tomcat.pom.path=../../res/maven
+# 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.
+
+#Maven properties
+maven.home=/development/maven-2.0.4
+#Define mvn for Unix systems and mvn.bat for Windows as ANT exec requires the full name
+maven.bin=mvn
+
+#Maven snapshot properties
+maven.snapshot.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
+maven.snapshot.repo.repositoryId=apache.snapshots
+maven.snapshot.deploy.version=6.0.X-SNAPSHOT
+
+#Maven release properties for Tomcat staging
+maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository
+maven.release.repo.repositoryId=tomcat-staging
+maven.release.deploy.version=6.0.8
+
+#Maven release properties for the main ASF repo
+maven.asf.release.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
+maven.asf.release.repo.repositoryId=apache.releases
+maven.asf.release.deploy.version=6.0.8
+
+
+#Where do we load the libraries from
+tomcat.lib.path=../../output/build/lib
+tomcat.bin.path=../../output/build/bin
+tomcat.extras.path=../../output/extras
+
+#Where do we find the POM files
+tomcat.pom.path=../../res/maven
diff --git a/res/maven/servlet-api.pom b/res/maven/servlet-api.pom
index 23a232372..9a3b2f648 100644
--- a/res/maven/servlet-api.pom
+++ b/res/maven/servlet-api.pom
@@ -1,7 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>servlet-api</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>javax.servlet package</description>
-</project>
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>servlet-api</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>javax.servlet package</description>
+</project>
diff --git a/res/maven/tribes.pom b/res/maven/tribes.pom
index 4661a0213..490a70db6 100644
--- a/res/maven/tribes.pom
+++ b/res/maven/tribes.pom
@@ -1,15 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tomcat</groupId>
-  <artifactId>tribes</artifactId>
-  <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Tomcat Group Communication Package</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>juli</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project> 
+<?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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>tribes</artifactId>
+  <version>@MAVEN.DEPLOY.VERSION@</version>
+  <description>Tomcat Group Communication Package</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>juli</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project> 
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 27522aabd..c3fbfd0cf 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -1,3 +1,17 @@
+; 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.
 
 ; Tomcat script for Nullsoft Installer
 ; $Id$
diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index e8f48a1b6..ce5c631c1 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -1,3 +1,19 @@
+<!--
+  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.
+-->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE>
 <META http-equiv=Content-Type content="text/html">
diff --git a/res/welcome.main.html b/res/welcome.main.html
index 178dea69c..f766f3ece 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -1,3 +1,19 @@
+<!--
+  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.
+-->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE>
 <META http-equiv=Content-Type content="text/html">
-- 
2.11.0