Applying the new Apache source headers as per #41221
diff --git a/examples/src/org/apache/taglibs/standard/examples/beans/Address.java b/examples/src/org/apache/taglibs/standard/examples/beans/Address.java
index 6b4036a..2c99eeb 100644
--- a/examples/src/org/apache/taglibs/standard/examples/beans/Address.java
+++ b/examples/src/org/apache/taglibs/standard/examples/beans/Address.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/beans/Customer.java b/examples/src/org/apache/taglibs/standard/examples/beans/Customer.java
index bf2af38..b0f99fc 100644
--- a/examples/src/org/apache/taglibs/standard/examples/beans/Customer.java
+++ b/examples/src/org/apache/taglibs/standard/examples/beans/Customer.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/beans/Customers.java b/examples/src/org/apache/taglibs/standard/examples/beans/Customers.java
index 1a890eb..23f4819 100644
--- a/examples/src/org/apache/taglibs/standard/examples/beans/Customers.java
+++ b/examples/src/org/apache/taglibs/standard/examples/beans/Customers.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/startup/Init.java b/examples/src/org/apache/taglibs/standard/examples/startup/Init.java
index b01fd4e..f4d0173 100644
--- a/examples/src/org/apache/taglibs/standard/examples/startup/Init.java
+++ b/examples/src/org/apache/taglibs/standard/examples/startup/Init.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java b/examples/src/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java
index 2155aa3..fffcb5b 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java b/examples/src/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java
index 7402b66..95f358c 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java b/examples/src/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java
index 8850bec..552d85c 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/EvenTag.java b/examples/src/org/apache/taglibs/standard/examples/taglib/EvenTag.java
index 9765339..37f1d7f 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/EvenTag.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/EvenTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/FileTag.java b/examples/src/org/apache/taglibs/standard/examples/taglib/FileTag.java
index a96436a..d22f6a0 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/FileTag.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/FileTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java b/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java
index f725467..8a90f6e 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/LocalesTag.java b/examples/src/org/apache/taglibs/standard/examples/taglib/LocalesTag.java
index 5a46b7b..9f3f8cb 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/LocalesTag.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/LocalesTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java b/examples/src/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java
index 9bb9c4d..e6f5028 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/OddTag.java b/examples/src/org/apache/taglibs/standard/examples/taglib/OddTag.java
index df65736..1c93c9a 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/OddTag.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/OddTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/ResourceTag.java b/examples/src/org/apache/taglibs/standard/examples/taglib/ResourceTag.java
index be1847d..d03f6b4 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/ResourceTag.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/ResourceTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java b/examples/src/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java
index 8ab794d..61426ec 100644
--- a/examples/src/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java
+++ b/examples/src/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/util/IOBean.java b/examples/src/org/apache/taglibs/standard/examples/util/IOBean.java
index 53474bb..fde50a6 100644
--- a/examples/src/org/apache/taglibs/standard/examples/util/IOBean.java
+++ b/examples/src/org/apache/taglibs/standard/examples/util/IOBean.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java b/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
index e741c66..66b2bdc 100644
--- a/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
+++ b/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/examples/src/org/apache/taglibs/standard/examples/util/Util.java b/examples/src/org/apache/taglibs/standard/examples/util/Util.java
index 0f6c531..1b702c4 100644
--- a/examples/src/org/apache/taglibs/standard/examples/util/Util.java
+++ b/examples/src/org/apache/taglibs/standard/examples/util/Util.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java b/src/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
index a36b616..43b7d55 100644
--- a/src/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
+++ b/src/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/core/Config.java b/src/javax/servlet/jsp/jstl/core/Config.java
index cc7348a..a448419 100644
--- a/src/javax/servlet/jsp/jstl/core/Config.java
+++ b/src/javax/servlet/jsp/jstl/core/Config.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/core/LoopTag.java b/src/javax/servlet/jsp/jstl/core/LoopTag.java
index 34640db..43854d1 100644
--- a/src/javax/servlet/jsp/jstl/core/LoopTag.java
+++ b/src/javax/servlet/jsp/jstl/core/LoopTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/core/LoopTagStatus.java b/src/javax/servlet/jsp/jstl/core/LoopTagStatus.java
index ebe3d46..f66c6d7 100644
--- a/src/javax/servlet/jsp/jstl/core/LoopTagStatus.java
+++ b/src/javax/servlet/jsp/jstl/core/LoopTagStatus.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/core/LoopTagSupport.java b/src/javax/servlet/jsp/jstl/core/LoopTagSupport.java
index 56f01b5..efd6612 100644
--- a/src/javax/servlet/jsp/jstl/core/LoopTagSupport.java
+++ b/src/javax/servlet/jsp/jstl/core/LoopTagSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/fmt/LocaleSupport.java b/src/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
index a57cbe2..ea5f0e5 100644
--- a/src/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
+++ b/src/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/fmt/LocalizationContext.java b/src/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
index 8b8f6d1..b521c13 100644
--- a/src/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
+++ b/src/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/sql/Result.java b/src/javax/servlet/jsp/jstl/sql/Result.java
index e98d431..019e6b4 100644
--- a/src/javax/servlet/jsp/jstl/sql/Result.java
+++ b/src/javax/servlet/jsp/jstl/sql/Result.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/sql/ResultImpl.java b/src/javax/servlet/jsp/jstl/sql/ResultImpl.java
index ff48a15..13f12ff 100644
--- a/src/javax/servlet/jsp/jstl/sql/ResultImpl.java
+++ b/src/javax/servlet/jsp/jstl/sql/ResultImpl.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/sql/ResultSupport.java b/src/javax/servlet/jsp/jstl/sql/ResultSupport.java
index bfab963..d0bbcdb 100644
--- a/src/javax/servlet/jsp/jstl/sql/ResultSupport.java
+++ b/src/javax/servlet/jsp/jstl/sql/ResultSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java b/src/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
index 4a00acd..cc3e254 100644
--- a/src/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
+++ b/src/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java b/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
index 4ba23d1..17cbc0d 100644
--- a/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
+++ b/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java b/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
index d82b5c1..c10919a 100644
--- a/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
+++ b/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/Version.java b/src/org/apache/taglibs/standard/Version.java
index bc66d9b..9e8da95 100644
--- a/src/org/apache/taglibs/standard/Version.java
+++ b/src/org/apache/taglibs/standard/Version.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/extra/collections/BoundedMap.java b/src/org/apache/taglibs/standard/extra/collections/BoundedMap.java
index 8ba7096..5e9428d 100644
--- a/src/org/apache/taglibs/standard/extra/collections/BoundedMap.java
+++ b/src/org/apache/taglibs/standard/extra/collections/BoundedMap.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 2003-2004 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/org/apache/taglibs/standard/extra/collections/IterableMap.java b/src/org/apache/taglibs/standard/extra/collections/IterableMap.java
index 9f13e75..dca5e57 100644
--- a/src/org/apache/taglibs/standard/extra/collections/IterableMap.java
+++ b/src/org/apache/taglibs/standard/extra/collections/IterableMap.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 2003-2004 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/org/apache/taglibs/standard/extra/collections/KeyValue.java b/src/org/apache/taglibs/standard/extra/collections/KeyValue.java
index fae391d..456cad4 100644
--- a/src/org/apache/taglibs/standard/extra/collections/KeyValue.java
+++ b/src/org/apache/taglibs/standard/extra/collections/KeyValue.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 2003-2004 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/org/apache/taglibs/standard/extra/collections/MapIterator.java b/src/org/apache/taglibs/standard/extra/collections/MapIterator.java
index 1478629..9b555aa 100644
--- a/src/org/apache/taglibs/standard/extra/collections/MapIterator.java
+++ b/src/org/apache/taglibs/standard/extra/collections/MapIterator.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 2003-2004 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/org/apache/taglibs/standard/extra/collections/OrderedIterator.java b/src/org/apache/taglibs/standard/extra/collections/OrderedIterator.java
index b099bda..7e893b5 100644
--- a/src/org/apache/taglibs/standard/extra/collections/OrderedIterator.java
+++ b/src/org/apache/taglibs/standard/extra/collections/OrderedIterator.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 2003-2004 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/org/apache/taglibs/standard/extra/collections/OrderedMap.java b/src/org/apache/taglibs/standard/extra/collections/OrderedMap.java
index fe3861e..d69549c 100644
--- a/src/org/apache/taglibs/standard/extra/collections/OrderedMap.java
+++ b/src/org/apache/taglibs/standard/extra/collections/OrderedMap.java
@@ -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/src/org/apache/taglibs/standard/extra/collections/OrderedMapIterator.java b/src/org/apache/taglibs/standard/extra/collections/OrderedMapIterator.java
index 96d34ad..9aa9a37 100644
--- a/src/org/apache/taglibs/standard/extra/collections/OrderedMapIterator.java
+++ b/src/org/apache/taglibs/standard/extra/collections/OrderedMapIterator.java
@@ -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/src/org/apache/taglibs/standard/extra/collections/ResettableIterator.java b/src/org/apache/taglibs/standard/extra/collections/ResettableIterator.java
index 73c08c7..178d467 100644
--- a/src/org/apache/taglibs/standard/extra/collections/ResettableIterator.java
+++ b/src/org/apache/taglibs/standard/extra/collections/ResettableIterator.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 2003-2004 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/org/apache/taglibs/standard/extra/collections/iterators/AbstractEmptyIterator.java b/src/org/apache/taglibs/standard/extra/collections/iterators/AbstractEmptyIterator.java
index f4e42f4..a57f82b 100644
--- a/src/org/apache/taglibs/standard/extra/collections/iterators/AbstractEmptyIterator.java
+++ b/src/org/apache/taglibs/standard/extra/collections/iterators/AbstractEmptyIterator.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 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/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyIterator.java b/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyIterator.java
index 1f9b9e6..82ecfd9 100644
--- a/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyIterator.java
+++ b/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyIterator.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 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/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyMapIterator.java b/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyMapIterator.java
index be68266..6e3c53c 100644
--- a/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyMapIterator.java
+++ b/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyMapIterator.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 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/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedIterator.java b/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedIterator.java
index d2af5b4..62f4a49 100644
--- a/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedIterator.java
+++ b/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedIterator.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 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/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedMapIterator.java b/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedMapIterator.java
index e762edd..ddc4ce5 100644
--- a/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedMapIterator.java
+++ b/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedMapIterator.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 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/src/org/apache/taglibs/standard/extra/collections/map/AbstractHashedMap.java b/src/org/apache/taglibs/standard/extra/collections/map/AbstractHashedMap.java
index 220c3ae..4cd29c8 100644
--- a/src/org/apache/taglibs/standard/extra/collections/map/AbstractHashedMap.java
+++ b/src/org/apache/taglibs/standard/extra/collections/map/AbstractHashedMap.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 2003-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/src/org/apache/taglibs/standard/extra/collections/map/AbstractLinkedMap.java b/src/org/apache/taglibs/standard/extra/collections/map/AbstractLinkedMap.java
index 3bd0548..bcbf31a 100644
--- a/src/org/apache/taglibs/standard/extra/collections/map/AbstractLinkedMap.java
+++ b/src/org/apache/taglibs/standard/extra/collections/map/AbstractLinkedMap.java
@@ -1,9 +1,10 @@
 /*
- *  Copyright 2003-2004 The Apache Software Foundation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/src/org/apache/taglibs/standard/extra/collections/map/LRUMap.java b/src/org/apache/taglibs/standard/extra/collections/map/LRUMap.java
index 2df232c..bea4a1a 100644
--- a/src/org/apache/taglibs/standard/extra/collections/map/LRUMap.java
+++ b/src/org/apache/taglibs/standard/extra/collections/map/LRUMap.java
@@ -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/src/org/apache/taglibs/standard/extra/spath/AbsolutePath.java b/src/org/apache/taglibs/standard/extra/spath/AbsolutePath.java
index 8b52ca7..6eb2744 100644
--- a/src/org/apache/taglibs/standard/extra/spath/AbsolutePath.java
+++ b/src/org/apache/taglibs/standard/extra/spath/AbsolutePath.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/extra/spath/AttributePredicate.java b/src/org/apache/taglibs/standard/extra/spath/AttributePredicate.java
index 54a7769..943f62d 100644
--- a/src/org/apache/taglibs/standard/extra/spath/AttributePredicate.java
+++ b/src/org/apache/taglibs/standard/extra/spath/AttributePredicate.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/extra/spath/Path.java b/src/org/apache/taglibs/standard/extra/spath/Path.java
index cd9ccae..88d0c9a 100644
--- a/src/org/apache/taglibs/standard/extra/spath/Path.java
+++ b/src/org/apache/taglibs/standard/extra/spath/Path.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/extra/spath/Predicate.java b/src/org/apache/taglibs/standard/extra/spath/Predicate.java
index 8e8c69e..38e5603 100644
--- a/src/org/apache/taglibs/standard/extra/spath/Predicate.java
+++ b/src/org/apache/taglibs/standard/extra/spath/Predicate.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/extra/spath/RelativePath.java b/src/org/apache/taglibs/standard/extra/spath/RelativePath.java
index 8100383..e5d6696 100644
--- a/src/org/apache/taglibs/standard/extra/spath/RelativePath.java
+++ b/src/org/apache/taglibs/standard/extra/spath/RelativePath.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/extra/spath/SPathFilter.java b/src/org/apache/taglibs/standard/extra/spath/SPathFilter.java
index bead698..12df102 100644
--- a/src/org/apache/taglibs/standard/extra/spath/SPathFilter.java
+++ b/src/org/apache/taglibs/standard/extra/spath/SPathFilter.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/extra/spath/SPathTag.java b/src/org/apache/taglibs/standard/extra/spath/SPathTag.java
index 179b8ab..5a8a1ff 100644
--- a/src/org/apache/taglibs/standard/extra/spath/SPathTag.java
+++ b/src/org/apache/taglibs/standard/extra/spath/SPathTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/extra/spath/Step.java b/src/org/apache/taglibs/standard/extra/spath/Step.java
index 839b537..4d74c60 100644
--- a/src/org/apache/taglibs/standard/extra/spath/Step.java
+++ b/src/org/apache/taglibs/standard/extra/spath/Step.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/functions/Functions.java b/src/org/apache/taglibs/standard/functions/Functions.java
index 422a9c8..9be25f7 100644
--- a/src/org/apache/taglibs/standard/functions/Functions.java
+++ b/src/org/apache/taglibs/standard/functions/Functions.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/AndOperator.java b/src/org/apache/taglibs/standard/lang/jstl/AndOperator.java
index 6d8c3e4..f249e10 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/AndOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/AndOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ArithmeticOperator.java b/src/org/apache/taglibs/standard/lang/jstl/ArithmeticOperator.java
index 78200e7..2e300f8 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/ArithmeticOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/ArithmeticOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java b/src/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
index 566fa15..8b55bef 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java b/src/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java
index 052f62f..e458eee 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BeanInfoManager.java b/src/org/apache/taglibs/standard/lang/jstl/BeanInfoManager.java
index c658a95..f6cfdc7 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/BeanInfoManager.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/BeanInfoManager.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BeanInfoProperty.java b/src/org/apache/taglibs/standard/lang/jstl/BeanInfoProperty.java
index fe9672a..3c8baa4 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/BeanInfoProperty.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/BeanInfoProperty.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BinaryOperator.java b/src/org/apache/taglibs/standard/lang/jstl/BinaryOperator.java
index 917efe3..5fc278d 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/BinaryOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/BinaryOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java b/src/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
index c55d67f..8c4014a 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BooleanLiteral.java b/src/org/apache/taglibs/standard/lang/jstl/BooleanLiteral.java
index 5a050dc..6b2ed77 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/BooleanLiteral.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/BooleanLiteral.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Coercions.java b/src/org/apache/taglibs/standard/lang/jstl/Coercions.java
index 4849e4c..7bbe61c 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/Coercions.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/Coercions.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ComplexValue.java b/src/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
index ba11078..da574cf 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Constants.java b/src/org/apache/taglibs/standard/lang/jstl/Constants.java
index aefbc1f..bbc34d1 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/Constants.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/Constants.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/DivideOperator.java b/src/org/apache/taglibs/standard/lang/jstl/DivideOperator.java
index 21ddad0..9165cab 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/DivideOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/DivideOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java b/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
index 8317dcf..c5231c3 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ELException.java b/src/org/apache/taglibs/standard/lang/jstl/ELException.java
index c2e2366..d552f9f 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/ELException.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/ELException.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/EmptyOperator.java b/src/org/apache/taglibs/standard/lang/jstl/EmptyOperator.java
index bab3305..ca40612 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/EmptyOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/EmptyOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java b/src/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java
index 733ec8a..fc14913 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/EqualityOperator.java b/src/org/apache/taglibs/standard/lang/jstl/EqualityOperator.java
index b336015..71ea567 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/EqualityOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/EqualityOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/EqualsOperator.java b/src/org/apache/taglibs/standard/lang/jstl/EqualsOperator.java
index 6e561ad..ef537e7 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/EqualsOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/EqualsOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Evaluator.java b/src/org/apache/taglibs/standard/lang/jstl/Evaluator.java
index baf3250..7a76212 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/Evaluator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/Evaluator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Expression.java b/src/org/apache/taglibs/standard/lang/jstl/Expression.java
index 9ff1ae2..502b33a 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/Expression.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/Expression.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ExpressionString.java b/src/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
index 3e59eb1..6b4f3c4 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/FloatingPointLiteral.java b/src/org/apache/taglibs/standard/lang/jstl/FloatingPointLiteral.java
index 97b8dbe..5aea8b1 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/FloatingPointLiteral.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/FloatingPointLiteral.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java b/src/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
index 497a2e9..ec9510f 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOperator.java b/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOperator.java
index 2fa21f6..645bf60 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOrEqualsOperator.java b/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOrEqualsOperator.java
index 9baa6a6..f60767b 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOrEqualsOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOrEqualsOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java b/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
index 776d398..9df3030 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/IntegerDivideOperator.java b/src/org/apache/taglibs/standard/lang/jstl/IntegerDivideOperator.java
index 7e5e8e7..d91feed 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/IntegerDivideOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/IntegerDivideOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/IntegerLiteral.java b/src/org/apache/taglibs/standard/lang/jstl/IntegerLiteral.java
index ee09d25..871090a 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/IntegerLiteral.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/IntegerLiteral.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java b/src/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java
index be8880b..4346929 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/LessThanOperator.java b/src/org/apache/taglibs/standard/lang/jstl/LessThanOperator.java
index 62422d2..fb15898 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/LessThanOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/LessThanOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/LessThanOrEqualsOperator.java b/src/org/apache/taglibs/standard/lang/jstl/LessThanOrEqualsOperator.java
index 497a038..0fa8b4f 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/LessThanOrEqualsOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/LessThanOrEqualsOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Literal.java b/src/org/apache/taglibs/standard/lang/jstl/Literal.java
index 9a9157b..eed1c41 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/Literal.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/Literal.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Logger.java b/src/org/apache/taglibs/standard/lang/jstl/Logger.java
index 2353abe..551c3e5 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/Logger.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/Logger.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/MinusOperator.java b/src/org/apache/taglibs/standard/lang/jstl/MinusOperator.java
index d840728..49d0a7b 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/MinusOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/MinusOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ModulusOperator.java b/src/org/apache/taglibs/standard/lang/jstl/ModulusOperator.java
index 4757afe..6209a8d 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/ModulusOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/ModulusOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/MultiplyOperator.java b/src/org/apache/taglibs/standard/lang/jstl/MultiplyOperator.java
index 60520cb..e3458e1 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/MultiplyOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/MultiplyOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/NamedValue.java b/src/org/apache/taglibs/standard/lang/jstl/NamedValue.java
index 33c72d1..9be3d17 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/NamedValue.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/NamedValue.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/NotEqualsOperator.java b/src/org/apache/taglibs/standard/lang/jstl/NotEqualsOperator.java
index 784d3cc..12e9f77 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/NotEqualsOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/NotEqualsOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/NotOperator.java b/src/org/apache/taglibs/standard/lang/jstl/NotOperator.java
index 28b924d..7b16af6 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/NotOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/NotOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/NullLiteral.java b/src/org/apache/taglibs/standard/lang/jstl/NullLiteral.java
index c6469b3..0553629 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/NullLiteral.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/NullLiteral.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/OrOperator.java b/src/org/apache/taglibs/standard/lang/jstl/OrOperator.java
index fdddee2..4a97369 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/OrOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/OrOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/PlusOperator.java b/src/org/apache/taglibs/standard/lang/jstl/PlusOperator.java
index 1326194..25f2e14 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/PlusOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/PlusOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/PrimitiveObjects.java b/src/org/apache/taglibs/standard/lang/jstl/PrimitiveObjects.java
index 34fdf76..3b48ab1 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/PrimitiveObjects.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/PrimitiveObjects.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/PropertySuffix.java b/src/org/apache/taglibs/standard/lang/jstl/PropertySuffix.java
index 603abda..95fcdef 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/PropertySuffix.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/PropertySuffix.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java b/src/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
index d77c460..3689cab 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/StringLiteral.java b/src/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
index 305d3b8..ab75dfe 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java b/src/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java
index 6e10261..1b0de05 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/UnaryOperator.java b/src/org/apache/taglibs/standard/lang/jstl/UnaryOperator.java
index f6f4a8b..12959d9 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/UnaryOperator.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/UnaryOperator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java b/src/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
index b7cd320..e78bb80 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ValueSuffix.java b/src/org/apache/taglibs/standard/lang/jstl/ValueSuffix.java
index 39cef18..c3749a9 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/ValueSuffix.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/ValueSuffix.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/VariableResolver.java b/src/org/apache/taglibs/standard/lang/jstl/VariableResolver.java
index a9f60e0..a28ff88 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/VariableResolver.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/VariableResolver.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/Bean1.java b/src/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
index 3bac613..5fb8d56 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/Bean2.java b/src/org/apache/taglibs/standard/lang/jstl/test/Bean2.java
index 7b631c7..3a73f17 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/Bean2.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/Bean2.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java b/src/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java
index b218373..89c8994 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java b/src/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
index 134116a..6b1a2c8 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java b/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
index 8d69a81..e188c5f 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java b/src/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
index 77a8ff8..fe12536 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java b/src/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
index b17f3cb..3b69081 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java b/src/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java
index 2558171..91d9777 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java
index 0390934..2c226b3 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java
index f45255a..033d1e7 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java
index 9841eb6..b67d1fa 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java
index 080e697..20c2b23 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java
index a910c0c..6ee1da3 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java
index c0d8dbc..a08ab0b 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java
index 1a8519b..c0bf75f 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java
index 6453edc..39f1baf 100644
--- a/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java
+++ b/src/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java b/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
index 99339ce..00f515d 100644
--- a/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
+++ b/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java b/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
index 5deb066..d4fcdde 100644
--- a/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
+++ b/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/resources/Resources.java b/src/org/apache/taglibs/standard/resources/Resources.java
index bffc6e5..cad8423 100644
--- a/src/org/apache/taglibs/standard/resources/Resources.java
+++ b/src/org/apache/taglibs/standard/resources/Resources.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/CatchTag.java b/src/org/apache/taglibs/standard/tag/common/core/CatchTag.java
index 9c240a1..8a00f88 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/CatchTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/CatchTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ChooseTag.java b/src/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
index f5c22b4..af607f3 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/DeclareTag.java b/src/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
index afc41aa..514a28c 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java b/src/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
index 8e98559..1b65453 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java b/src/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
index 2d2665d..608ea26 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java b/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
index 1840d58..51f9a8c 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java b/src/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
index fca620d..8d7f01f 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java b/src/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java
index c643470..01ed047 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/OutSupport.java b/src/org/apache/taglibs/standard/tag/common/core/OutSupport.java
index cae2409..06e8c3d 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/OutSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/OutSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ParamParent.java b/src/org/apache/taglibs/standard/tag/common/core/ParamParent.java
index 2bb4840..d622ebe 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/ParamParent.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/ParamParent.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ParamSupport.java b/src/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
index 42cbba9..68da378 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java b/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
index a09945c..155b669 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/RemoveTag.java b/src/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
index f633934..98de537 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/SetSupport.java b/src/org/apache/taglibs/standard/tag/common/core/SetSupport.java
index f9d9a8d..878bb05 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/SetSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/SetSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java b/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
index 4cf3b13..9576289 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/Util.java b/src/org/apache/taglibs/standard/tag/common/core/Util.java
index 491cfe3..4b2a235 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/Util.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/Util.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java b/src/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
index 86658cd..0599552 100644
--- a/src/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
index c8f832e..257240c 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
index 22d9ffe..6c3d4ef 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
index 27cb1b6..e060a18 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
index b026c04..7c196ec 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
index ff6169c..671abd4 100755
--- a/src/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
index 3f6f1b6..a1a828a 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
index afd299e..e5f2690 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
index 42058c2..b55dc96 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
index dbb681e..e3a15fd 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
index 6058492..3e47dbc 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
index 926d3ac..d171874 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java b/src/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
index dcea441..d309e56 100644
--- a/src/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java b/src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
index ea119e3..8bba4c7 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java b/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
index dbb8bfb..9bf632d 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java b/src/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
index 2880c2a..5be86f2 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/DriverTag.java b/src/org/apache/taglibs/standard/tag/common/sql/DriverTag.java
index 2df890d..af4b6e3 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/DriverTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/DriverTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java b/src/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
index 471b389..2b94cb0 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java b/src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
index 04d5833..b1784ab 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java b/src/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
index 1b586d8..7a84d4c 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java b/src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
index 7710510..96576d8 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java b/src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
index a647d3d..f0486ff 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java b/src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
index ed62d54..b8b0fc3 100644
--- a/src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java b/src/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
index fb5af3a..9c0dfff 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java b/src/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
index 6264c13..4bcf713 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/IfTag.java b/src/org/apache/taglibs/standard/tag/common/xml/IfTag.java
index 1899edf..ac23cad 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/IfTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/IfTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/JSTLPrefixResolver.java b/src/org/apache/taglibs/standard/tag/common/xml/JSTLPrefixResolver.java
index 846c907..7e720ec 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/JSTLPrefixResolver.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/JSTLPrefixResolver.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java b/src/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
index 7f70007..b36fdeb 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java b/src/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
index 99d76a7..8aacbe8 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java b/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
index 3bc8a54..feefc62 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/SetTag.java b/src/org/apache/taglibs/standard/tag/common/xml/SetTag.java
index 763517a..fee9b58 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/SetTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/SetTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java b/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
index 65d56f5..fea42b4 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java b/src/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java
index 40a5f76..f53fd29 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/WhenTag.java b/src/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
index dbe7fb3..f0918b0 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java b/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
index 73248a7..9cf599f 100644
--- a/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
+++ b/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java b/src/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java
index 440c6ab..76fa7e4 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ForEachTag.java b/src/org/apache/taglibs/standard/tag/el/core/ForEachTag.java
index 306c24c..7e04e5e 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/ForEachTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/ForEachTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java b/src/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java
index 272bc14..b966bf7 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/IfTag.java b/src/org/apache/taglibs/standard/tag/el/core/IfTag.java
index 7cc5fc9..bce5972 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/IfTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/IfTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ImportTag.java b/src/org/apache/taglibs/standard/tag/el/core/ImportTag.java
index 2ba4061..aa1fddc 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/ImportTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/ImportTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/OutTag.java b/src/org/apache/taglibs/standard/tag/el/core/OutTag.java
index 226c9cc..6544938 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/OutTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/OutTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ParamTag.java b/src/org/apache/taglibs/standard/tag/el/core/ParamTag.java
index 0e01113..dd2ae56 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/ParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/ParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/RedirectTag.java b/src/org/apache/taglibs/standard/tag/el/core/RedirectTag.java
index 21078d5..bb443af 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/RedirectTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/RedirectTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/SetTag.java b/src/org/apache/taglibs/standard/tag/el/core/SetTag.java
index 9f52289..7f8752b 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/SetTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/SetTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/UrlTag.java b/src/org/apache/taglibs/standard/tag/el/core/UrlTag.java
index f65405c..46e3fc3 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/UrlTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/UrlTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/core/WhenTag.java b/src/org/apache/taglibs/standard/tag/el/core/WhenTag.java
index 545d63d..232808d 100644
--- a/src/org/apache/taglibs/standard/tag/el/core/WhenTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/core/WhenTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java
index fc97f7e..9502179 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java
index de3cef0..c5dd986 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java
index e7f736e..96f4cfb 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java
index 716efe0..188c0b8 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java
index efa7cf2..41ffcc6 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
index 12bb982..64c2a74 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
index 94199cf..37d4d9c 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java
index 8c69dfa..c6282eb 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java
index fd1e1a3..1d81a5f 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
index 4941f67..b0de9d7 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java
index 70c9379..7773992 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java b/src/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java
index 5b111d5..60d69de 100644
--- a/src/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java b/src/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java
index 4ceab81..d301ed9 100644
--- a/src/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/ParamTag.java b/src/org/apache/taglibs/standard/tag/el/sql/ParamTag.java
index 6e50766..2b51665 100644
--- a/src/org/apache/taglibs/standard/tag/el/sql/ParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/sql/ParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/QueryTag.java b/src/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
index 3434b3d..4258a06 100644
--- a/src/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java b/src/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java
index 6ca0f74..f7e9bea 100644
--- a/src/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java b/src/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java
index 7de2e91..2fc8cf2 100644
--- a/src/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java b/src/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java
index 9aa231a..31e190b 100644
--- a/src/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/xml/ExprTag.java b/src/org/apache/taglibs/standard/tag/el/xml/ExprTag.java
index 4e7e3ac..a074c8f 100644
--- a/src/org/apache/taglibs/standard/tag/el/xml/ExprTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/xml/ExprTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/xml/ParamTag.java b/src/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
index 68c113b..a8867d6 100644
--- a/src/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/xml/ParseTag.java b/src/org/apache/taglibs/standard/tag/el/xml/ParseTag.java
index 9810f68..8cd6717 100644
--- a/src/org/apache/taglibs/standard/tag/el/xml/ParseTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/xml/ParseTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/el/xml/TransformTag.java b/src/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
index 1f6d00f..7b45b0c 100644
--- a/src/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
+++ b/src/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java b/src/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
index 203a8c9..30a1ed8 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java b/src/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
index 351089a..a0c26da 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/IfTag.java b/src/org/apache/taglibs/standard/tag/rt/core/IfTag.java
index 555d210..fd145fe 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/IfTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/IfTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/ImportTag.java b/src/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
index 174e8a0..31f72ec 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/OutTag.java b/src/org/apache/taglibs/standard/tag/rt/core/OutTag.java
index 29f18d3..a744087 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/OutTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/OutTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/ParamTag.java b/src/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
index 7d0cca4..7f6087f 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java b/src/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
index 9dbf8b3..10e3a5c 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/SetTag.java b/src/org/apache/taglibs/standard/tag/rt/core/SetTag.java
index a97b613..4b17ef9 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/SetTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/SetTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/UrlTag.java b/src/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
index 7a4054d..b19ab20 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/WhenTag.java b/src/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
index 332c51c..ba0f249 100644
--- a/src/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
index 598213e..31f0294 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
index 6aac761..9ad8e73 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
index b9a7d70..94009dc 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
index ba99c02..5139e72 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
index 8482ab1..dd207d9 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
index 81a2016..27333c6 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
index 001eabf..8db37e2 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
index 7fbdafa..c7df1d1 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
index 69d80a0..b795565 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
index bae5a4f..19c5bee 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
index 7c8bc0e..8fb28d6 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java b/src/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
index 83fef19..249afd0 100644
--- a/src/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java b/src/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java
index 8466c49..16569aa 100644
--- a/src/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java b/src/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java
index 96614a7..6437173 100644
--- a/src/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java b/src/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java
index eec491f..0b26caa 100644
--- a/src/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java b/src/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java
index 1c75b12..53675ac 100644
--- a/src/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java b/src/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
index 165f61b..ee149f0 100644
--- a/src/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java b/src/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java
index 84a2d86..e95036a 100644
--- a/src/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java b/src/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java
index 01031e6..3e35e62 100644
--- a/src/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java b/src/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
index 48a8075..03a3311 100644
--- a/src/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java b/src/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
index 44b5e91..0ef7b68 100644
--- a/src/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java b/src/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
index 7896df2..1b522b4 100644
--- a/src/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
+++ b/src/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tei/DeclareTEI.java b/src/org/apache/taglibs/standard/tei/DeclareTEI.java
index 5d1e129..3c8bb84 100644
--- a/src/org/apache/taglibs/standard/tei/DeclareTEI.java
+++ b/src/org/apache/taglibs/standard/tei/DeclareTEI.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tei/ForEachTEI.java b/src/org/apache/taglibs/standard/tei/ForEachTEI.java
index b782de1..784d68d 100644
--- a/src/org/apache/taglibs/standard/tei/ForEachTEI.java
+++ b/src/org/apache/taglibs/standard/tei/ForEachTEI.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tei/ImportTEI.java b/src/org/apache/taglibs/standard/tei/ImportTEI.java
index 4a90e16..7479b44 100644
--- a/src/org/apache/taglibs/standard/tei/ImportTEI.java
+++ b/src/org/apache/taglibs/standard/tei/ImportTEI.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tei/Util.java b/src/org/apache/taglibs/standard/tei/Util.java
index bcd32c4..5ed66ef 100644
--- a/src/org/apache/taglibs/standard/tei/Util.java
+++ b/src/org/apache/taglibs/standard/tei/Util.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tei/XmlParseTEI.java b/src/org/apache/taglibs/standard/tei/XmlParseTEI.java
index e028217..a1d6d40 100644
--- a/src/org/apache/taglibs/standard/tei/XmlParseTEI.java
+++ b/src/org/apache/taglibs/standard/tei/XmlParseTEI.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tei/XmlTransformTEI.java b/src/org/apache/taglibs/standard/tei/XmlTransformTEI.java
index bec838a..ba76a30 100644
--- a/src/org/apache/taglibs/standard/tei/XmlTransformTEI.java
+++ b/src/org/apache/taglibs/standard/tei/XmlTransformTEI.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java b/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
index 1bccd02..1b15503 100644
--- a/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
+++ b/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tlv/JstlCoreTLV.java b/src/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
index 2ef0706..5180606 100644
--- a/src/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
+++ b/src/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tlv/JstlFmtTLV.java b/src/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
index 2977940..b5f4017 100644
--- a/src/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
+++ b/src/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tlv/JstlSqlTLV.java b/src/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
index 3608b6c..a2dc61a 100644
--- a/src/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
+++ b/src/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/src/org/apache/taglibs/standard/tlv/JstlXmlTLV.java b/src/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
index c93203c..4d695e6 100644
--- a/src/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
+++ b/src/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  * 
  *      http://www.apache.org/licenses/LICENSE-2.0
  * 
diff --git a/test/org/apache/taglibs/standard/TestVersion.java b/test/org/apache/taglibs/standard/TestVersion.java
index 885b39b..7dc05de 100644
--- a/test/org/apache/taglibs/standard/TestVersion.java
+++ b/test/org/apache/taglibs/standard/TestVersion.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/test/org/apache/taglibs/standard/functions/TestEndsWith.java b/test/org/apache/taglibs/standard/functions/TestEndsWith.java
index ba712a1..a8bd0da 100644
--- a/test/org/apache/taglibs/standard/functions/TestEndsWith.java
+++ b/test/org/apache/taglibs/standard/functions/TestEndsWith.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/test/org/apache/taglibs/standard/tag/el/core/Test34109.java b/test/org/apache/taglibs/standard/tag/el/core/Test34109.java
index ec7fa63..2e5f360 100644
--- a/test/org/apache/taglibs/standard/tag/el/core/Test34109.java
+++ b/test/org/apache/taglibs/standard/tag/el/core/Test34109.java
@@ -1,17 +1,18 @@
-/*                                                                             
- * Copyright 1999,2004 The Apache Software Foundation.                         
- *                                                                             
- * Licensed under the Apache License, Version 2.0 (the "License");             
- * you may not use this file except in compliance with the License.            
- * You may obtain a copy of the License at                                     
- *                                                                             
- *      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.
  */
 
 package org.apache.taglibs.standard.tag.el.core;
