1.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridBeanInfo.java	Mon May 17 14:20:06 2010 -0400
     1.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridBeanInfo.java	Mon May 17 14:20:21 2010 -0400
     1.3 @@ -1,7 +1,10 @@
     1.4  /*
     1.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     1.6   *
     1.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
     1.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     1.9 + *
    1.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    1.11 + * Other names may be trademarks of their respective owners.
    1.12   *
    1.13   * The contents of this file are subject to the terms of either the GNU
    1.14   * General Public License Version 2 only ("GPL") or the Common
    1.15 @@ -13,9 +16,9 @@
    1.16   * specific language governing permissions and limitations under the
    1.17   * License.  When distributing the software, include this License Header
    1.18   * Notice in each file and include the License file at
    1.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    1.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    1.21   * particular file as subject to the "Classpath" exception as provided
    1.22 - * by Sun in the GPL Version 2 section of the License file that
    1.23 + * by Oracle in the GPL Version 2 section of the License file that
    1.24   * accompanied this code. If applicable, add the following below the
    1.25   * License Header, with the fields enclosed by brackets [] replaced by
    1.26   * your own identifying information:

     2.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridBeanInfoBase.java	Mon May 17 14:20:06 2010 -0400
     2.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridBeanInfoBase.java	Mon May 17 14:20:21 2010 -0400
     2.3 @@ -1,7 +1,10 @@
     2.4  /*
     2.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     2.6   *
     2.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
     2.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     2.9 + *
    2.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    2.11 + * Other names may be trademarks of their respective owners.
    2.12   *
    2.13   * The contents of this file are subject to the terms of either the GNU
    2.14   * General Public License Version 2 only ("GPL") or the Common
    2.15 @@ -13,9 +16,9 @@
    2.16   * specific language governing permissions and limitations under the
    2.17   * License.  When distributing the software, include this License Header
    2.18   * Notice in each file and include the License file at
    2.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    2.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    2.21   * particular file as subject to the "Classpath" exception as provided
    2.22 - * by Sun in the GPL Version 2 section of the License file that
    2.23 + * by Oracle in the GPL Version 2 section of the License file that
    2.24   * accompanied this code. If applicable, add the following below the
    2.25   * License Header, with the fields enclosed by brackets [] replaced by
    2.26   * your own identifying information:

     3.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridDesignInfo.java	Mon May 17 14:20:06 2010 -0400
     3.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridDesignInfo.java	Mon May 17 14:20:21 2010 -0400
     3.3 @@ -1,7 +1,10 @@
     3.4  /*
     3.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     3.6   *
     3.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
     3.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     3.9 + *
    3.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    3.11 + * Other names may be trademarks of their respective owners.
    3.12   *
    3.13   * The contents of this file are subject to the terms of either the GNU
    3.14   * General Public License Version 2 only ("GPL") or the Common
    3.15 @@ -13,9 +16,9 @@
    3.16   * specific language governing permissions and limitations under the
    3.17   * License.  When distributing the software, include this License Header
    3.18   * Notice in each file and include the License file at
    3.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    3.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    3.21   * particular file as subject to the "Classpath" exception as provided
    3.22 - * by Sun in the GPL Version 2 section of the License file that
    3.23 + * by Oracle in the GPL Version 2 section of the License file that
    3.24   * accompanied this code. If applicable, add the following below the
    3.25   * License Header, with the fields enclosed by brackets [] replaced by
    3.26   * your own identifying information:

     4.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupBeanInfo.java	Mon May 17 14:20:06 2010 -0400
     4.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupBeanInfo.java	Mon May 17 14:20:21 2010 -0400
     4.3 @@ -1,7 +1,10 @@
     4.4  /*
     4.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     4.6   *
     4.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
     4.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     4.9 + *
    4.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    4.11 + * Other names may be trademarks of their respective owners.
    4.12   *
    4.13   * The contents of this file are subject to the terms of either the GNU
    4.14   * General Public License Version 2 only ("GPL") or the Common
    4.15 @@ -13,9 +16,9 @@
    4.16   * specific language governing permissions and limitations under the
    4.17   * License.  When distributing the software, include this License Header
    4.18   * Notice in each file and include the License file at
    4.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    4.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    4.21   * particular file as subject to the "Classpath" exception as provided
    4.22 - * by Sun in the GPL Version 2 section of the License file that
    4.23 + * by Oracle in the GPL Version 2 section of the License file that
    4.24   * accompanied this code. If applicable, add the following below the
    4.25   * License Header, with the fields enclosed by brackets [] replaced by
    4.26   * your own identifying information:

     5.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupBeanInfoBase.java	Mon May 17 14:20:06 2010 -0400
     5.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupBeanInfoBase.java	Mon May 17 14:20:21 2010 -0400
     5.3 @@ -1,7 +1,10 @@
     5.4  /*
     5.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     5.6   *
     5.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
     5.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     5.9 + *
    5.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    5.11 + * Other names may be trademarks of their respective owners.
    5.12   *
    5.13   * The contents of this file are subject to the terms of either the GNU
    5.14   * General Public License Version 2 only ("GPL") or the Common
    5.15 @@ -13,9 +16,9 @@
    5.16   * specific language governing permissions and limitations under the
    5.17   * License.  When distributing the software, include this License Header
    5.18   * Notice in each file and include the License file at
    5.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    5.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    5.21   * particular file as subject to the "Classpath" exception as provided
    5.22 - * by Sun in the GPL Version 2 section of the License file that
    5.23 + * by Oracle in the GPL Version 2 section of the License file that
    5.24   * accompanied this code. If applicable, add the following below the
    5.25   * License Header, with the fields enclosed by brackets [] replaced by
    5.26   * your own identifying information:

     6.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupDesignInfo.java	Mon May 17 14:20:06 2010 -0400
     6.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupDesignInfo.java	Mon May 17 14:20:21 2010 -0400
     6.3 @@ -1,7 +1,10 @@
     6.4  /*
     6.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     6.6   *
     6.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
     6.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     6.9 + *
    6.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    6.11 + * Other names may be trademarks of their respective owners.
    6.12   *
    6.13   * The contents of this file are subject to the terms of either the GNU
    6.14   * General Public License Version 2 only ("GPL") or the Common
    6.15 @@ -13,9 +16,9 @@
    6.16   * specific language governing permissions and limitations under the
    6.17   * License.  When distributing the software, include this License Header
    6.18   * Notice in each file and include the License file at
    6.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    6.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    6.21   * particular file as subject to the "Classpath" exception as provided
    6.22 - * by Sun in the GPL Version 2 section of the License file that
    6.23 + * by Oracle in the GPL Version 2 section of the License file that
    6.24   * accompanied this code. If applicable, add the following below the
    6.25   * License Header, with the fields enclosed by brackets [] replaced by
    6.26   * your own identifying information:

     7.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BigDecimalConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
     7.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BigDecimalConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
     7.3 @@ -1,7 +1,10 @@
     7.4  /*
     7.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     7.6   *
     7.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
     7.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     7.9 + *
    7.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    7.11 + * Other names may be trademarks of their respective owners.
    7.12   *
    7.13   * The contents of this file are subject to the terms of either the GNU
    7.14   * General Public License Version 2 only ("GPL") or the Common
    7.15 @@ -13,9 +16,9 @@
    7.16   * specific language governing permissions and limitations under the
    7.17   * License.  When distributing the software, include this License Header
    7.18   * Notice in each file and include the License file at
    7.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    7.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    7.21   * particular file as subject to the "Classpath" exception as provided
    7.22 - * by Sun in the GPL Version 2 section of the License file that
    7.23 + * by Oracle in the GPL Version 2 section of the License file that
    7.24   * accompanied this code. If applicable, add the following below the
    7.25   * License Header, with the fields enclosed by brackets [] replaced by
    7.26   * your own identifying information:

     8.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BigIntegerConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
     8.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BigIntegerConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
     8.3 @@ -1,7 +1,10 @@
     8.4  /*
     8.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     8.6   *
     8.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
     8.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     8.9 + *
    8.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    8.11 + * Other names may be trademarks of their respective owners.
    8.12   *
    8.13   * The contents of this file are subject to the terms of either the GNU
    8.14   * General Public License Version 2 only ("GPL") or the Common
    8.15 @@ -13,9 +16,9 @@
    8.16   * specific language governing permissions and limitations under the
    8.17   * License.  When distributing the software, include this License Header
    8.18   * Notice in each file and include the License file at
    8.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    8.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    8.21   * particular file as subject to the "Classpath" exception as provided
    8.22 - * by Sun in the GPL Version 2 section of the License file that
    8.23 + * by Oracle in the GPL Version 2 section of the License file that
    8.24   * accompanied this code. If applicable, add the following below the
    8.25   * License Header, with the fields enclosed by brackets [] replaced by
    8.26   * your own identifying information:

     9.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BooleanConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
     9.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BooleanConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
     9.3 @@ -1,7 +1,10 @@
     9.4  /*
     9.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     9.6   *
     9.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
     9.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     9.9 + *
    9.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    9.11 + * Other names may be trademarks of their respective owners.
    9.12   *
    9.13   * The contents of this file are subject to the terms of either the GNU
    9.14   * General Public License Version 2 only ("GPL") or the Common
    9.15 @@ -13,9 +16,9 @@
    9.16   * specific language governing permissions and limitations under the
    9.17   * License.  When distributing the software, include this License Header
    9.18   * Notice in each file and include the License file at
    9.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    9.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    9.21   * particular file as subject to the "Classpath" exception as provided
    9.22 - * by Sun in the GPL Version 2 section of the License file that
    9.23 + * by Oracle in the GPL Version 2 section of the License file that
    9.24   * accompanied this code. If applicable, add the following below the
    9.25   * License Header, with the fields enclosed by brackets [] replaced by
    9.26   * your own identifying information:

    10.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/Bundle.properties	Mon May 17 14:20:06 2010 -0400
    10.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/Bundle.properties	Mon May 17 14:20:21 2010 -0400
    10.3 @@ -1,6 +1,9 @@
    10.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    10.5  #
    10.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    10.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    10.8 +#
    10.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   10.10 +# Other names may be trademarks of their respective owners.
   10.11  #
   10.12  # The contents of this file are subject to the terms of either the GNU
   10.13  # General Public License Version 2 only ("GPL") or the Common
   10.14 @@ -12,9 +15,9 @@
   10.15  # specific language governing permissions and limitations under the
   10.16  # License.  When distributing the software, include this License Header
   10.17  # Notice in each file and include the License file at
   10.18 -# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   10.19 +# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   10.20  # particular file as subject to the "Classpath" exception as provided
   10.21 -# by Sun in the GPL Version 2 section of the License file that
   10.22 +# by Oracle in the GPL Version 2 section of the License file that
   10.23  # accompanied this code. If applicable, add the following below the
   10.24  # License Header, with the fields enclosed by brackets [] replaced by
   10.25  # your own identifying information:

    11.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ByteConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    11.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ByteConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    11.3 @@ -1,7 +1,10 @@
    11.4  /*
    11.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    11.6   *
    11.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    11.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    11.9 + *
   11.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   11.11 + * Other names may be trademarks of their respective owners.
   11.12   *
   11.13   * The contents of this file are subject to the terms of either the GNU
   11.14   * General Public License Version 2 only ("GPL") or the Common
   11.15 @@ -13,9 +16,9 @@
   11.16   * specific language governing permissions and limitations under the
   11.17   * License.  When distributing the software, include this License Header
   11.18   * Notice in each file and include the License file at
   11.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   11.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   11.21   * particular file as subject to the "Classpath" exception as provided
   11.22 - * by Sun in the GPL Version 2 section of the License file that
   11.23 + * by Oracle in the GPL Version 2 section of the License file that
   11.24   * accompanied this code. If applicable, add the following below the
   11.25   * License Header, with the fields enclosed by brackets [] replaced by
   11.26   * your own identifying information:

    12.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CalendarConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    12.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CalendarConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    12.3 @@ -1,7 +1,10 @@
    12.4  /*
    12.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    12.6   *
    12.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    12.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    12.9 + *
   12.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   12.11 + * Other names may be trademarks of their respective owners.
   12.12   *
   12.13   * The contents of this file are subject to the terms of either the GNU
   12.14   * General Public License Version 2 only ("GPL") or the Common
   12.15 @@ -13,9 +16,9 @@
   12.16   * specific language governing permissions and limitations under the
   12.17   * License.  When distributing the software, include this License Header
   12.18   * Notice in each file and include the License file at
   12.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   12.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   12.21   * particular file as subject to the "Classpath" exception as provided
   12.22 - * by Sun in the GPL Version 2 section of the License file that
   12.23 + * by Oracle in the GPL Version 2 section of the License file that
   12.24   * accompanied this code. If applicable, add the following below the
   12.25   * License Header, with the fields enclosed by brackets [] replaced by
   12.26   * your own identifying information:

    13.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CalendarConverterDesignInfo.java	Mon May 17 14:20:06 2010 -0400
    13.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CalendarConverterDesignInfo.java	Mon May 17 14:20:21 2010 -0400
    13.3 @@ -1,7 +1,10 @@
    13.4  /*
    13.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    13.6   *
    13.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    13.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    13.9 + *
   13.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   13.11 + * Other names may be trademarks of their respective owners.
   13.12   *
   13.13   * The contents of this file are subject to the terms of either the GNU
   13.14   * General Public License Version 2 only ("GPL") or the Common
   13.15 @@ -13,9 +16,9 @@
   13.16   * specific language governing permissions and limitations under the
   13.17   * License.  When distributing the software, include this License Header
   13.18   * Notice in each file and include the License file at
   13.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   13.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   13.21   * particular file as subject to the "Classpath" exception as provided
   13.22 - * by Sun in the GPL Version 2 section of the License file that
   13.23 + * by Oracle in the GPL Version 2 section of the License file that
   13.24   * accompanied this code. If applicable, add the following below the
   13.25   * License Header, with the fields enclosed by brackets [] replaced by
   13.26   * your own identifying information:

    14.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CharacterConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    14.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CharacterConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    14.3 @@ -1,7 +1,10 @@
    14.4  /*
    14.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    14.6   *
    14.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    14.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    14.9 + *
   14.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   14.11 + * Other names may be trademarks of their respective owners.
   14.12   *
   14.13   * The contents of this file are subject to the terms of either the GNU
   14.14   * General Public License Version 2 only ("GPL") or the Common
   14.15 @@ -13,9 +16,9 @@
   14.16   * specific language governing permissions and limitations under the
   14.17   * License.  When distributing the software, include this License Header
   14.18   * Notice in each file and include the License file at
   14.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   14.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   14.21   * particular file as subject to the "Classpath" exception as provided
   14.22 - * by Sun in the GPL Version 2 section of the License file that
   14.23 + * by Oracle in the GPL Version 2 section of the License file that
   14.24   * accompanied this code. If applicable, add the following below the
   14.25   * License Header, with the fields enclosed by brackets [] replaced by
   14.26   * your own identifying information:

    15.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    15.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    15.3 @@ -1,7 +1,10 @@
    15.4  /*
    15.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    15.6   *
    15.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    15.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    15.9 + *
   15.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   15.11 + * Other names may be trademarks of their respective owners.
   15.12   *
   15.13   * The contents of this file are subject to the terms of either the GNU
   15.14   * General Public License Version 2 only ("GPL") or the Common
   15.15 @@ -13,9 +16,9 @@
   15.16   * specific language governing permissions and limitations under the
   15.17   * License.  When distributing the software, include this License Header
   15.18   * Notice in each file and include the License file at
   15.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   15.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   15.21   * particular file as subject to the "Classpath" exception as provided
   15.22 - * by Sun in the GPL Version 2 section of the License file that
   15.23 + * by Oracle in the GPL Version 2 section of the License file that
   15.24   * accompanied this code. If applicable, add the following below the
   15.25   * License Header, with the fields enclosed by brackets [] replaced by
   15.26   * your own identifying information:

    16.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeConverterDesignInfo.java	Mon May 17 14:20:06 2010 -0400
    16.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeConverterDesignInfo.java	Mon May 17 14:20:21 2010 -0400
    16.3 @@ -1,7 +1,10 @@
    16.4  /*
    16.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    16.6   *
    16.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    16.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    16.9 + *
   16.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   16.11 + * Other names may be trademarks of their respective owners.
   16.12   *
   16.13   * The contents of this file are subject to the terms of either the GNU
   16.14   * General Public License Version 2 only ("GPL") or the Common
   16.15 @@ -13,9 +16,9 @@
   16.16   * specific language governing permissions and limitations under the
   16.17   * License.  When distributing the software, include this License Header
   16.18   * Notice in each file and include the License file at
   16.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   16.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   16.21   * particular file as subject to the "Classpath" exception as provided
   16.22 - * by Sun in the GPL Version 2 section of the License file that
   16.23 + * by Oracle in the GPL Version 2 section of the License file that
   16.24   * accompanied this code. If applicable, add the following below the
   16.25   * License Header, with the fields enclosed by brackets [] replaced by
   16.26   * your own identifying information:

    17.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimePatternPanel.java	Mon May 17 14:20:06 2010 -0400
    17.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimePatternPanel.java	Mon May 17 14:20:21 2010 -0400
    17.3 @@ -1,7 +1,10 @@
    17.4  /*
    17.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    17.6   *
    17.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    17.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    17.9 + *
   17.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   17.11 + * Other names may be trademarks of their respective owners.
   17.12   *
   17.13   * The contents of this file are subject to the terms of either the GNU
   17.14   * General Public License Version 2 only ("GPL") or the Common
   17.15 @@ -13,9 +16,9 @@
   17.16   * specific language governing permissions and limitations under the
   17.17   * License.  When distributing the software, include this License Header
   17.18   * Notice in each file and include the License file at
   17.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   17.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   17.21   * particular file as subject to the "Classpath" exception as provided
   17.22 - * by Sun in the GPL Version 2 section of the License file that
   17.23 + * by Oracle in the GPL Version 2 section of the License file that
   17.24   * accompanied this code. If applicable, add the following below the
   17.25   * License Header, with the fields enclosed by brackets [] replaced by
   17.26   * your own identifying information:

    18.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimePatternPropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    18.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimePatternPropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    18.3 @@ -1,7 +1,10 @@
    18.4  /*
    18.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    18.6   *
    18.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    18.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    18.9 + *
   18.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   18.11 + * Other names may be trademarks of their respective owners.
   18.12   *
   18.13   * The contents of this file are subject to the terms of either the GNU
   18.14   * General Public License Version 2 only ("GPL") or the Common
   18.15 @@ -13,9 +16,9 @@
   18.16   * specific language governing permissions and limitations under the
   18.17   * License.  When distributing the software, include this License Header
   18.18   * Notice in each file and include the License file at
   18.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   18.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   18.21   * particular file as subject to the "Classpath" exception as provided
   18.22 - * by Sun in the GPL Version 2 section of the License file that
   18.23 + * by Oracle in the GPL Version 2 section of the License file that
   18.24   * accompanied this code. If applicable, add the following below the
   18.25   * License Header, with the fields enclosed by brackets [] replaced by
   18.26   * your own identifying information:

    19.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeStylesDomain.java	Mon May 17 14:20:06 2010 -0400
    19.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeStylesDomain.java	Mon May 17 14:20:21 2010 -0400
    19.3 @@ -1,7 +1,10 @@
    19.4  /*
    19.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    19.6   *
    19.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    19.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    19.9 + *
   19.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   19.11 + * Other names may be trademarks of their respective owners.
   19.12   *
   19.13   * The contents of this file are subject to the terms of either the GNU
   19.14   * General Public License Version 2 only ("GPL") or the Common
   19.15 @@ -13,9 +16,9 @@
   19.16   * specific language governing permissions and limitations under the
   19.17   * License.  When distributing the software, include this License Header
   19.18   * Notice in each file and include the License file at
   19.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   19.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   19.21   * particular file as subject to the "Classpath" exception as provided
   19.22 - * by Sun in the GPL Version 2 section of the License file that
   19.23 + * by Oracle in the GPL Version 2 section of the License file that
   19.24   * accompanied this code. If applicable, add the following below the
   19.25   * License Header, with the fields enclosed by brackets [] replaced by
   19.26   * your own identifying information:

    20.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeTypesDomain.java	Mon May 17 14:20:06 2010 -0400
    20.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeTypesDomain.java	Mon May 17 14:20:21 2010 -0400
    20.3 @@ -1,7 +1,10 @@
    20.4  /*
    20.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    20.6   *
    20.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    20.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    20.9 + *
   20.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   20.11 + * Other names may be trademarks of their respective owners.
   20.12   *
   20.13   * The contents of this file are subject to the terms of either the GNU
   20.14   * General Public License Version 2 only ("GPL") or the Common
   20.15 @@ -13,9 +16,9 @@
   20.16   * specific language governing permissions and limitations under the
   20.17   * License.  When distributing the software, include this License Header
   20.18   * Notice in each file and include the License file at
   20.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   20.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   20.21   * particular file as subject to the "Classpath" exception as provided
   20.22 - * by Sun in the GPL Version 2 section of the License file that
   20.23 + * by Oracle in the GPL Version 2 section of the License file that
   20.24   * accompanied this code. If applicable, add the following below the
   20.25   * License Header, with the fields enclosed by brackets [] replaced by
   20.26   * your own identifying information:

    21.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DoubleConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    21.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DoubleConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    21.3 @@ -1,7 +1,10 @@
    21.4  /*
    21.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    21.6   *
    21.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    21.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    21.9 + *
   21.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   21.11 + * Other names may be trademarks of their respective owners.
   21.12   *
   21.13   * The contents of this file are subject to the terms of either the GNU
   21.14   * General Public License Version 2 only ("GPL") or the Common
   21.15 @@ -13,9 +16,9 @@
   21.16   * specific language governing permissions and limitations under the
   21.17   * License.  When distributing the software, include this License Header
   21.18   * Notice in each file and include the License file at
   21.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   21.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   21.21   * particular file as subject to the "Classpath" exception as provided
   21.22 - * by Sun in the GPL Version 2 section of the License file that
   21.23 + * by Oracle in the GPL Version 2 section of the License file that
   21.24   * accompanied this code. If applicable, add the following below the
   21.25   * License Header, with the fields enclosed by brackets [] replaced by
   21.26   * your own identifying information:

    22.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/FloatConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    22.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/FloatConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    22.3 @@ -1,7 +1,10 @@
    22.4  /*
    22.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    22.6   *
    22.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    22.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    22.9 + *
   22.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   22.11 + * Other names may be trademarks of their respective owners.
   22.12   *
   22.13   * The contents of this file are subject to the terms of either the GNU
   22.14   * General Public License Version 2 only ("GPL") or the Common
   22.15 @@ -13,9 +16,9 @@
   22.16   * specific language governing permissions and limitations under the
   22.17   * License.  When distributing the software, include this License Header
   22.18   * Notice in each file and include the License file at
   22.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   22.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   22.21   * particular file as subject to the "Classpath" exception as provided
   22.22 - * by Sun in the GPL Version 2 section of the License file that
   22.23 + * by Oracle in the GPL Version 2 section of the License file that
   22.24   * accompanied this code. If applicable, add the following below the
   22.25   * License Header, with the fields enclosed by brackets [] replaced by
   22.26   * your own identifying information:

    23.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ISO4217CurrencyCode.java	Mon May 17 14:20:06 2010 -0400
    23.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ISO4217CurrencyCode.java	Mon May 17 14:20:21 2010 -0400
    23.3 @@ -1,7 +1,10 @@
    23.4  /*
    23.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    23.6   *
    23.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    23.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    23.9 + *
   23.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   23.11 + * Other names may be trademarks of their respective owners.
   23.12   *
   23.13   * The contents of this file are subject to the terms of either the GNU
   23.14   * General Public License Version 2 only ("GPL") or the Common
   23.15 @@ -13,9 +16,9 @@
   23.16   * specific language governing permissions and limitations under the
   23.17   * License.  When distributing the software, include this License Header
   23.18   * Notice in each file and include the License file at
   23.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   23.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   23.21   * particular file as subject to the "Classpath" exception as provided
   23.22 - * by Sun in the GPL Version 2 section of the License file that
   23.23 + * by Oracle in the GPL Version 2 section of the License file that
   23.24   * accompanied this code. If applicable, add the following below the
   23.25   * License Header, with the fields enclosed by brackets [] replaced by
   23.26   * your own identifying information:

    24.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/IntegerConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    24.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/IntegerConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    24.3 @@ -1,7 +1,10 @@
    24.4  /*
    24.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    24.6   *
    24.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    24.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    24.9 + *
   24.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   24.11 + * Other names may be trademarks of their respective owners.
   24.12   *
   24.13   * The contents of this file are subject to the terms of either the GNU
   24.14   * General Public License Version 2 only ("GPL") or the Common
   24.15 @@ -13,9 +16,9 @@
   24.16   * specific language governing permissions and limitations under the
   24.17   * License.  When distributing the software, include this License Header
   24.18   * Notice in each file and include the License file at
   24.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   24.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   24.21   * particular file as subject to the "Classpath" exception as provided
   24.22 - * by Sun in the GPL Version 2 section of the License file that
   24.23 + * by Oracle in the GPL Version 2 section of the License file that
   24.24   * accompanied this code. If applicable, add the following below the
   24.25   * License Header, with the fields enclosed by brackets [] replaced by
   24.26   * your own identifying information:

    25.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/LongConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    25.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/LongConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    25.3 @@ -1,7 +1,10 @@
    25.4  /*
    25.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    25.6   *
    25.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    25.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    25.9 + *
   25.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   25.11 + * Other names may be trademarks of their respective owners.
   25.12   *
   25.13   * The contents of this file are subject to the terms of either the GNU
   25.14   * General Public License Version 2 only ("GPL") or the Common
   25.15 @@ -13,9 +16,9 @@
   25.16   * specific language governing permissions and limitations under the
   25.17   * License.  When distributing the software, include this License Header
   25.18   * Notice in each file and include the License file at
   25.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   25.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   25.21   * particular file as subject to the "Classpath" exception as provided
   25.22 - * by Sun in the GPL Version 2 section of the License file that
   25.23 + * by Oracle in the GPL Version 2 section of the License file that
   25.24   * accompanied this code. If applicable, add the following below the
   25.25   * License Header, with the fields enclosed by brackets [] replaced by
   25.26   * your own identifying information:

    26.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    26.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    26.3 @@ -1,7 +1,10 @@
    26.4  /*
    26.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    26.6   *
    26.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    26.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    26.9 + *
   26.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   26.11 + * Other names may be trademarks of their respective owners.
   26.12   *
   26.13   * The contents of this file are subject to the terms of either the GNU
   26.14   * General Public License Version 2 only ("GPL") or the Common
   26.15 @@ -13,9 +16,9 @@
   26.16   * specific language governing permissions and limitations under the
   26.17   * License.  When distributing the software, include this License Header
   26.18   * Notice in each file and include the License file at
   26.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   26.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   26.21   * particular file as subject to the "Classpath" exception as provided
   26.22 - * by Sun in the GPL Version 2 section of the License file that
   26.23 + * by Oracle in the GPL Version 2 section of the License file that
   26.24   * accompanied this code. If applicable, add the following below the
   26.25   * License Header, with the fields enclosed by brackets [] replaced by
   26.26   * your own identifying information:

    27.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizer.java	Mon May 17 14:20:06 2010 -0400
    27.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizer.java	Mon May 17 14:20:21 2010 -0400
    27.3 @@ -1,7 +1,10 @@
    27.4  /*
    27.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    27.6   *
    27.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    27.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    27.9 + *
   27.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   27.11 + * Other names may be trademarks of their respective owners.
   27.12   *
   27.13   * The contents of this file are subject to the terms of either the GNU
   27.14   * General Public License Version 2 only ("GPL") or the Common
   27.15 @@ -13,9 +16,9 @@
   27.16   * specific language governing permissions and limitations under the
   27.17   * License.  When distributing the software, include this License Header
   27.18   * Notice in each file and include the License file at
   27.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   27.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   27.21   * particular file as subject to the "Classpath" exception as provided
   27.22 - * by Sun in the GPL Version 2 section of the License file that
   27.23 + * by Oracle in the GPL Version 2 section of the License file that
   27.24   * accompanied this code. If applicable, add the following below the
   27.25   * License Header, with the fields enclosed by brackets [] replaced by
   27.26   * your own identifying information:

    28.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizerAction.java	Mon May 17 14:20:06 2010 -0400
    28.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizerAction.java	Mon May 17 14:20:21 2010 -0400
    28.3 @@ -1,7 +1,10 @@
    28.4  /*
    28.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    28.6   *
    28.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    28.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    28.9 + *
   28.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   28.11 + * Other names may be trademarks of their respective owners.
   28.12   *
   28.13   * The contents of this file are subject to the terms of either the GNU
   28.14   * General Public License Version 2 only ("GPL") or the Common
   28.15 @@ -13,9 +16,9 @@
   28.16   * specific language governing permissions and limitations under the
   28.17   * License.  When distributing the software, include this License Header
   28.18   * Notice in each file and include the License file at
   28.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   28.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   28.21   * particular file as subject to the "Classpath" exception as provided
   28.22 - * by Sun in the GPL Version 2 section of the License file that
   28.23 + * by Oracle in the GPL Version 2 section of the License file that
   28.24   * accompanied this code. If applicable, add the following below the
   28.25   * License Header, with the fields enclosed by brackets [] replaced by
   28.26   * your own identifying information:

    29.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizerPanel.java	Mon May 17 14:20:06 2010 -0400
    29.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizerPanel.java	Mon May 17 14:20:21 2010 -0400
    29.3 @@ -1,7 +1,10 @@
    29.4  /*
    29.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    29.6   *
    29.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    29.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    29.9 + *
   29.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   29.11 + * Other names may be trademarks of their respective owners.
   29.12   *
   29.13   * The contents of this file are subject to the terms of either the GNU
   29.14   * General Public License Version 2 only ("GPL") or the Common
   29.15 @@ -13,9 +16,9 @@
   29.16   * specific language governing permissions and limitations under the
   29.17   * License.  When distributing the software, include this License Header
   29.18   * Notice in each file and include the License file at
   29.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   29.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   29.21   * particular file as subject to the "Classpath" exception as provided
   29.22 - * by Sun in the GPL Version 2 section of the License file that
   29.23 + * by Oracle in the GPL Version 2 section of the License file that
   29.24   * accompanied this code. If applicable, add the following below the
   29.25   * License Header, with the fields enclosed by brackets [] replaced by
   29.26   * your own identifying information:

    30.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterDesignInfo.java	Mon May 17 14:20:06 2010 -0400
    30.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterDesignInfo.java	Mon May 17 14:20:21 2010 -0400
    30.3 @@ -1,7 +1,10 @@
    30.4  /*
    30.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    30.6   *
    30.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    30.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    30.9 + *
   30.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   30.11 + * Other names may be trademarks of their respective owners.
   30.12   *
   30.13   * The contents of this file are subject to the terms of either the GNU
   30.14   * General Public License Version 2 only ("GPL") or the Common
   30.15 @@ -13,9 +16,9 @@
   30.16   * specific language governing permissions and limitations under the
   30.17   * License.  When distributing the software, include this License Header
   30.18   * Notice in each file and include the License file at
   30.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   30.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   30.21   * particular file as subject to the "Classpath" exception as provided
   30.22 - * by Sun in the GPL Version 2 section of the License file that
   30.23 + * by Oracle in the GPL Version 2 section of the License file that
   30.24   * accompanied this code. If applicable, add the following below the
   30.25   * License Header, with the fields enclosed by brackets [] replaced by
   30.26   * your own identifying information:

    31.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterTypePropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    31.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterTypePropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    31.3 @@ -1,7 +1,10 @@
    31.4  /*
    31.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    31.6   *
    31.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    31.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    31.9 + *
   31.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   31.11 + * Other names may be trademarks of their respective owners.
   31.12   *
   31.13   * The contents of this file are subject to the terms of either the GNU
   31.14   * General Public License Version 2 only ("GPL") or the Common
   31.15 @@ -13,9 +16,9 @@
   31.16   * specific language governing permissions and limitations under the
   31.17   * License.  When distributing the software, include this License Header
   31.18   * Notice in each file and include the License file at
   31.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   31.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   31.21   * particular file as subject to the "Classpath" exception as provided
   31.22 - * by Sun in the GPL Version 2 section of the License file that
   31.23 + * by Oracle in the GPL Version 2 section of the License file that
   31.24   * accompanied this code. If applicable, add the following below the
   31.25   * License Header, with the fields enclosed by brackets [] replaced by
   31.26   * your own identifying information:

    32.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberPatternPanel.java	Mon May 17 14:20:06 2010 -0400
    32.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberPatternPanel.java	Mon May 17 14:20:21 2010 -0400
    32.3 @@ -1,7 +1,10 @@
    32.4  /*
    32.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    32.6   *
    32.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    32.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    32.9 + *
   32.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   32.11 + * Other names may be trademarks of their respective owners.
   32.12   *
   32.13   * The contents of this file are subject to the terms of either the GNU
   32.14   * General Public License Version 2 only ("GPL") or the Common
   32.15 @@ -13,9 +16,9 @@
   32.16   * specific language governing permissions and limitations under the
   32.17   * License.  When distributing the software, include this License Header
   32.18   * Notice in each file and include the License file at
   32.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   32.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   32.21   * particular file as subject to the "Classpath" exception as provided
   32.22 - * by Sun in the GPL Version 2 section of the License file that
   32.23 + * by Oracle in the GPL Version 2 section of the License file that
   32.24   * accompanied this code. If applicable, add the following below the
   32.25   * License Header, with the fields enclosed by brackets [] replaced by
   32.26   * your own identifying information:

    33.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberPatternPropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    33.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberPatternPropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    33.3 @@ -1,7 +1,10 @@
    33.4  /*
    33.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    33.6   *
    33.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    33.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    33.9 + *
   33.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   33.11 + * Other names may be trademarks of their respective owners.
   33.12   *
   33.13   * The contents of this file are subject to the terms of either the GNU
   33.14   * General Public License Version 2 only ("GPL") or the Common
   33.15 @@ -13,9 +16,9 @@
   33.16   * specific language governing permissions and limitations under the
   33.17   * License.  When distributing the software, include this License Header
   33.18   * Notice in each file and include the License file at
   33.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   33.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   33.21   * particular file as subject to the "Classpath" exception as provided
   33.22 - * by Sun in the GPL Version 2 section of the License file that
   33.23 + * by Oracle in the GPL Version 2 section of the License file that
   33.24   * accompanied this code. If applicable, add the following below the
   33.25   * License Header, with the fields enclosed by brackets [] replaced by
   33.26   * your own identifying information:

    34.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ShortConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    34.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ShortConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    34.3 @@ -1,7 +1,10 @@
    34.4  /*
    34.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    34.6   *
    34.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    34.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    34.9 + *
   34.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   34.11 + * Other names may be trademarks of their respective owners.
   34.12   *
   34.13   * The contents of this file are subject to the terms of either the GNU
   34.14   * General Public License Version 2 only ("GPL") or the Common
   34.15 @@ -13,9 +16,9 @@
   34.16   * specific language governing permissions and limitations under the
   34.17   * License.  When distributing the software, include this License Header
   34.18   * Notice in each file and include the License file at
   34.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   34.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   34.21   * particular file as subject to the "Classpath" exception as provided
   34.22 - * by Sun in the GPL Version 2 section of the License file that
   34.23 + * by Oracle in the GPL Version 2 section of the License file that
   34.24   * accompanied this code. If applicable, add the following below the
   34.25   * License Header, with the fields enclosed by brackets [] replaced by
   34.26   * your own identifying information:

    35.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlDateConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    35.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlDateConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    35.3 @@ -1,7 +1,10 @@
    35.4  /*
    35.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    35.6   *
    35.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    35.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    35.9 + *
   35.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   35.11 + * Other names may be trademarks of their respective owners.
   35.12   *
   35.13   * The contents of this file are subject to the terms of either the GNU
   35.14   * General Public License Version 2 only ("GPL") or the Common
   35.15 @@ -13,9 +16,9 @@
   35.16   * specific language governing permissions and limitations under the
   35.17   * License.  When distributing the software, include this License Header
   35.18   * Notice in each file and include the License file at
   35.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   35.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   35.21   * particular file as subject to the "Classpath" exception as provided
   35.22 - * by Sun in the GPL Version 2 section of the License file that
   35.23 + * by Oracle in the GPL Version 2 section of the License file that
   35.24   * accompanied this code. If applicable, add the following below the
   35.25   * License Header, with the fields enclosed by brackets [] replaced by
   35.26   * your own identifying information:

    36.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlTimeConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    36.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlTimeConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    36.3 @@ -1,7 +1,10 @@
    36.4  /*
    36.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    36.6   *
    36.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    36.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    36.9 + *
   36.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   36.11 + * Other names may be trademarks of their respective owners.
   36.12   *
   36.13   * The contents of this file are subject to the terms of either the GNU
   36.14   * General Public License Version 2 only ("GPL") or the Common
   36.15 @@ -13,9 +16,9 @@
   36.16   * specific language governing permissions and limitations under the
   36.17   * License.  When distributing the software, include this License Header
   36.18   * Notice in each file and include the License file at
   36.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   36.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   36.21   * particular file as subject to the "Classpath" exception as provided
   36.22 - * by Sun in the GPL Version 2 section of the License file that
   36.23 + * by Oracle in the GPL Version 2 section of the License file that
   36.24   * accompanied this code. If applicable, add the following below the
   36.25   * License Header, with the fields enclosed by brackets [] replaced by
   36.26   * your own identifying information:

    37.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlTimestampConverterBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    37.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlTimestampConverterBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    37.3 @@ -1,7 +1,10 @@
    37.4  /*
    37.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    37.6   *
    37.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    37.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    37.9 + *
   37.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   37.11 + * Other names may be trademarks of their respective owners.
   37.12   *
   37.13   * The contents of this file are subject to the terms of either the GNU
   37.14   * General Public License Version 2 only ("GPL") or the Common
   37.15 @@ -13,9 +16,9 @@
   37.16   * specific language governing permissions and limitations under the
   37.17   * License.  When distributing the software, include this License Header
   37.18   * Notice in each file and include the License file at
   37.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   37.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   37.21   * particular file as subject to the "Classpath" exception as provided
   37.22 - * by Sun in the GPL Version 2 section of the License file that
   37.23 + * by Oracle in the GPL Version 2 section of the License file that
   37.24   * accompanied this code. If applicable, add the following below the
   37.25   * License Header, with the fields enclosed by brackets [] replaced by
   37.26   * your own identifying information:

    38.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/BoundRowSetColumnPropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    38.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/BoundRowSetColumnPropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    38.3 @@ -1,7 +1,10 @@
    38.4  /*
    38.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    38.6   *
    38.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    38.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    38.9 + *
   38.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   38.11 + * Other names may be trademarks of their respective owners.
   38.12   *
   38.13   * The contents of this file are subject to the terms of either the GNU
   38.14   * General Public License Version 2 only ("GPL") or the Common
   38.15 @@ -13,9 +16,9 @@
   38.16   * specific language governing permissions and limitations under the
   38.17   * License.  When distributing the software, include this License Header
   38.18   * Notice in each file and include the License file at
   38.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   38.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   38.21   * particular file as subject to the "Classpath" exception as provided
   38.22 - * by Sun in the GPL Version 2 section of the License file that
   38.23 + * by Oracle in the GPL Version 2 section of the License file that
   38.24   * accompanied this code. If applicable, add the following below the
   38.25   * License Header, with the fields enclosed by brackets [] replaced by
   38.26   * your own identifying information:

    39.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/CachedRowSetDataModelBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    39.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/CachedRowSetDataModelBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    39.3 @@ -1,7 +1,10 @@
    39.4  /*
    39.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    39.6   *
    39.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    39.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    39.9 + *
   39.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   39.11 + * Other names may be trademarks of their respective owners.
   39.12   *
   39.13   * The contents of this file are subject to the terms of either the GNU
   39.14   * General Public License Version 2 only ("GPL") or the Common
   39.15 @@ -13,9 +16,9 @@
   39.16   * specific language governing permissions and limitations under the
   39.17   * License.  When distributing the software, include this License Header
   39.18   * Notice in each file and include the License file at
   39.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   39.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   39.21   * particular file as subject to the "Classpath" exception as provided
   39.22 - * by Sun in the GPL Version 2 section of the License file that
   39.23 + * by Oracle in the GPL Version 2 section of the License file that
   39.24   * accompanied this code. If applicable, add the following below the
   39.25   * License Header, with the fields enclosed by brackets [] replaced by
   39.26   * your own identifying information:

    40.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ConcurrencyPropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    40.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ConcurrencyPropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    40.3 @@ -1,7 +1,10 @@
    40.4  /*
    40.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    40.6   *
    40.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    40.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    40.9 + *
   40.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   40.11 + * Other names may be trademarks of their respective owners.
   40.12   *
   40.13   * The contents of this file are subject to the terms of either the GNU
   40.14   * General Public License Version 2 only ("GPL") or the Common
   40.15 @@ -13,9 +16,9 @@
   40.16   * specific language governing permissions and limitations under the
   40.17   * License.  When distributing the software, include this License Header
   40.18   * Notice in each file and include the License file at
   40.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   40.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   40.21   * particular file as subject to the "Classpath" exception as provided
   40.22 - * by Sun in the GPL Version 2 section of the License file that
   40.23 + * by Oracle in the GPL Version 2 section of the License file that
   40.24   * accompanied this code. If applicable, add the following below the
   40.25   * License Header, with the fields enclosed by brackets [] replaced by
   40.26   * your own identifying information:

    41.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DataSourceNamePropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    41.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DataSourceNamePropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    41.3 @@ -1,7 +1,10 @@
    41.4  /*
    41.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    41.6   *
    41.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    41.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    41.9 + *
   41.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   41.11 + * Other names may be trademarks of their respective owners.
   41.12   *
   41.13   * The contents of this file are subject to the terms of either the GNU
   41.14   * General Public License Version 2 only ("GPL") or the Common
   41.15 @@ -13,9 +16,9 @@
   41.16   * specific language governing permissions and limitations under the
   41.17   * License.  When distributing the software, include this License Header
   41.18   * Notice in each file and include the License file at
   41.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   41.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   41.21   * particular file as subject to the "Classpath" exception as provided
   41.22 - * by Sun in the GPL Version 2 section of the License file that
   41.23 + * by Oracle in the GPL Version 2 section of the License file that
   41.24   * accompanied this code. If applicable, add the following below the
   41.25   * License Header, with the fields enclosed by brackets [] replaced by
   41.26   * your own identifying information:

    42.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DefaultSelectItemsArrayBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    42.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DefaultSelectItemsArrayBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    42.3 @@ -1,7 +1,10 @@
    42.4  /*
    42.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    42.6   *
    42.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    42.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    42.9 + *
   42.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   42.11 + * Other names may be trademarks of their respective owners.
   42.12   *
   42.13   * The contents of this file are subject to the terms of either the GNU
   42.14   * General Public License Version 2 only ("GPL") or the Common
   42.15 @@ -13,9 +16,9 @@
   42.16   * specific language governing permissions and limitations under the
   42.17   * License.  When distributing the software, include this License Header
   42.18   * Notice in each file and include the License file at
   42.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   42.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   42.21   * particular file as subject to the "Classpath" exception as provided
   42.22 - * by Sun in the GPL Version 2 section of the License file that
   42.23 + * by Oracle in the GPL Version 2 section of the License file that
   42.24   * accompanied this code. If applicable, add the following below the
   42.25   * License Header, with the fields enclosed by brackets [] replaced by
   42.26   * your own identifying information:

    43.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DefaultTableDataModelBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    43.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DefaultTableDataModelBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    43.3 @@ -1,7 +1,10 @@
    43.4  /*
    43.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    43.6   *
    43.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    43.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    43.9 + *
   43.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   43.11 + * Other names may be trademarks of their respective owners.
   43.12   *
   43.13   * The contents of this file are subject to the terms of either the GNU
   43.14   * General Public License Version 2 only ("GPL") or the Common
   43.15 @@ -13,9 +16,9 @@
   43.16   * specific language governing permissions and limitations under the
   43.17   * License.  When distributing the software, include this License Header
   43.18   * Notice in each file and include the License file at
   43.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   43.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   43.21   * particular file as subject to the "Classpath" exception as provided
   43.22 - * by Sun in the GPL Version 2 section of the License file that
   43.23 + * by Oracle in the GPL Version 2 section of the License file that
   43.24   * accompanied this code. If applicable, add the following below the
   43.25   * License Header, with the fields enclosed by brackets [] replaced by
   43.26   * your own identifying information:

    44.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/HoldabilityPropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    44.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/HoldabilityPropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    44.3 @@ -1,7 +1,10 @@
    44.4  /*
    44.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    44.6   *
    44.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    44.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    44.9 + *
   44.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   44.11 + * Other names may be trademarks of their respective owners.
   44.12   *
   44.13   * The contents of this file are subject to the terms of either the GNU
   44.14   * General Public License Version 2 only ("GPL") or the Common
   44.15 @@ -13,9 +16,9 @@
   44.16   * specific language governing permissions and limitations under the
   44.17   * License.  When distributing the software, include this License Header
   44.18   * Notice in each file and include the License file at
   44.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   44.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   44.21   * particular file as subject to the "Classpath" exception as provided
   44.22 - * by Sun in the GPL Version 2 section of the License file that
   44.23 + * by Oracle in the GPL Version 2 section of the License file that
   44.24   * accompanied this code. If applicable, add the following below the
   44.25   * License Header, with the fields enclosed by brackets [] replaced by
   44.26   * your own identifying information:

    45.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ItemsRowSetColumnPropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    45.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ItemsRowSetColumnPropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    45.3 @@ -1,7 +1,10 @@
    45.4  /*
    45.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    45.6   *
    45.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    45.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    45.9 + *
   45.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   45.11 + * Other names may be trademarks of their respective owners.
   45.12   *
   45.13   * The contents of this file are subject to the terms of either the GNU
   45.14   * General Public License Version 2 only ("GPL") or the Common
   45.15 @@ -13,9 +16,9 @@
   45.16   * specific language governing permissions and limitations under the
   45.17   * License.  When distributing the software, include this License Header
   45.18   * Notice in each file and include the License file at
   45.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   45.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   45.21   * particular file as subject to the "Classpath" exception as provided
   45.22 - * by Sun in the GPL Version 2 section of the License file that
   45.23 + * by Oracle in the GPL Version 2 section of the License file that
   45.24   * accompanied this code. If applicable, add the following below the
   45.25   * License Header, with the fields enclosed by brackets [] replaced by
   45.26   * your own identifying information:

    46.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ResultSetDataModelBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    46.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ResultSetDataModelBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    46.3 @@ -1,7 +1,10 @@
    46.4  /*
    46.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    46.6   *
    46.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    46.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    46.9 + *
   46.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   46.11 + * Other names may be trademarks of their respective owners.
   46.12   *
   46.13   * The contents of this file are subject to the terms of either the GNU
   46.14   * General Public License Version 2 only ("GPL") or the Common
   46.15 @@ -13,9 +16,9 @@
   46.16   * specific language governing permissions and limitations under the
   46.17   * License.  When distributing the software, include this License Header
   46.18   * Notice in each file and include the License file at
   46.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   46.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   46.21   * particular file as subject to the "Classpath" exception as provided
   46.22 - * by Sun in the GPL Version 2 section of the License file that
   46.23 + * by Oracle in the GPL Version 2 section of the License file that
   46.24   * accompanied this code. If applicable, add the following below the
   46.25   * License Header, with the fields enclosed by brackets [] replaced by
   46.26   * your own identifying information:

    47.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/RowSetDataModelBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    47.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/RowSetDataModelBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    47.3 @@ -1,7 +1,10 @@
    47.4  /*
    47.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    47.6   *
    47.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    47.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    47.9 + *
   47.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   47.11 + * Other names may be trademarks of their respective owners.
   47.12   *
   47.13   * The contents of this file are subject to the terms of either the GNU
   47.14   * General Public License Version 2 only ("GPL") or the Common
   47.15 @@ -13,9 +16,9 @@
   47.16   * specific language governing permissions and limitations under the
   47.17   * License.  When distributing the software, include this License Header
   47.18   * Notice in each file and include the License file at
   47.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   47.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   47.21   * particular file as subject to the "Classpath" exception as provided
   47.22 - * by Sun in the GPL Version 2 section of the License file that
   47.23 + * by Oracle in the GPL Version 2 section of the License file that
   47.24   * accompanied this code. If applicable, add the following below the
   47.25   * License Header, with the fields enclosed by brackets [] replaced by
   47.26   * your own identifying information:

    48.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/RowSetPropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    48.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/RowSetPropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    48.3 @@ -1,7 +1,10 @@
    48.4  /*
    48.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    48.6   *
    48.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    48.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    48.9 + *
   48.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   48.11 + * Other names may be trademarks of their respective owners.
   48.12   *
   48.13   * The contents of this file are subject to the terms of either the GNU
   48.14   * General Public License Version 2 only ("GPL") or the Common
   48.15 @@ -13,9 +16,9 @@
   48.16   * specific language governing permissions and limitations under the
   48.17   * License.  When distributing the software, include this License Header
   48.18   * Notice in each file and include the License file at
   48.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   48.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   48.21   * particular file as subject to the "Classpath" exception as provided
   48.22 - * by Sun in the GPL Version 2 section of the License file that
   48.23 + * by Oracle in the GPL Version 2 section of the License file that
   48.24   * accompanied this code. If applicable, add the following below the
   48.25   * License Header, with the fields enclosed by brackets [] replaced by
   48.26   * your own identifying information:

    49.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/TransactionIsolationPropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    49.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/TransactionIsolationPropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    49.3 @@ -1,7 +1,10 @@
    49.4  /*
    49.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    49.6   *
    49.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    49.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    49.9 + *
   49.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   49.11 + * Other names may be trademarks of their respective owners.
   49.12   *
   49.13   * The contents of this file are subject to the terms of either the GNU
   49.14   * General Public License Version 2 only ("GPL") or the Common
   49.15 @@ -13,9 +16,9 @@
   49.16   * specific language governing permissions and limitations under the
   49.17   * License.  When distributing the software, include this License Header
   49.18   * Notice in each file and include the License file at
   49.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   49.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   49.21   * particular file as subject to the "Classpath" exception as provided
   49.22 - * by Sun in the GPL Version 2 section of the License file that
   49.23 + * by Oracle in the GPL Version 2 section of the License file that
   49.24   * accompanied this code. If applicable, add the following below the
   49.25   * License Header, with the fields enclosed by brackets [] replaced by
   49.26   * your own identifying information:

    50.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/TypePropertyEditor.java	Mon May 17 14:20:06 2010 -0400
    50.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/TypePropertyEditor.java	Mon May 17 14:20:21 2010 -0400
    50.3 @@ -1,7 +1,10 @@
    50.4  /*
    50.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    50.6   *
    50.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    50.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    50.9 + *
   50.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   50.11 + * Other names may be trademarks of their respective owners.
   50.12   *
   50.13   * The contents of this file are subject to the terms of either the GNU
   50.14   * General Public License Version 2 only ("GPL") or the Common
   50.15 @@ -13,9 +16,9 @@
   50.16   * specific language governing permissions and limitations under the
   50.17   * License.  When distributing the software, include this License Header
   50.18   * Notice in each file and include the License file at
   50.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   50.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   50.21   * particular file as subject to the "Classpath" exception as provided
   50.22 - * by Sun in the GPL Version 2 section of the License file that
   50.23 + * by Oracle in the GPL Version 2 section of the License file that
   50.24   * accompanied this code. If applicable, add the following below the
   50.25   * License Header, with the fields enclosed by brackets [] replaced by
   50.26   * your own identifying information:

    51.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/lifecycle/CreatorLifeCycleBeanInfo.java	Mon May 17 14:20:06 2010 -0400
    51.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/lifecycle/CreatorLifeCycleBeanInfo.java	Mon May 17 14:20:21 2010 -0400
    51.3 @@ -1,7 +1,10 @@
    51.4  /*
    51.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    51.6   *
    51.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    51.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    51.9 + *
   51.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   51.11 + * Other names may be trademarks of their respective owners.
   51.12   *
   51.13   * The contents of this file are subject to the terms of either the GNU
   51.14   * General Public License Version 2 only ("GPL") or the Common
   51.15 @@ -13,9 +16,9 @@
   51.16   * specific language governing permissions and limitations under the
   51.17   * License.  When distributing the software, include this License Header
   51.18   * Notice in each file and include the License file at
   51.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   51.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   51.21   * particular file as subject to the "Classpath" exception as provided
   51.22 - * by Sun in the GPL Version 2 section of the License file that
   51.23 + * by Oracle in the GPL Version 2 section of the License file that
   51.24   * accompanied this code. If applicable, add the following below the
   51.25   * License Header, with the fields enclosed by brackets [] replaced by
   51.26   * your own identifying information:

    52.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/AbstractDesignTimeRenderer.java	Mon May 17 14:20:06 2010 -0400
    52.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/AbstractDesignTimeRenderer.java	Mon May 17 14:20:21 2010 -0400
    52.3 @@ -1,7 +1,10 @@
    52.4  /*
    52.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    52.6   *
    52.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    52.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    52.9 + *
   52.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   52.11 + * Other names may be trademarks of their respective owners.
   52.12   *
   52.13   * The contents of this file are subject to the terms of either the GNU
   52.14   * General Public License Version 2 only ("GPL") or the Common
   52.15 @@ -13,9 +16,9 @@
   52.16   * specific language governing permissions and limitations under the
   52.17   * License.  When distributing the software, include this License Header
   52.18   * Notice in each file and include the License file at
   52.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   52.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   52.21   * particular file as subject to the "Classpath" exception as provided
   52.22 - * by Sun in the GPL Version 2 section of the License file that
   52.23 + * by Oracle in the GPL Version 2 section of the License file that
   52.24   * accompanied this code. If applicable, add the following below the
   52.25   * License Header, with the fields enclosed by brackets [] replaced by
   52.26   * your own identifying information:

    53.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/Bundle.properties	Mon May 17 14:20:06 2010 -0400
    53.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/Bundle.properties	Mon May 17 14:20:21 2010 -0400
    53.3 @@ -1,7 +1,10 @@
    53.4  # -----------------------------------------------------------------------------
    53.5  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    53.6  #
    53.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    53.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    53.9 +#
   53.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   53.11 +# Other names may be trademarks of their respective owners.
   53.12  #
   53.13  # The contents of this file are subject to the terms of either the GNU
   53.14  # General Public License Version 2 only ("GPL") or the Common
   53.15 @@ -13,9 +16,9 @@
   53.16  # specific language governing permissions and limitations under the
   53.17  # License.  When distributing the software, include this License Header
   53.18  # Notice in each file and include the License file at
   53.19 -# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   53.20 +# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   53.21  # particular file as subject to the "Classpath" exception as provided
   53.22 -# by Sun in the GPL Version 2 section of the License file that
   53.23 +# by Oracle in the GPL Version 2 section of the License file that
   53.24  # accompanied this code. If applicable, add the following below the
   53.25  # License Header, with the fields enclosed by brackets [] replaced by
   53.26  # your own identifying information:

    54.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/MessageDesignTimeRenderer.java	Mon May 17 14:20:06 2010 -0400
    54.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/MessageDesignTimeRenderer.java	Mon May 17 14:20:21 2010 -0400
    54.3 @@ -1,7 +1,10 @@
    54.4  /*
    54.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    54.6   *
    54.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    54.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    54.9 + *
   54.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   54.11 + * Other names may be trademarks of their respective owners.
   54.12   *
   54.13   * The contents of this file are subject to the terms of either the GNU
   54.14   * General Public License Version 2 only ("GPL") or the Common
   54.15 @@ -13,9 +16,9 @@
   54.16   * specific language governing permissions and limitations under the
   54.17   * License.  When distributing the software, include this License Header
   54.18   * Notice in each file and include the License file at
   54.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   54.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   54.21   * particular file as subject to the "Classpath" exception as provided
   54.22 - * by Sun in the GPL Version 2 section of the License file that
   54.23 + * by Oracle in the GPL Version 2 section of the License file that
   54.24   * accompanied this code. If applicable, add the following below the
   54.25   * License Header, with the fields enclosed by brackets [] replaced by
   54.26   * your own identifying information:

    55.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/MessagesDesignTimeRenderer.java	Mon May 17 14:20:06 2010 -0400
    55.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/MessagesDesignTimeRenderer.java	Mon May 17 14:20:21 2010 -0400
    55.3 @@ -1,7 +1,10 @@
    55.4  /*
    55.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    55.6   *
    55.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    55.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    55.9 + *
   55.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   55.11 + * Other names may be trademarks of their respective owners.
   55.12   *
   55.13   * The contents of this file are subject to the terms of either the GNU
   55.14   * General Public License Version 2 only ("GPL") or the Common
   55.15 @@ -13,9 +16,9 @@
   55.16   * specific language governing permissions and limitations under the
   55.17   * License.  When distributing the software, include this License Header
   55.18   * Notice in each file and include the License file at
   55.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   55.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   55.21   * particular file as subject to the "Classpath" exception as provided
   55.22 - * by Sun in the GPL Version 2 section of the License file that
   55.23 + * by Oracle in the GPL Version 2 section of the License file that
   55.24   * accompanied this code. If applicable, add the following below the
   55.25   * License Header, with the fields enclosed by brackets [] replaced by
   55.26   * your own identifying information:

    56.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/TextDesignTimeRenderer.java	Mon May 17 14:20:06 2010 -0400
    56.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/TextDesignTimeRenderer.java	Mon May 17 14:20:21 2010 -0400
    56.3 @@ -1,7 +1,10 @@
    56.4  /*
    56.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    56.6   *
    56.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    56.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    56.9 + *
   56.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   56.11 + * Other names may be trademarks of their respective owners.
   56.12   *
   56.13   * The contents of this file are subject to the terms of either the GNU
   56.14   * General Public License Version 2 only ("GPL") or the Common
   56.15 @@ -13,9 +16,9 @@
   56.16   * specific language governing permissions and limitations under the
   56.17   * License.  When distributing the software, include this License Header
   56.18   * Notice in each file and include the License file at
   56.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   56.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   56.21   * particular file as subject to the "Classpath" exception as provided
   56.22 - * by Sun in the GPL Version 2 section of the License file that
   56.23 + * by Oracle in the GPL Version 2 section of the License file that
   56.24   * accompanied this code. If applicable, add the following below the
   56.25   * License Header, with the fields enclosed by brackets [] replaced by
   56.26   * your own identifying information:

    57.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/Bundle.properties	Mon May 17 14:20:06 2010 -0400
    57.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/Bundle.properties	Mon May 17 14:20:21 2010 -0400
    57.3 @@ -1,6 +1,9 @@
    57.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    57.5  #
    57.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    57.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    57.8 +#
    57.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   57.10 +# Other names may be trademarks of their respective owners.
   57.11  #
   57.12  # The contents of this file are subject to the terms of either the GNU
   57.13  # General Public License Version 2 only ("GPL") or the Common
   57.14 @@ -12,9 +15,9 @@
   57.15  # specific language governing permissions and limitations under the
   57.16  # License.  When distributing the software, include this License Header
   57.17  # Notice in each file and include the License file at
   57.18 -# nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   57.19 +# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   57.20  # particular file as subject to the "Classpath" exception as provided
   57.21 -# by Sun in the GPL Version 2 section of the License file that
   57.22 +# by Oracle in the GPL Version 2 section of the License file that
   57.23  # accompanied this code. If applicable, add the following below the
   57.24  # License Header, with the fields enclosed by brackets [] replaced by
   57.25  # your own identifying information:

    58.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingCustomizer.java	Mon May 17 14:20:06 2010 -0400
    58.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingCustomizer.java	Mon May 17 14:20:21 2010 -0400
    58.3 @@ -1,7 +1,10 @@
    58.4  /*
    58.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    58.6   *
    58.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    58.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    58.9 + *
   58.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   58.11 + * Other names may be trademarks of their respective owners.
   58.12   *
   58.13   * The contents of this file are subject to the terms of either the GNU
   58.14   * General Public License Version 2 only ("GPL") or the Common
   58.15 @@ -13,9 +16,9 @@
   58.16   * specific language governing permissions and limitations under the
   58.17   * License.  When distributing the software, include this License Header
   58.18   * Notice in each file and include the License file at
   58.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   58.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   58.21   * particular file as subject to the "Classpath" exception as provided
   58.22 - * by Sun in the GPL Version 2 section of the License file that
   58.23 + * by Oracle in the GPL Version 2 section of the License file that
   58.24   * accompanied this code. If applicable, add the following below the
   58.25   * License Header, with the fields enclosed by brackets [] replaced by
   58.26   * your own identifying information:

    59.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingCustomizerAction.java	Mon May 17 14:20:06 2010 -0400
    59.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingCustomizerAction.java	Mon May 17 14:20:21 2010 -0400
    59.3 @@ -1,7 +1,10 @@
    59.4  /*
    59.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    59.6   *
    59.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    59.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    59.9 + *
   59.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   59.11 + * Other names may be trademarks of their respective owners.
   59.12   *
   59.13   * The contents of this file are subject to the terms of either the GNU
   59.14   * General Public License Version 2 only ("GPL") or the Common
   59.15 @@ -13,9 +16,9 @@
   59.16   * specific language governing permissions and limitations under the
   59.17   * License.  When distributing the software, include this License Header
   59.18   * Notice in each file and include the License file at
   59.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   59.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   59.21   * particular file as subject to the "Classpath" exception as provided
   59.22 - * by Sun in the GPL Version 2 section of the License file that
   59.23 + * by Oracle in the GPL Version 2 section of the License file that
   59.24   * accompanied this code. If applicable, add the following below the
   59.25   * License Header, with the fields enclosed by brackets [] replaced by
   59.26   * your own identifying information:

    60.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingPanel.java	Mon May 17 14:20:06 2010 -0400
    60.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingPanel.java	Mon May 17 14:20:21 2010 -0400
    60.3 @@ -1,7 +1,10 @@
    60.4  /*
    60.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    60.6   *
    60.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    60.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    60.9 + *
   60.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   60.11 + * Other names may be trademarks of their respective owners.
   60.12   *
   60.13   * The contents of this file are subject to the terms of either the GNU
   60.14   * General Public License Version 2 only ("GPL") or the Common
   60.15 @@ -13,9 +16,9 @@
   60.16   * specific language governing permissions and limitations under the
   60.17   * License.  When distributing the software, include this License Header
   60.18   * Notice in each file and include the License file at
   60.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   60.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   60.21   * particular file as subject to the "Classpath" exception as provided
   60.22 - * by Sun in the GPL Version 2 section of the License file that
   60.23 + * by Oracle in the GPL Version 2 section of the License file that
   60.24   * accompanied this code. If applicable, add the following below the
   60.25   * License Header, with the fields enclosed by brackets [] replaced by
   60.26   * your own identifying information:

    61.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingCustomizer.java	Mon May 17 14:20:06 2010 -0400
    61.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingCustomizer.java	Mon May 17 14:20:21 2010 -0400
    61.3 @@ -1,7 +1,10 @@
    61.4  /*
    61.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    61.6   *
    61.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    61.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    61.9 + *
   61.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   61.11 + * Other names may be trademarks of their respective owners.
   61.12   *
   61.13   * The contents of this file are subject to the terms of either the GNU
   61.14   * General Public License Version 2 only ("GPL") or the Common
   61.15 @@ -13,9 +16,9 @@
   61.16   * specific language governing permissions and limitations under the
   61.17   * License.  When distributing the software, include this License Header
   61.18   * Notice in each file and include the License file at
   61.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   61.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   61.21   * particular file as subject to the "Classpath" exception as provided
   61.22 - * by Sun in the GPL Version 2 section of the License file that
   61.23 + * by Oracle in the GPL Version 2 section of the License file that
   61.24   * accompanied this code. If applicable, add the following below the
   61.25   * License Header, with the fields enclosed by brackets [] replaced by
   61.26   * your own identifying information:

    62.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingCustomizerAction.java	Mon May 17 14:20:06 2010 -0400
    62.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingCustomizerAction.java	Mon May 17 14:20:21 2010 -0400
    62.3 @@ -1,7 +1,10 @@
    62.4  /*
    62.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    62.6   *
    62.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
    62.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    62.9 + *
   62.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   62.11 + * Other names may be trademarks of their respective owners.
   62.12   *
   62.13   * The contents of this file are subject to the terms of either the GNU
   62.14   * General Public License Version 2 only ("GPL") or the Common
   62.15 @@ -13,9 +16,9 @@
   62.16   * specific language governing permissions and limitations under the
   62.17   * License.  When distributing the software, include this License Header
   62.18   * Notice in each file and include the License file at
   62.19 - * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
   62.20 + * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
   62.21   * particular file as subject to the "Classpath" exception as provided
   62.22 - * by Sun in the GPL Version 2 section of the License file that
   62.23 + * by Oracle in the GPL Version 2 section of the License file that
   62.24   * accompanied this code. If applicable, add the following below the
   62.25   * License Header, with the fields enclosed by brackets [] replaced by
   62.26   * your own identifying information: