Index: web-jsptaglibrary_1_1.dtd
===================================================================
--- web-jsptaglibrary_1_1.dtd	(revision 28274)
+++ web-jsptaglibrary_1_1.dtd	(working copy)
@@ -1,37 +1,5 @@
 <!--
-  ~ Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  ~
-  ~ "The contents of this file are subject to the Mozilla Public License
-  ~ Version 1.1 (the "License"); you may not use this file except in
-  ~ compliance with the License. You may obtain a copy of the License at
-  ~ http://www.mozilla.org/MPL/
-  ~
-  ~ Software distributed under the License is distributed on an "AS IS"
-  ~ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing rights and limitations under
-  ~ the License.
-  ~
-  ~ The Original Code is ICEfaces 1.5 open source software code, released
-  ~ November 5, 2006. The Initial Developer of the Original Code is ICEsoft
-  ~ Technologies Canada, Corp. Portions created by ICEsoft are Copyright (C)
-  ~ 2004-2010 ICEsoft Technologies Canada, Corp. All Rights Reserved.
-  ~
-  ~ Contributor(s): _____________________.
-  ~
-  ~ Alternatively, the contents of this file may be used under the terms of
-  ~ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"
-  ~ License), in which case the provisions of the LGPL License are
-  ~ applicable instead of those above. If you wish to allow use of your
-  ~ version of this file only under the terms of the LGPL License and not to
-  ~ allow others to use your version of this file under the MPL, indicate
-  ~ your decision by deleting the provisions above and replace them with
-  ~ the notice and other provisions required by the LGPL License. If you do
-  ~ not delete the provisions above, a recipient may use your version of
-  ~ this file under either the MPL or the LGPL License."
-  -->
 
-<!--
-
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
 Copyright 2000-2007 Sun Microsystems, Inc. All rights reserved.
Index: web-jsptaglibrary_1_2.dtd
===================================================================
--- web-jsptaglibrary_1_2.dtd	(revision 28274)
+++ web-jsptaglibrary_1_2.dtd	(working copy)
@@ -1,40 +1,41 @@
 <!--
-  ~ Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  ~
-  ~ "The contents of this file are subject to the Mozilla Public License
-  ~ Version 1.1 (the "License"); you may not use this file except in
-  ~ compliance with the License. You may obtain a copy of the License at
-  ~ http://www.mozilla.org/MPL/
-  ~
-  ~ Software distributed under the License is distributed on an "AS IS"
-  ~ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing rights and limitations under
-  ~ the License.
-  ~
-  ~ The Original Code is ICEfaces 1.5 open source software code, released
-  ~ November 5, 2006. The Initial Developer of the Original Code is ICEsoft
-  ~ Technologies Canada, Corp. Portions created by ICEsoft are Copyright (C)
-  ~ 2004-2010 ICEsoft Technologies Canada, Corp. All Rights Reserved.
-  ~
-  ~ Contributor(s): _____________________.
-  ~
-  ~ Alternatively, the contents of this file may be used under the terms of
-  ~ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"
-  ~ License), in which case the provisions of the LGPL License are
-  ~ applicable instead of those above. If you wish to allow use of your
-  ~ version of this file only under the terms of the LGPL License and not to
-  ~ allow others to use your version of this file under the MPL, indicate
-  ~ your decision by deleting the provisions above and replace them with
-  ~ the notice and other provisions required by the LGPL License. If you do
-  ~ not delete the provisions above, a recipient may use your version of
-  ~ this file under either the MPL or the LGPL License."
-  -->
 
-<!--
-   Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-   Use is subject to license terms.
-  -->
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
+Copyright 2000-2007 Sun Microsystems, Inc. All rights reserved.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common Development
+and Distribution License("CDDL") (collectively, the "License").  You
+may not use this file except in compliance with the License. You can obtain
+a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
+language governing permissions and limitations under the License.
+
+When distributing the software, include this License Header Notice in each
+file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+Sun designates this particular file as subject to the "Classpath" exception
+as provided by Sun in the GPL Version 2 section of the License file that
+accompanied this code.  If applicable, add the following below the License
+Header, with the fields enclosed by brackets [] replaced by your own
+identifying information: "Portions Copyrighted [year]
+[name of copyright owner]"
+
+Contributor(s):
+
+If you wish your version of this file to be governed by only the CDDL or
+only the GPL Version 2, indicate your decision by adding "[Contributor]
+elects to include this software in this distribution under the [CDDL or GPL
+Version 2] license."  If you don't indicate a single choice of license, a
+recipient has the option to distribute your version of this file under
+either the CDDL, the GPL Version 2 or to extend the choice of license to
+its licensees as provided above.  However, if you add GPL Version 2 code
+and therefore, elected the GPL Version 2 license, then the option applies
+only if the new code is made subject to such option by the copyright
+holder.
+
+-->
+
 <!--
 
    This is the DTD defining the JavaServer Pages 1.2 Tag Library
@@ -45,7 +46,6 @@
    appropriate implementing classes, and other resources required to
    implement the tags defined therein.
 
-   Use is subject to license terms.
   -->
 
 <!NOTATION WEB-JSPTAGLIB.1_2 PUBLIC