diff --git a/test/org/apache/taglibs/standard/tag/el/core/Test37466.java b/test/org/apache/taglibs/standard/tag/el/core/Test37466.java
index b137d6b..95dbaa9 100644
--- a/test/org/apache/taglibs/standard/tag/el/core/Test37466.java
+++ b/test/org/apache/taglibs/standard/tag/el/core/Test37466.java
@@ -1,17 +1,18 @@
-/*                                                                             
- * Copyright 1999,2004 The Apache Software Foundation.                         
- *                                                                             
- * Licensed under the Apache License, Version 2.0 (the "License");             
- * you may not use this file except in compliance with the License.            
- * You may obtain a copy of the License at                                     
- *                                                                             
- *      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.
  */
 
 package org.apache.taglibs.standard.tag.el.core;
diff --git a/test/org/apache/taglibs/standard/tag/el/core/TestSetTag.java b/test/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
index 8b35231..5e139d3 100644
--- a/test/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
+++ b/test/org/apache/taglibs/standard/tag/el/core/TestSetTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/test/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java b/test/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
index 42222e4..4b61f7d 100644
--- a/test/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
+++ b/test/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/test/org/apache/taglibs/standard/tag/el/sql/Test33054.java b/test/org/apache/taglibs/standard/tag/el/sql/Test33054.java
index aadc3f8..5f7aee2 100644
--- a/test/org/apache/taglibs/standard/tag/el/sql/Test33054.java
+++ b/test/org/apache/taglibs/standard/tag/el/sql/Test33054.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java b/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java
index baca29e..8bb5934 100644
--- a/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java
+++ b/test/org/apache/taglibs/standard/tag/el/xml/Test30068.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/test/org/apache/taglibs/standard/tag/el/xml/Test35216.java b/test/org/apache/taglibs/standard/tag/el/xml/Test35216.java
index 0654466..88f989b 100644
--- a/test/org/apache/taglibs/standard/tag/el/xml/Test35216.java
+++ b/test/org/apache/taglibs/standard/tag/el/xml/Test35216.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/test/org/apache/taglibs/standard/testutil/TestUtil.java b/test/org/apache/taglibs/standard/testutil/TestUtil.java
index b625f19..d7c31d8 100644
--- a/test/org/apache/taglibs/standard/testutil/TestUtil.java
+++ b/test/org/apache/taglibs/standard/testutil/TestUtil.java
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *