Updated copyright headers. [74]
1.1 --- a/visualweb.api.designer/build.xml Mon May 17 14:11:51 2010 -0400
1.2 +++ b/visualweb.api.designer/build.xml Mon May 17 14:19:35 2010 -0400
1.3 @@ -2,7 +2,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
1.14 The contents of this file are subject to the terms of either the GNU
1.15 @@ -15,9 +18,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.api.designer/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
2.2 +++ b/visualweb.api.designer/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
2.3 @@ -1,6 +1,9 @@
2.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2.5 #
2.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2.8 +#
2.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2.10 +# Other names may be trademarks of their respective owners.
2.11 #
2.12 # The contents of this file are subject to the terms of either the GNU
2.13 # General Public License Version 2 only ("GPL") or the Common
2.14 @@ -12,9 +15,9 @@
2.15 # specific language governing permissions and limitations under the
2.16 # License. When distributing the software, include this License Header
2.17 # Notice in each file and include the License file at
2.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2.20 # particular file as subject to the "Classpath" exception as provided
2.21 -# by Sun in the GPL Version 2 section of the License file that
2.22 +# by Oracle in the GPL Version 2 section of the License file that
2.23 # accompanied this code. If applicable, add the following below the
2.24 # License Header, with the fields enclosed by brackets [] replaced by
2.25 # your own identifying information:
3.1 --- a/visualweb.api.designer/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
3.2 +++ b/visualweb.api.designer/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
3.3 @@ -2,7 +2,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
3.14 The contents of this file are subject to the terms of either the GNU
3.15 @@ -15,9 +18,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.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/DesignTimeTransferDataCreator.java Mon May 17 14:11:51 2010 -0400
4.2 +++ b/visualweb.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/DesignTimeTransferDataCreator.java Mon May 17 14:19:35 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.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/DesignerServiceHack.java Mon May 17 14:11:51 2010 -0400
5.2 +++ b/visualweb.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/DesignerServiceHack.java Mon May 17 14:19:35 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.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/resources/Bundle.properties Mon May 17 14:11:51 2010 -0400
6.2 +++ b/visualweb.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/resources/Bundle.properties Mon May 17 14:19:35 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.api.insync/build.xml Mon May 17 14:11:51 2010 -0400
7.2 +++ b/visualweb.api.insync/build.xml Mon May 17 14:19:35 2010 -0400
7.3 @@ -2,7 +2,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
7.14 The contents of this file are subject to the terms of either the GNU
7.15 @@ -15,9 +18,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.api.insync/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
8.2 +++ b/visualweb.api.insync/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
8.3 @@ -1,6 +1,9 @@
8.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
8.5 #
8.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
8.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
8.8 +#
8.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
8.10 +# Other names may be trademarks of their respective owners.
8.11 #
8.12 # The contents of this file are subject to the terms of either the GNU
8.13 # General Public License Version 2 only ("GPL") or the Common
8.14 @@ -12,9 +15,9 @@
8.15 # specific language governing permissions and limitations under the
8.16 # License. When distributing the software, include this License Header
8.17 # Notice in each file and include the License file at
8.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
8.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
8.20 # particular file as subject to the "Classpath" exception as provided
8.21 -# by Sun in the GPL Version 2 section of the License file that
8.22 +# by Oracle in the GPL Version 2 section of the License file that
8.23 # accompanied this code. If applicable, add the following below the
8.24 # License Header, with the fields enclosed by brackets [] replaced by
8.25 # your own identifying information:
9.1 --- a/visualweb.api.insync/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
9.2 +++ b/visualweb.api.insync/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
9.3 @@ -2,7 +2,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
9.14 The contents of this file are subject to the terms of either the GNU
9.15 @@ -15,9 +18,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.api.insync/src/org/netbeans/modules/visualweb/api/insync/Bundle.properties Mon May 17 14:11:51 2010 -0400
10.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/Bundle.properties Mon May 17 14:19:35 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.api.insync/src/org/netbeans/modules/visualweb/api/insync/InSyncService.java Mon May 17 14:11:51 2010 -0400
11.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/InSyncService.java Mon May 17 14:19:35 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.api.insync/src/org/netbeans/modules/visualweb/api/insync/JsfDataObjectMarker.java Mon May 17 14:11:51 2010 -0400
12.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/JsfDataObjectMarker.java Mon May 17 14:19:35 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.api.insync/src/org/netbeans/modules/visualweb/api/insync/JsfJavaDataObjectMarker.java Mon May 17 14:11:51 2010 -0400
13.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/JsfJavaDataObjectMarker.java Mon May 17 14:19:35 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.api.insync/src/org/netbeans/modules/visualweb/api/insync/JsfJspDataObjectMarker.java Mon May 17 14:11:51 2010 -0400
14.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/JsfJspDataObjectMarker.java Mon May 17 14:19:35 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.api.j2ee/build.xml Mon May 17 14:11:51 2010 -0400
15.2 +++ b/visualweb.api.j2ee/build.xml Mon May 17 14:19:35 2010 -0400
15.3 @@ -2,7 +2,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
15.14 The contents of this file are subject to the terms of either the GNU
15.15 @@ -15,9 +18,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.api.j2ee/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
16.2 +++ b/visualweb.api.j2ee/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
16.3 @@ -1,6 +1,9 @@
16.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
16.5 #
16.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
16.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
16.8 +#
16.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
16.10 +# Other names may be trademarks of their respective owners.
16.11 #
16.12 # The contents of this file are subject to the terms of either the GNU
16.13 # General Public License Version 2 only ("GPL") or the Common
16.14 @@ -12,9 +15,9 @@
16.15 # specific language governing permissions and limitations under the
16.16 # License. When distributing the software, include this License Header
16.17 # Notice in each file and include the License file at
16.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
16.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
16.20 # particular file as subject to the "Classpath" exception as provided
16.21 -# by Sun in the GPL Version 2 section of the License file that
16.22 +# by Oracle in the GPL Version 2 section of the License file that
16.23 # accompanied this code. If applicable, add the following below the
16.24 # License Header, with the fields enclosed by brackets [] replaced by
16.25 # your own identifying information:
17.1 --- a/visualweb.api.j2ee/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
17.2 +++ b/visualweb.api.j2ee/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
17.3 @@ -2,7 +2,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
17.14 The contents of this file are subject to the terms of either the GNU
17.15 @@ -15,9 +18,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.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/Bundle.properties Mon May 17 14:11:51 2010 -0400
18.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/Bundle.properties Mon May 17 14:19:35 2010 -0400
18.3 @@ -1,6 +1,9 @@
18.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
18.5 #
18.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
18.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
18.8 +#
18.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
18.10 +# Other names may be trademarks of their respective owners.
18.11 #
18.12 # The contents of this file are subject to the terms of either the GNU
18.13 # General Public License Version 2 only ("GPL") or the Common
18.14 @@ -12,9 +15,9 @@
18.15 # specific language governing permissions and limitations under the
18.16 # License. When distributing the software, include this License Header
18.17 # Notice in each file and include the License file at
18.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
18.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
18.20 # particular file as subject to the "Classpath" exception as provided
18.21 -# by Sun in the GPL Version 2 section of the License file that
18.22 +# by Oracle in the GPL Version 2 section of the License file that
18.23 # accompanied this code. If applicable, add the following below the
18.24 # License Header, with the fields enclosed by brackets [] replaced by
18.25 # your own identifying information:
19.1 --- a/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/ProjectProperties.java Mon May 17 14:11:51 2010 -0400
19.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/ProjectProperties.java Mon May 17 14:19:35 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.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedEjbResource.java Mon May 17 14:11:51 2010 -0400
20.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedEjbResource.java Mon May 17 14:19:35 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.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedJdbcResource.java Mon May 17 14:11:51 2010 -0400
21.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedJdbcResource.java Mon May 17 14:19:35 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.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedResource.java Mon May 17 14:11:51 2010 -0400
22.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedResource.java Mon May 17 14:19:35 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.api.portlet.dd/build.xml Mon May 17 14:11:51 2010 -0400
23.2 +++ b/visualweb.api.portlet.dd/build.xml Mon May 17 14:19:35 2010 -0400
23.3 @@ -2,7 +2,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
23.14 The contents of this file are subject to the terms of either the GNU
23.15 @@ -15,9 +18,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.api.portlet.dd/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
24.2 +++ b/visualweb.api.portlet.dd/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
24.3 @@ -1,6 +1,9 @@
24.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
24.5 #
24.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
24.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
24.8 +#
24.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
24.10 +# Other names may be trademarks of their respective owners.
24.11 #
24.12 # The contents of this file are subject to the terms of either the GNU
24.13 # General Public License Version 2 only ("GPL") or the Common
24.14 @@ -12,9 +15,9 @@
24.15 # specific language governing permissions and limitations under the
24.16 # License. When distributing the software, include this License Header
24.17 # Notice in each file and include the License file at
24.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
24.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
24.20 # particular file as subject to the "Classpath" exception as provided
24.21 -# by Sun in the GPL Version 2 section of the License file that
24.22 +# by Oracle in the GPL Version 2 section of the License file that
24.23 # accompanied this code. If applicable, add the following below the
24.24 # License Header, with the fields enclosed by brackets [] replaced by
24.25 # your own identifying information:
25.1 --- a/visualweb.api.portlet.dd/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
25.2 +++ b/visualweb.api.portlet.dd/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
25.3 @@ -2,7 +2,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
25.14 The contents of this file are subject to the terms of either the GNU
25.15 @@ -15,9 +18,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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CommonBean.java Mon May 17 14:11:51 2010 -0400
26.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CommonBean.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomPortletModeType.java Mon May 17 14:11:51 2010 -0400
27.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomPortletModeType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomPortletModeTypeInterface.java Mon May 17 14:11:51 2010 -0400
28.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomPortletModeTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomWindowStateType.java Mon May 17 14:11:51 2010 -0400
29.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomWindowStateType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomWindowStateTypeInterface.java Mon May 17 14:11:51 2010 -0400
30.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomWindowStateTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/InitParamType.java Mon May 17 14:11:51 2010 -0400
31.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/InitParamType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/InitParamTypeInterface.java Mon May 17 14:11:51 2010 -0400
32.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/InitParamTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/JsfPortletDDProperties.java Mon May 17 14:11:51 2010 -0400
33.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/JsfPortletDDProperties.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletApp.java Mon May 17 14:11:51 2010 -0400
34.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletApp.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletAppInterface.java Mon May 17 14:11:51 2010 -0400
35.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletAppInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletCollectionType.java Mon May 17 14:11:51 2010 -0400
36.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletCollectionType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletCollectionTypeInterface.java Mon May 17 14:11:51 2010 -0400
37.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletCollectionTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletDDHelper.java Mon May 17 14:11:51 2010 -0400
38.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletDDHelper.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletInfoType.java Mon May 17 14:11:51 2010 -0400
39.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletInfoType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletInfoTypeInterface.java Mon May 17 14:11:51 2010 -0400
40.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletInfoTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletModeType.java Mon May 17 14:11:51 2010 -0400
41.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletModeType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletPreferencesType.java Mon May 17 14:11:51 2010 -0400
42.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletPreferencesType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletPreferencesTypeInterface.java Mon May 17 14:11:51 2010 -0400
43.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletPreferencesTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletType.java Mon May 17 14:11:51 2010 -0400
44.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletTypeInterface.java Mon May 17 14:11:51 2010 -0400
45.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PreferenceType.java Mon May 17 14:11:51 2010 -0400
46.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PreferenceType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PreferenceTypeInterface.java Mon May 17 14:11:51 2010 -0400
47.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PreferenceTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityConstraintType.java Mon May 17 14:11:51 2010 -0400
48.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityConstraintType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityConstraintTypeInterface.java Mon May 17 14:11:51 2010 -0400
49.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityConstraintTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityRoleRefType.java Mon May 17 14:11:51 2010 -0400
50.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityRoleRefType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityRoleRefTypeInterface.java Mon May 17 14:11:51 2010 -0400
51.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityRoleRefTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SupportsType.java Mon May 17 14:11:51 2010 -0400
52.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SupportsType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SupportsTypeInterface.java Mon May 17 14:11:51 2010 -0400
53.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SupportsTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserAttributeType.java Mon May 17 14:11:51 2010 -0400
54.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserAttributeType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserAttributeTypeInterface.java Mon May 17 14:11:51 2010 -0400
55.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserAttributeTypeInterface.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserDataConstraintType.java Mon May 17 14:11:51 2010 -0400
56.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserDataConstraintType.java Mon May 17 14:19:35 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.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserDataConstraintTypeInterface.java Mon May 17 14:11:51 2010 -0400
57.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserDataConstraintTypeInterface.java Mon May 17 14:19:35 2010 -0400
57.3 @@ -1,7 +1,10 @@
57.4 /*
57.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
57.6 *
57.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
57.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
57.9 + *
57.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
57.11 + * Other names may be trademarks of their respective owners.
57.12 *
57.13 * The contents of this file are subject to the terms of either the GNU
57.14 * General Public License Version 2 only ("GPL") or the Common
57.15 @@ -13,9 +16,9 @@
57.16 * specific language governing permissions and limitations under the
57.17 * License. When distributing the software, include this License Header
57.18 * Notice in each file and include the License file at
57.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
57.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
57.21 * particular file as subject to the "Classpath" exception as provided
57.22 - * by Sun in the GPL Version 2 section of the License file that
57.23 + * by Oracle in the GPL Version 2 section of the License file that
57.24 * accompanied this code. If applicable, add the following below the
57.25 * License Header, with the fields enclosed by brackets [] replaced by
57.26 * your own identifying information:
58.1 --- a/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/resources/Bundle.properties Mon May 17 14:11:51 2010 -0400
58.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/resources/Bundle.properties Mon May 17 14:19:35 2010 -0400
58.3 @@ -1,6 +1,9 @@
58.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
58.5 #
58.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
58.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
58.8 +#
58.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
58.10 +# Other names may be trademarks of their respective owners.
58.11 #
58.12 # The contents of this file are subject to the terms of either the GNU
58.13 # General Public License Version 2 only ("GPL") or the Common
58.14 @@ -12,9 +15,9 @@
58.15 # specific language governing permissions and limitations under the
58.16 # License. When distributing the software, include this License Header
58.17 # Notice in each file and include the License file at
58.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
58.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
58.20 # particular file as subject to the "Classpath" exception as provided
58.21 -# by Sun in the GPL Version 2 section of the License file that
58.22 +# by Oracle in the GPL Version 2 section of the License file that
58.23 # accompanied this code. If applicable, add the following below the
58.24 # License Header, with the fields enclosed by brackets [] replaced by
58.25 # your own identifying information:
59.1 --- a/visualweb.classloaderprovider/build.xml Mon May 17 14:11:51 2010 -0400
59.2 +++ b/visualweb.classloaderprovider/build.xml Mon May 17 14:19:35 2010 -0400
59.3 @@ -2,7 +2,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
59.14 The contents of this file are subject to the terms of either the GNU
59.15 @@ -15,9 +18,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.classloaderprovider/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
60.2 +++ b/visualweb.classloaderprovider/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
60.3 @@ -1,6 +1,9 @@
60.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
60.5 #
60.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
60.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
60.8 +#
60.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
60.10 +# Other names may be trademarks of their respective owners.
60.11 #
60.12 # The contents of this file are subject to the terms of either the GNU
60.13 # General Public License Version 2 only ("GPL") or the Common
60.14 @@ -12,9 +15,9 @@
60.15 # specific language governing permissions and limitations under the
60.16 # License. When distributing the software, include this License Header
60.17 # Notice in each file and include the License file at
60.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
60.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
60.20 # particular file as subject to the "Classpath" exception as provided
60.21 -# by Sun in the GPL Version 2 section of the License file that
60.22 +# by Oracle in the GPL Version 2 section of the License file that
60.23 # accompanied this code. If applicable, add the following below the
60.24 # License Header, with the fields enclosed by brackets [] replaced by
60.25 # your own identifying information:
61.1 --- a/visualweb.classloaderprovider/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
61.2 +++ b/visualweb.classloaderprovider/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
61.3 @@ -2,7 +2,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
61.14 The contents of this file are subject to the terms of either the GNU
61.15 @@ -15,9 +18,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.classloaderprovider/src/org/netbeans/modules/visualweb/classloaderprovider/Bundle.properties Mon May 17 14:11:51 2010 -0400
62.2 +++ b/visualweb.classloaderprovider/src/org/netbeans/modules/visualweb/classloaderprovider/Bundle.properties Mon May 17 14:19:35 2010 -0400
62.3 @@ -1,6 +1,9 @@
62.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
62.5 #
62.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
62.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
62.8 +#
62.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
62.10 +# Other names may be trademarks of their respective owners.
62.11 #
62.12 # The contents of this file are subject to the terms of either the GNU
62.13 # General Public License Version 2 only ("GPL") or the Common
62.14 @@ -12,9 +15,9 @@
62.15 # specific language governing permissions and limitations under the
62.16 # License. When distributing the software, include this License Header
62.17 # Notice in each file and include the License file at
62.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
62.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
62.20 # particular file as subject to the "Classpath" exception as provided
62.21 -# by Sun in the GPL Version 2 section of the License file that
62.22 +# by Oracle in the GPL Version 2 section of the License file that
62.23 # accompanied this code. If applicable, add the following below the
62.24 # License Header, with the fields enclosed by brackets [] replaced by
62.25 # your own identifying information:
63.1 --- a/visualweb.classloaderprovider/src/org/netbeans/modules/visualweb/classloaderprovider/CommonClassloaderProvider.java Mon May 17 14:11:51 2010 -0400
63.2 +++ b/visualweb.classloaderprovider/src/org/netbeans/modules/visualweb/classloaderprovider/CommonClassloaderProvider.java Mon May 17 14:19:35 2010 -0400
63.3 @@ -1,7 +1,10 @@
63.4 /*
63.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
63.6 *
63.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
63.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
63.9 + *
63.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
63.11 + * Other names may be trademarks of their respective owners.
63.12 *
63.13 * The contents of this file are subject to the terms of either the GNU
63.14 * General Public License Version 2 only ("GPL") or the Common
63.15 @@ -13,9 +16,9 @@
63.16 * specific language governing permissions and limitations under the
63.17 * License. When distributing the software, include this License Header
63.18 * Notice in each file and include the License file at
63.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
63.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
63.21 * particular file as subject to the "Classpath" exception as provided
63.22 - * by Sun in the GPL Version 2 section of the License file that
63.23 + * by Oracle in the GPL Version 2 section of the License file that
63.24 * accompanied this code. If applicable, add the following below the
63.25 * License Header, with the fields enclosed by brackets [] replaced by
63.26 * your own identifying information:
64.1 --- a/visualweb.compatibilitykit/build.xml Mon May 17 14:11:51 2010 -0400
64.2 +++ b/visualweb.compatibilitykit/build.xml Mon May 17 14:19:35 2010 -0400
64.3 @@ -2,7 +2,10 @@
64.4 <!--
64.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
64.6
64.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
64.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
64.9 +
64.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
64.11 +Other names may be trademarks of their respective owners.
64.12
64.13
64.14 The contents of this file are subject to the terms of either the GNU
64.15 @@ -15,9 +18,9 @@
64.16 specific language governing permissions and limitations under the
64.17 License. When distributing the software, include this License Header
64.18 Notice in each file and include the License file at
64.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
64.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
64.21 particular file as subject to the "Classpath" exception as provided
64.22 -by Sun in the GPL Version 2 section of the License file that
64.23 +by Oracle in the GPL Version 2 section of the License file that
64.24 accompanied this code. If applicable, add the following below the
64.25 License Header, with the fields enclosed by brackets [] replaced by
64.26 your own identifying information:
65.1 --- a/visualweb.compatibilitykit/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
65.2 +++ b/visualweb.compatibilitykit/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
65.3 @@ -1,6 +1,9 @@
65.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
65.5 #
65.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
65.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
65.8 +#
65.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
65.10 +# Other names may be trademarks of their respective owners.
65.11 #
65.12 # The contents of this file are subject to the terms of either the GNU
65.13 # General Public License Version 2 only ("GPL") or the Common
65.14 @@ -12,9 +15,9 @@
65.15 # specific language governing permissions and limitations under the
65.16 # License. When distributing the software, include this License Header
65.17 # Notice in each file and include the License file at
65.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
65.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
65.20 # particular file as subject to the "Classpath" exception as provided
65.21 -# by Sun in the GPL Version 2 section of the License file that
65.22 +# by Oracle in the GPL Version 2 section of the License file that
65.23 # accompanied this code. If applicable, add the following below the
65.24 # License Header, with the fields enclosed by brackets [] replaced by
65.25 # your own identifying information:
66.1 --- a/visualweb.compatibilitykit/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
66.2 +++ b/visualweb.compatibilitykit/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
66.3 @@ -2,7 +2,10 @@
66.4 <!--
66.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
66.6
66.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
66.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
66.9 +
66.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
66.11 +Other names may be trademarks of their respective owners.
66.12
66.13
66.14 The contents of this file are subject to the terms of either the GNU
66.15 @@ -15,9 +18,9 @@
66.16 specific language governing permissions and limitations under the
66.17 License. When distributing the software, include this License Header
66.18 Notice in each file and include the License file at
66.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
66.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
66.21 particular file as subject to the "Classpath" exception as provided
66.22 -by Sun in the GPL Version 2 section of the License file that
66.23 +by Oracle in the GPL Version 2 section of the License file that
66.24 accompanied this code. If applicable, add the following below the
66.25 License Header, with the fields enclosed by brackets [] replaced by
66.26 your own identifying information:
67.1 --- a/visualweb.compatibilitykit/src/org/netbeans/modules/visualweb/compatibilitykit/Bundle.properties Mon May 17 14:11:51 2010 -0400
67.2 +++ b/visualweb.compatibilitykit/src/org/netbeans/modules/visualweb/compatibilitykit/Bundle.properties Mon May 17 14:19:35 2010 -0400
67.3 @@ -1,6 +1,9 @@
67.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
67.5 #
67.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
67.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
67.8 +#
67.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
67.10 +# Other names may be trademarks of their respective owners.
67.11 #
67.12 # The contents of this file are subject to the terms of either the GNU
67.13 # General Public License Version 2 only ("GPL") or the Common
67.14 @@ -12,9 +15,9 @@
67.15 # specific language governing permissions and limitations under the
67.16 # License. When distributing the software, include this License Header
67.17 # Notice in each file and include the License file at
67.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
67.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
67.20 # particular file as subject to the "Classpath" exception as provided
67.21 -# by Sun in the GPL Version 2 section of the License file that
67.22 +# by Oracle in the GPL Version 2 section of the License file that
67.23 # accompanied this code. If applicable, add the following below the
67.24 # License Header, with the fields enclosed by brackets [] replaced by
67.25 # your own identifying information:
68.1 --- a/visualweb.complib.api/build.xml Mon May 17 14:11:51 2010 -0400
68.2 +++ b/visualweb.complib.api/build.xml Mon May 17 14:19:35 2010 -0400
68.3 @@ -2,7 +2,10 @@
68.4 <!--
68.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
68.6
68.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
68.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
68.9 +
68.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
68.11 +Other names may be trademarks of their respective owners.
68.12
68.13
68.14 The contents of this file are subject to the terms of either the GNU
68.15 @@ -15,9 +18,9 @@
68.16 specific language governing permissions and limitations under the
68.17 License. When distributing the software, include this License Header
68.18 Notice in each file and include the License file at
68.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
68.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
68.21 particular file as subject to the "Classpath" exception as provided
68.22 -by Sun in the GPL Version 2 section of the License file that
68.23 +by Oracle in the GPL Version 2 section of the License file that
68.24 accompanied this code. If applicable, add the following below the
68.25 License Header, with the fields enclosed by brackets [] replaced by
68.26 your own identifying information:
69.1 --- a/visualweb.complib.api/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
69.2 +++ b/visualweb.complib.api/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
69.3 @@ -1,6 +1,9 @@
69.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
69.5 #
69.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
69.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
69.8 +#
69.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
69.10 +# Other names may be trademarks of their respective owners.
69.11 #
69.12 # The contents of this file are subject to the terms of either the GNU
69.13 # General Public License Version 2 only ("GPL") or the Common
69.14 @@ -12,9 +15,9 @@
69.15 # specific language governing permissions and limitations under the
69.16 # License. When distributing the software, include this License Header
69.17 # Notice in each file and include the License file at
69.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
69.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
69.20 # particular file as subject to the "Classpath" exception as provided
69.21 -# by Sun in the GPL Version 2 section of the License file that
69.22 +# by Oracle in the GPL Version 2 section of the License file that
69.23 # accompanied this code. If applicable, add the following below the
69.24 # License Header, with the fields enclosed by brackets [] replaced by
69.25 # your own identifying information:
70.1 --- a/visualweb.complib.api/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
70.2 +++ b/visualweb.complib.api/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
70.3 @@ -2,7 +2,10 @@
70.4 <!--
70.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
70.6
70.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
70.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
70.9 +
70.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
70.11 +Other names may be trademarks of their respective owners.
70.12
70.13
70.14 The contents of this file are subject to the terms of either the GNU
70.15 @@ -15,9 +18,9 @@
70.16 specific language governing permissions and limitations under the
70.17 License. When distributing the software, include this License Header
70.18 Notice in each file and include the License file at
70.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
70.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
70.21 particular file as subject to the "Classpath" exception as provided
70.22 -by Sun in the GPL Version 2 section of the License file that
70.23 +by Oracle in the GPL Version 2 section of the License file that
70.24 accompanied this code. If applicable, add the following below the
70.25 License Header, with the fields enclosed by brackets [] replaced by
70.26 your own identifying information:
71.1 --- a/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/Bundle.properties Mon May 17 14:11:51 2010 -0400
71.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/Bundle.properties Mon May 17 14:19:35 2010 -0400
71.3 @@ -1,6 +1,9 @@
71.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
71.5 #
71.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
71.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
71.8 +#
71.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
71.10 +# Other names may be trademarks of their respective owners.
71.11 #
71.12 # The contents of this file are subject to the terms of either the GNU
71.13 # General Public License Version 2 only ("GPL") or the Common
71.14 @@ -12,9 +15,9 @@
71.15 # specific language governing permissions and limitations under the
71.16 # License. When distributing the software, include this License Header
71.17 # Notice in each file and include the License file at
71.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
71.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
71.20 # particular file as subject to the "Classpath" exception as provided
71.21 -# by Sun in the GPL Version 2 section of the License file that
71.22 +# by Oracle in the GPL Version 2 section of the License file that
71.23 # accompanied this code. If applicable, add the following below the
71.24 # License Header, with the fields enclosed by brackets [] replaced by
71.25 # your own identifying information:
72.1 --- a/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibEvent.java Mon May 17 14:11:51 2010 -0400
72.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibEvent.java Mon May 17 14:19:35 2010 -0400
72.3 @@ -1,7 +1,10 @@
72.4 /*
72.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
72.6 *
72.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
72.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
72.9 + *
72.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
72.11 + * Other names may be trademarks of their respective owners.
72.12 *
72.13 * The contents of this file are subject to the terms of either the GNU
72.14 * General Public License Version 2 only ("GPL") or the Common
72.15 @@ -13,9 +16,9 @@
72.16 * specific language governing permissions and limitations under the
72.17 * License. When distributing the software, include this License Header
72.18 * Notice in each file and include the License file at
72.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
72.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
72.21 * particular file as subject to the "Classpath" exception as provided
72.22 - * by Sun in the GPL Version 2 section of the License file that
72.23 + * by Oracle in the GPL Version 2 section of the License file that
72.24 * accompanied this code. If applicable, add the following below the
72.25 * License Header, with the fields enclosed by brackets [] replaced by
72.26 * your own identifying information:
73.1 --- a/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibException.java Mon May 17 14:11:51 2010 -0400
73.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibException.java Mon May 17 14:19:35 2010 -0400
73.3 @@ -1,7 +1,10 @@
73.4 /*
73.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
73.6 *
73.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
73.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
73.9 + *
73.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
73.11 + * Other names may be trademarks of their respective owners.
73.12 *
73.13 * The contents of this file are subject to the terms of either the GNU
73.14 * General Public License Version 2 only ("GPL") or the Common
73.15 @@ -13,9 +16,9 @@
73.16 * specific language governing permissions and limitations under the
73.17 * License. When distributing the software, include this License Header
73.18 * Notice in each file and include the License file at
73.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
73.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
73.21 * particular file as subject to the "Classpath" exception as provided
73.22 - * by Sun in the GPL Version 2 section of the License file that
73.23 + * by Oracle in the GPL Version 2 section of the License file that
73.24 * accompanied this code. If applicable, add the following below the
73.25 * License Header, with the fields enclosed by brackets [] replaced by
73.26 * your own identifying information:
74.1 --- a/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibListener.java Mon May 17 14:11:51 2010 -0400
74.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibListener.java Mon May 17 14:19:35 2010 -0400
74.3 @@ -1,7 +1,10 @@
74.4 /*
74.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
74.6 *
74.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
74.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
74.9 + *
74.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
74.11 + * Other names may be trademarks of their respective owners.
74.12 *
74.13 * The contents of this file are subject to the terms of either the GNU
74.14 * General Public License Version 2 only ("GPL") or the Common
74.15 @@ -13,9 +16,9 @@
74.16 * specific language governing permissions and limitations under the
74.17 * License. When distributing the software, include this License Header
74.18 * Notice in each file and include the License file at
74.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
74.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
74.21 * particular file as subject to the "Classpath" exception as provided
74.22 - * by Sun in the GPL Version 2 section of the License file that
74.23 + * by Oracle in the GPL Version 2 section of the License file that
74.24 * accompanied this code. If applicable, add the following below the
74.25 * License Header, with the fields enclosed by brackets [] replaced by
74.26 * your own identifying information:
75.1 --- a/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibService.java Mon May 17 14:11:51 2010 -0400
75.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibService.java Mon May 17 14:19:35 2010 -0400
75.3 @@ -1,7 +1,10 @@
75.4 /*
75.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
75.6 *
75.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
75.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
75.9 + *
75.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
75.11 + * Other names may be trademarks of their respective owners.
75.12 *
75.13 * The contents of this file are subject to the terms of either the GNU
75.14 * General Public License Version 2 only ("GPL") or the Common
75.15 @@ -13,9 +16,9 @@
75.16 * specific language governing permissions and limitations under the
75.17 * License. When distributing the software, include this License Header
75.18 * Notice in each file and include the License file at
75.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
75.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
75.21 * particular file as subject to the "Classpath" exception as provided
75.22 - * by Sun in the GPL Version 2 section of the License file that
75.23 + * by Oracle in the GPL Version 2 section of the License file that
75.24 * accompanied this code. If applicable, add the following below the
75.25 * License Header, with the fields enclosed by brackets [] replaced by
75.26 * your own identifying information:
76.1 --- a/visualweb.complib/build.xml Mon May 17 14:11:51 2010 -0400
76.2 +++ b/visualweb.complib/build.xml Mon May 17 14:19:35 2010 -0400
76.3 @@ -2,7 +2,10 @@
76.4 <!--
76.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
76.6
76.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
76.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
76.9 +
76.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
76.11 +Other names may be trademarks of their respective owners.
76.12
76.13
76.14 The contents of this file are subject to the terms of either the GNU
76.15 @@ -15,9 +18,9 @@
76.16 specific language governing permissions and limitations under the
76.17 License. When distributing the software, include this License Header
76.18 Notice in each file and include the License file at
76.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
76.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
76.21 particular file as subject to the "Classpath" exception as provided
76.22 -by Sun in the GPL Version 2 section of the License file that
76.23 +by Oracle in the GPL Version 2 section of the License file that
76.24 accompanied this code. If applicable, add the following below the
76.25 License Header, with the fields enclosed by brackets [] replaced by
76.26 your own identifying information:
77.1 --- a/visualweb.complib/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
77.2 +++ b/visualweb.complib/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
77.3 @@ -1,6 +1,9 @@
77.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
77.5 #
77.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
77.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
77.8 +#
77.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
77.10 +# Other names may be trademarks of their respective owners.
77.11 #
77.12 # The contents of this file are subject to the terms of either the GNU
77.13 # General Public License Version 2 only ("GPL") or the Common
77.14 @@ -12,9 +15,9 @@
77.15 # specific language governing permissions and limitations under the
77.16 # License. When distributing the software, include this License Header
77.17 # Notice in each file and include the License file at
77.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
77.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
77.20 # particular file as subject to the "Classpath" exception as provided
77.21 -# by Sun in the GPL Version 2 section of the License file that
77.22 +# by Oracle in the GPL Version 2 section of the License file that
77.23 # accompanied this code. If applicable, add the following below the
77.24 # License Header, with the fields enclosed by brackets [] replaced by
77.25 # your own identifying information:
78.1 --- a/visualweb.complib/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
78.2 +++ b/visualweb.complib/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
78.3 @@ -2,7 +2,10 @@
78.4 <!--
78.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
78.6
78.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
78.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
78.9 +
78.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
78.11 +Other names may be trademarks of their respective owners.
78.12
78.13
78.14 The contents of this file are subject to the terms of either the GNU
78.15 @@ -15,9 +18,9 @@
78.16 specific language governing permissions and limitations under the
78.17 License. When distributing the software, include this License Header
78.18 Notice in each file and include the License file at
78.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
78.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
78.21 particular file as subject to the "Classpath" exception as provided
78.22 -by Sun in the GPL Version 2 section of the License file that
78.23 +by Oracle in the GPL Version 2 section of the License file that
78.24 accompanied this code. If applicable, add the following below the
78.25 License Header, with the fields enclosed by brackets [] replaced by
78.26 your own identifying information:
79.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/BuiltInComplib.java Mon May 17 14:11:51 2010 -0400
79.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/BuiltInComplib.java Mon May 17 14:19:35 2010 -0400
79.3 @@ -1,7 +1,10 @@
79.4 /*
79.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
79.6 *
79.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
79.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
79.9 + *
79.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
79.11 + * Other names may be trademarks of their respective owners.
79.12 *
79.13 * The contents of this file are subject to the terms of either the GNU
79.14 * General Public License Version 2 only ("GPL") or the Common
79.15 @@ -13,9 +16,9 @@
79.16 * specific language governing permissions and limitations under the
79.17 * License. When distributing the software, include this License Header
79.18 * Notice in each file and include the License file at
79.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
79.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
79.21 * particular file as subject to the "Classpath" exception as provided
79.22 - * by Sun in the GPL Version 2 section of the License file that
79.23 + * by Oracle in the GPL Version 2 section of the License file that
79.24 * accompanied this code. If applicable, add the following below the
79.25 * License Header, with the fields enclosed by brackets [] replaced by
79.26 * your own identifying information:
80.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Bundle.properties Mon May 17 14:11:51 2010 -0400
80.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Bundle.properties Mon May 17 14:19:35 2010 -0400
80.3 @@ -1,6 +1,9 @@
80.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
80.5 #
80.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
80.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
80.8 +#
80.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
80.10 +# Other names may be trademarks of their respective owners.
80.11 #
80.12 # The contents of this file are subject to the terms of either the GNU
80.13 # General Public License Version 2 only ("GPL") or the Common
80.14 @@ -12,9 +15,9 @@
80.15 # specific language governing permissions and limitations under the
80.16 # License. When distributing the software, include this License Header
80.17 # Notice in each file and include the License file at
80.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
80.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
80.20 # particular file as subject to the "Classpath" exception as provided
80.21 -# by Sun in the GPL Version 2 section of the License file that
80.22 +# by Oracle in the GPL Version 2 section of the License file that
80.23 # accompanied this code. If applicable, add the following below the
80.24 # License Header, with the fields enclosed by brackets [] replaced by
80.25 # your own identifying information:
81.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/BundleBuiltIn.properties Mon May 17 14:11:51 2010 -0400
81.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/BundleBuiltIn.properties Mon May 17 14:19:35 2010 -0400
81.3 @@ -1,6 +1,9 @@
81.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
81.5 #
81.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
81.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
81.8 +#
81.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
81.10 +# Other names may be trademarks of their respective owners.
81.11 #
81.12 # The contents of this file are subject to the terms of either the GNU
81.13 # General Public License Version 2 only ("GPL") or the Common
81.14 @@ -12,9 +15,9 @@
81.15 # specific language governing permissions and limitations under the
81.16 # License. When distributing the software, include this License Header
81.17 # Notice in each file and include the License file at
81.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
81.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
81.20 # particular file as subject to the "Classpath" exception as provided
81.21 -# by Sun in the GPL Version 2 section of the License file that
81.22 +# by Oracle in the GPL Version 2 section of the License file that
81.23 # accompanied this code. If applicable, add the following below the
81.24 # License Header, with the fields enclosed by brackets [] replaced by
81.25 # your own identifying information:
82.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Complib.java Mon May 17 14:11:51 2010 -0400
82.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Complib.java Mon May 17 14:19:35 2010 -0400
82.3 @@ -1,7 +1,10 @@
82.4 /*
82.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
82.6 *
82.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
82.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
82.9 + *
82.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
82.11 + * Other names may be trademarks of their respective owners.
82.12 *
82.13 * The contents of this file are subject to the terms of either the GNU
82.14 * General Public License Version 2 only ("GPL") or the Common
82.15 @@ -13,9 +16,9 @@
82.16 * specific language governing permissions and limitations under the
82.17 * License. When distributing the software, include this License Header
82.18 * Notice in each file and include the License file at
82.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
82.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
82.21 * particular file as subject to the "Classpath" exception as provided
82.22 - * by Sun in the GPL Version 2 section of the License file that
82.23 + * by Oracle in the GPL Version 2 section of the License file that
82.24 * accompanied this code. If applicable, add the following below the
82.25 * License Header, with the fields enclosed by brackets [] replaced by
82.26 * your own identifying information:
83.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibManifest.java Mon May 17 14:11:51 2010 -0400
83.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibManifest.java Mon May 17 14:19:35 2010 -0400
83.3 @@ -1,7 +1,10 @@
83.4 /*
83.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
83.6 *
83.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
83.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
83.9 + *
83.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
83.11 + * Other names may be trademarks of their respective owners.
83.12 *
83.13 * The contents of this file are subject to the terms of either the GNU
83.14 * General Public License Version 2 only ("GPL") or the Common
83.15 @@ -13,9 +16,9 @@
83.16 * specific language governing permissions and limitations under the
83.17 * License. When distributing the software, include this License Header
83.18 * Notice in each file and include the License file at
83.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
83.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
83.21 * particular file as subject to the "Classpath" exception as provided
83.22 - * by Sun in the GPL Version 2 section of the License file that
83.23 + * by Oracle in the GPL Version 2 section of the License file that
83.24 * accompanied this code. If applicable, add the following below the
83.25 * License Header, with the fields enclosed by brackets [] replaced by
83.26 * your own identifying information:
84.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibModuleInstall.java Mon May 17 14:11:51 2010 -0400
84.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibModuleInstall.java Mon May 17 14:19:35 2010 -0400
84.3 @@ -1,7 +1,10 @@
84.4 /*
84.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
84.6 *
84.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
84.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
84.9 + *
84.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
84.11 + * Other names may be trademarks of their respective owners.
84.12 *
84.13 * The contents of this file are subject to the terms of either the GNU
84.14 * General Public License Version 2 only ("GPL") or the Common
84.15 @@ -13,9 +16,9 @@
84.16 * specific language governing permissions and limitations under the
84.17 * License. When distributing the software, include this License Header
84.18 * Notice in each file and include the License file at
84.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
84.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
84.21 * particular file as subject to the "Classpath" exception as provided
84.22 - * by Sun in the GPL Version 2 section of the License file that
84.23 + * by Oracle in the GPL Version 2 section of the License file that
84.24 * accompanied this code. If applicable, add the following below the
84.25 * License Header, with the fields enclosed by brackets [] replaced by
84.26 * your own identifying information:
85.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibPackage.java Mon May 17 14:11:51 2010 -0400
85.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibPackage.java Mon May 17 14:19:35 2010 -0400
85.3 @@ -1,7 +1,10 @@
85.4 /*
85.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
85.6 *
85.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
85.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
85.9 + *
85.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
85.11 + * Other names may be trademarks of their respective owners.
85.12 *
85.13 * The contents of this file are subject to the terms of either the GNU
85.14 * General Public License Version 2 only ("GPL") or the Common
85.15 @@ -13,9 +16,9 @@
85.16 * specific language governing permissions and limitations under the
85.17 * License. When distributing the software, include this License Header
85.18 * Notice in each file and include the License file at
85.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
85.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
85.21 * particular file as subject to the "Classpath" exception as provided
85.22 - * by Sun in the GPL Version 2 section of the License file that
85.23 + * by Oracle in the GPL Version 2 section of the License file that
85.24 * accompanied this code. If applicable, add the following below the
85.25 * License Header, with the fields enclosed by brackets [] replaced by
85.26 * your own identifying information:
86.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibPaletteItemDataObject.java Mon May 17 14:11:51 2010 -0400
86.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibPaletteItemDataObject.java Mon May 17 14:19:35 2010 -0400
86.3 @@ -1,7 +1,10 @@
86.4 /*
86.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
86.6 *
86.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
86.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
86.9 + *
86.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
86.11 + * Other names may be trademarks of their respective owners.
86.12 *
86.13 * The contents of this file are subject to the terms of either the GNU
86.14 * General Public License Version 2 only ("GPL") or the Common
86.15 @@ -13,9 +16,9 @@
86.16 * specific language governing permissions and limitations under the
86.17 * License. When distributing the software, include this License Header
86.18 * Notice in each file and include the License file at
86.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
86.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
86.21 * particular file as subject to the "Classpath" exception as provided
86.22 - * by Sun in the GPL Version 2 section of the License file that
86.23 + * by Oracle in the GPL Version 2 section of the License file that
86.24 * accompanied this code. If applicable, add the following below the
86.25 * License Header, with the fields enclosed by brackets [] replaced by
86.26 * your own identifying information:
87.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibServiceProvider.java Mon May 17 14:11:51 2010 -0400
87.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibServiceProvider.java Mon May 17 14:19:35 2010 -0400
87.3 @@ -1,7 +1,10 @@
87.4 /*
87.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
87.6 *
87.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
87.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
87.9 + *
87.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
87.11 + * Other names may be trademarks of their respective owners.
87.12 *
87.13 * The contents of this file are subject to the terms of either the GNU
87.14 * General Public License Version 2 only ("GPL") or the Common
87.15 @@ -13,9 +16,9 @@
87.16 * specific language governing permissions and limitations under the
87.17 * License. When distributing the software, include this License Header
87.18 * Notice in each file and include the License file at
87.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
87.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
87.21 * particular file as subject to the "Classpath" exception as provided
87.22 - * by Sun in the GPL Version 2 section of the License file that
87.23 + * by Oracle in the GPL Version 2 section of the License file that
87.24 * accompanied this code. If applicable, add the following below the
87.25 * License Header, with the fields enclosed by brackets [] replaced by
87.26 * your own identifying information:
88.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ExtensionComplib.java Mon May 17 14:11:51 2010 -0400
88.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ExtensionComplib.java Mon May 17 14:19:35 2010 -0400
88.3 @@ -1,7 +1,10 @@
88.4 /*
88.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
88.6 *
88.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
88.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
88.9 + *
88.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
88.11 + * Other names may be trademarks of their respective owners.
88.12 *
88.13 * The contents of this file are subject to the terms of either the GNU
88.14 * General Public License Version 2 only ("GPL") or the Common
88.15 @@ -13,9 +16,9 @@
88.16 * specific language governing permissions and limitations under the
88.17 * License. When distributing the software, include this License Header
88.18 * Notice in each file and include the License file at
88.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
88.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
88.21 * particular file as subject to the "Classpath" exception as provided
88.22 - * by Sun in the GPL Version 2 section of the License file that
88.23 + * by Oracle in the GPL Version 2 section of the License file that
88.24 * accompanied this code. If applicable, add the following below the
88.25 * License Header, with the fields enclosed by brackets [] replaced by
88.26 * your own identifying information:
89.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/IdeUtil.java Mon May 17 14:11:51 2010 -0400
89.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/IdeUtil.java Mon May 17 14:19:35 2010 -0400
89.3 @@ -1,7 +1,10 @@
89.4 /*
89.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
89.6 *
89.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
89.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
89.9 + *
89.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
89.11 + * Other names may be trademarks of their respective owners.
89.12 *
89.13 * The contents of this file are subject to the terms of either the GNU
89.14 * General Public License Version 2 only ("GPL") or the Common
89.15 @@ -13,9 +16,9 @@
89.16 * specific language governing permissions and limitations under the
89.17 * License. When distributing the software, include this License Header
89.18 * Notice in each file and include the License file at
89.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
89.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
89.21 * particular file as subject to the "Classpath" exception as provided
89.22 - * by Sun in the GPL Version 2 section of the License file that
89.23 + * by Oracle in the GPL Version 2 section of the License file that
89.24 * accompanied this code. If applicable, add the following below the
89.25 * License Header, with the fields enclosed by brackets [] replaced by
89.26 * your own identifying information:
90.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/JavaHelpStorage.java Mon May 17 14:11:51 2010 -0400
90.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/JavaHelpStorage.java Mon May 17 14:19:35 2010 -0400
90.3 @@ -1,7 +1,10 @@
90.4 /*
90.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
90.6 *
90.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
90.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
90.9 + *
90.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
90.11 + * Other names may be trademarks of their respective owners.
90.12 *
90.13 * The contents of this file are subject to the terms of either the GNU
90.14 * General Public License Version 2 only ("GPL") or the Common
90.15 @@ -13,9 +16,9 @@
90.16 * specific language governing permissions and limitations under the
90.17 * License. When distributing the software, include this License Header
90.18 * Notice in each file and include the License file at
90.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
90.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
90.21 * particular file as subject to the "Classpath" exception as provided
90.22 - * by Sun in the GPL Version 2 section of the License file that
90.23 + * by Oracle in the GPL Version 2 section of the License file that
90.24 * accompanied this code. If applicable, add the following below the
90.25 * License Header, with the fields enclosed by brackets [] replaced by
90.26 * your own identifying information:
91.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/LibraryLocalizationBundle.java Mon May 17 14:11:51 2010 -0400
91.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/LibraryLocalizationBundle.java Mon May 17 14:19:35 2010 -0400
91.3 @@ -1,7 +1,10 @@
91.4 /*
91.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
91.6 *
91.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
91.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
91.9 + *
91.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
91.11 + * Other names may be trademarks of their respective owners.
91.12 *
91.13 * The contents of this file are subject to the terms of either the GNU
91.14 * General Public License Version 2 only ("GPL") or the Common
91.15 @@ -13,9 +16,9 @@
91.16 * specific language governing permissions and limitations under the
91.17 * License. When distributing the software, include this License Header
91.18 * Notice in each file and include the License file at
91.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
91.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
91.21 * particular file as subject to the "Classpath" exception as provided
91.22 - * by Sun in the GPL Version 2 section of the License file that
91.23 + * by Oracle in the GPL Version 2 section of the License file that
91.24 * accompanied this code. If applicable, add the following below the
91.25 * License Header, with the fields enclosed by brackets [] replaced by
91.26 * your own identifying information:
92.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ManifestAttributeException.java Mon May 17 14:11:51 2010 -0400
92.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ManifestAttributeException.java Mon May 17 14:19:35 2010 -0400
92.3 @@ -1,7 +1,10 @@
92.4 /*
92.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
92.6 *
92.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
92.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
92.9 + *
92.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
92.11 + * Other names may be trademarks of their respective owners.
92.12 *
92.13 * The contents of this file are subject to the terms of either the GNU
92.14 * General Public License Version 2 only ("GPL") or the Common
92.15 @@ -13,9 +16,9 @@
92.16 * specific language governing permissions and limitations under the
92.17 * License. When distributing the software, include this License Header
92.18 * Notice in each file and include the License file at
92.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
92.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
92.21 * particular file as subject to the "Classpath" exception as provided
92.22 - * by Sun in the GPL Version 2 section of the License file that
92.23 + * by Oracle in the GPL Version 2 section of the License file that
92.24 * accompanied this code. If applicable, add the following below the
92.25 * License Header, with the fields enclosed by brackets [] replaced by
92.26 * your own identifying information:
93.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/PaletteUtil.java Mon May 17 14:11:51 2010 -0400
93.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/PaletteUtil.java Mon May 17 14:19:35 2010 -0400
93.3 @@ -1,7 +1,10 @@
93.4 /*
93.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
93.6 *
93.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
93.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
93.9 + *
93.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
93.11 + * Other names may be trademarks of their respective owners.
93.12 *
93.13 * The contents of this file are subject to the terms of either the GNU
93.14 * General Public License Version 2 only ("GPL") or the Common
93.15 @@ -13,9 +16,9 @@
93.16 * specific language governing permissions and limitations under the
93.17 * License. When distributing the software, include this License Header
93.18 * Notice in each file and include the License file at
93.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
93.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
93.21 * particular file as subject to the "Classpath" exception as provided
93.22 - * by Sun in the GPL Version 2 section of the License file that
93.23 + * by Oracle in the GPL Version 2 section of the License file that
93.24 * accompanied this code. If applicable, add the following below the
93.25 * License Header, with the fields enclosed by brackets [] replaced by
93.26 * your own identifying information:
94.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Scope.java Mon May 17 14:11:51 2010 -0400
94.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Scope.java Mon May 17 14:19:35 2010 -0400
94.3 @@ -1,7 +1,10 @@
94.4 /*
94.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
94.6 *
94.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
94.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
94.9 + *
94.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
94.11 + * Other names may be trademarks of their respective owners.
94.12 *
94.13 * The contents of this file are subject to the terms of either the GNU
94.14 * General Public License Version 2 only ("GPL") or the Common
94.15 @@ -13,9 +16,9 @@
94.16 * specific language governing permissions and limitations under the
94.17 * License. When distributing the software, include this License Header
94.18 * Notice in each file and include the License file at
94.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
94.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
94.21 * particular file as subject to the "Classpath" exception as provided
94.22 - * by Sun in the GPL Version 2 section of the License file that
94.23 + * by Oracle in the GPL Version 2 section of the License file that
94.24 * accompanied this code. If applicable, add the following below the
94.25 * License Header, with the fields enclosed by brackets [] replaced by
94.26 * your own identifying information:
95.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/SharedComplib.java Mon May 17 14:11:51 2010 -0400
95.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/SharedComplib.java Mon May 17 14:19:35 2010 -0400
95.3 @@ -1,7 +1,10 @@
95.4 /*
95.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
95.6 *
95.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
95.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
95.9 + *
95.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
95.11 + * Other names may be trademarks of their respective owners.
95.12 *
95.13 * The contents of this file are subject to the terms of either the GNU
95.14 * General Public License Version 2 only ("GPL") or the Common
95.15 @@ -13,9 +16,9 @@
95.16 * specific language governing permissions and limitations under the
95.17 * License. When distributing the software, include this License Header
95.18 * Notice in each file and include the License file at
95.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
95.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
95.21 * particular file as subject to the "Classpath" exception as provided
95.22 - * by Sun in the GPL Version 2 section of the License file that
95.23 + * by Oracle in the GPL Version 2 section of the License file that
95.24 * accompanied this code. If applicable, add the following below the
95.25 * License Header, with the fields enclosed by brackets [] replaced by
95.26 * your own identifying information:
96.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Version.java Mon May 17 14:11:51 2010 -0400
96.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Version.java Mon May 17 14:19:35 2010 -0400
96.3 @@ -1,7 +1,10 @@
96.4 /*
96.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
96.6 *
96.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
96.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
96.9 + *
96.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
96.11 + * Other names may be trademarks of their respective owners.
96.12 *
96.13 * The contents of this file are subject to the terms of either the GNU
96.14 * General Public License Version 2 only ("GPL") or the Common
96.15 @@ -13,9 +16,9 @@
96.16 * specific language governing permissions and limitations under the
96.17 * License. When distributing the software, include this License Header
96.18 * Notice in each file and include the License file at
96.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
96.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
96.21 * particular file as subject to the "Classpath" exception as provided
96.22 - * by Sun in the GPL Version 2 section of the License file that
96.23 + * by Oracle in the GPL Version 2 section of the License file that
96.24 * accompanied this code. If applicable, add the following below the
96.25 * License Header, with the fields enclosed by brackets [] replaced by
96.26 * your own identifying information:
97.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/XmlException.java Mon May 17 14:11:51 2010 -0400
97.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/XmlException.java Mon May 17 14:19:35 2010 -0400
97.3 @@ -1,7 +1,10 @@
97.4 /*
97.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
97.6 *
97.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
97.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
97.9 + *
97.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
97.11 + * Other names may be trademarks of their respective owners.
97.12 *
97.13 * The contents of this file are subject to the terms of either the GNU
97.14 * General Public License Version 2 only ("GPL") or the Common
97.15 @@ -13,9 +16,9 @@
97.16 * specific language governing permissions and limitations under the
97.17 * License. When distributing the software, include this License Header
97.18 * Notice in each file and include the License file at
97.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
97.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
97.21 * particular file as subject to the "Classpath" exception as provided
97.22 - * by Sun in the GPL Version 2 section of the License file that
97.23 + * by Oracle in the GPL Version 2 section of the License file that
97.24 * accompanied this code. If applicable, add the following below the
97.25 * License Header, with the fields enclosed by brackets [] replaced by
97.26 * your own identifying information:
98.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/XmlUtil.java Mon May 17 14:11:51 2010 -0400
98.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/XmlUtil.java Mon May 17 14:19:35 2010 -0400
98.3 @@ -1,7 +1,10 @@
98.4 /*
98.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
98.6 *
98.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
98.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
98.9 + *
98.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
98.11 + * Other names may be trademarks of their respective owners.
98.12 *
98.13 * The contents of this file are subject to the terms of either the GNU
98.14 * General Public License Version 2 only ("GPL") or the Common
98.15 @@ -13,9 +16,9 @@
98.16 * specific language governing permissions and limitations under the
98.17 * License. When distributing the software, include this License Header
98.18 * Notice in each file and include the License file at
98.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
98.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
98.21 * particular file as subject to the "Classpath" exception as provided
98.22 - * by Sun in the GPL Version 2 section of the License file that
98.23 + * by Oracle in the GPL Version 2 section of the License file that
98.24 * accompanied this code. If applicable, add the following below the
98.25 * License Header, with the fields enclosed by brackets [] replaced by
98.26 * your own identifying information:
99.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/layer.xml Mon May 17 14:11:51 2010 -0400
99.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/layer.xml Mon May 17 14:19:35 2010 -0400
99.3 @@ -2,7 +2,10 @@
99.4 <!--
99.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
99.6
99.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
99.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
99.9 +
99.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
99.11 +Other names may be trademarks of their respective owners.
99.12
99.13
99.14 The contents of this file are subject to the terms of either the GNU
99.15 @@ -15,9 +18,9 @@
99.16 specific language governing permissions and limitations under the
99.17 License. When distributing the software, include this License Header
99.18 Notice in each file and include the License file at
99.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
99.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
99.21 particular file as subject to the "Classpath" exception as provided
99.22 -by Sun in the GPL Version 2 section of the License file that
99.23 +by Oracle in the GPL Version 2 section of the License file that
99.24 accompanied this code. If applicable, add the following below the
99.25 License Header, with the fields enclosed by brackets [] replaced by
99.26 your own identifying information:
100.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/Bundle.properties Mon May 17 14:11:51 2010 -0400
100.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/Bundle.properties Mon May 17 14:19:35 2010 -0400
100.3 @@ -1,6 +1,9 @@
100.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
100.5 #
100.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
100.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
100.8 +#
100.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
100.10 +# Other names may be trademarks of their respective owners.
100.11 #
100.12 # The contents of this file are subject to the terms of either the GNU
100.13 # General Public License Version 2 only ("GPL") or the Common
100.14 @@ -12,9 +15,9 @@
100.15 # specific language governing permissions and limitations under the
100.16 # License. When distributing the software, include this License Header
100.17 # Notice in each file and include the License file at
100.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
100.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
100.20 # particular file as subject to the "Classpath" exception as provided
100.21 -# by Sun in the GPL Version 2 section of the License file that
100.22 +# by Oracle in the GPL Version 2 section of the License file that
100.23 # accompanied this code. If applicable, add the following below the
100.24 # License Header, with the fields enclosed by brackets [] replaced by
100.25 # your own identifying information:
101.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/CompLibManagerPanel.java Mon May 17 14:11:51 2010 -0400
101.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/CompLibManagerPanel.java Mon May 17 14:19:35 2010 -0400
101.3 @@ -1,7 +1,10 @@
101.4 /*
101.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
101.6 *
101.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
101.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
101.9 + *
101.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
101.11 + * Other names may be trademarks of their respective owners.
101.12 *
101.13 * The contents of this file are subject to the terms of either the GNU
101.14 * General Public License Version 2 only ("GPL") or the Common
101.15 @@ -13,9 +16,9 @@
101.16 * specific language governing permissions and limitations under the
101.17 * License. When distributing the software, include this License Header
101.18 * Notice in each file and include the License file at
101.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
101.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
101.21 * particular file as subject to the "Classpath" exception as provided
101.22 - * by Sun in the GPL Version 2 section of the License file that
101.23 + * by Oracle in the GPL Version 2 section of the License file that
101.24 * accompanied this code. If applicable, add the following below the
101.25 * License Header, with the fields enclosed by brackets [] replaced by
101.26 * your own identifying information:
102.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibAdvancedOption.java Mon May 17 14:11:51 2010 -0400
102.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibAdvancedOption.java Mon May 17 14:19:35 2010 -0400
102.3 @@ -1,7 +1,10 @@
102.4 /*
102.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
102.6 *
102.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
102.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
102.9 + *
102.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
102.11 + * Other names may be trademarks of their respective owners.
102.12 *
102.13 * The contents of this file are subject to the terms of either the GNU
102.14 * General Public License Version 2 only ("GPL") or the Common
102.15 @@ -13,9 +16,9 @@
102.16 * specific language governing permissions and limitations under the
102.17 * License. When distributing the software, include this License Header
102.18 * Notice in each file and include the License file at
102.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
102.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
102.21 * particular file as subject to the "Classpath" exception as provided
102.22 - * by Sun in the GPL Version 2 section of the License file that
102.23 + * by Oracle in the GPL Version 2 section of the License file that
102.24 * accompanied this code. If applicable, add the following below the
102.25 * License Header, with the fields enclosed by brackets [] replaced by
102.26 * your own identifying information:
103.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibChooser.java Mon May 17 14:11:51 2010 -0400
103.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibChooser.java Mon May 17 14:19:35 2010 -0400
103.3 @@ -1,7 +1,10 @@
103.4 /*
103.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
103.6 *
103.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
103.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
103.9 + *
103.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
103.11 + * Other names may be trademarks of their respective owners.
103.12 *
103.13 * The contents of this file are subject to the terms of either the GNU
103.14 * General Public License Version 2 only ("GPL") or the Common
103.15 @@ -13,9 +16,9 @@
103.16 * specific language governing permissions and limitations under the
103.17 * License. When distributing the software, include this License Header
103.18 * Notice in each file and include the License file at
103.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
103.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
103.21 * particular file as subject to the "Classpath" exception as provided
103.22 - * by Sun in the GPL Version 2 section of the License file that
103.23 + * by Oracle in the GPL Version 2 section of the License file that
103.24 * accompanied this code. If applicable, add the following below the
103.25 * License Header, with the fields enclosed by brackets [] replaced by
103.26 * your own identifying information:
104.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibOptionsPanel.java Mon May 17 14:11:51 2010 -0400
104.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibOptionsPanel.java Mon May 17 14:19:35 2010 -0400
104.3 @@ -1,7 +1,10 @@
104.4 /*
104.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
104.6 *
104.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
104.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
104.9 + *
104.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
104.11 + * Other names may be trademarks of their respective owners.
104.12 *
104.13 * The contents of this file are subject to the terms of either the GNU
104.14 * General Public License Version 2 only ("GPL") or the Common
104.15 @@ -13,9 +16,9 @@
104.16 * specific language governing permissions and limitations under the
104.17 * License. When distributing the software, include this License Header
104.18 * Notice in each file and include the License file at
104.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
104.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
104.21 * particular file as subject to the "Classpath" exception as provided
104.22 - * by Sun in the GPL Version 2 section of the License file that
104.23 + * by Oracle in the GPL Version 2 section of the License file that
104.24 * accompanied this code. If applicable, add the following below the
104.25 * License Header, with the fields enclosed by brackets [] replaced by
104.26 * your own identifying information:
105.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibOptionsPanelController.java Mon May 17 14:11:51 2010 -0400
105.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibOptionsPanelController.java Mon May 17 14:19:35 2010 -0400
105.3 @@ -1,7 +1,10 @@
105.4 /*
105.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
105.6 *
105.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
105.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
105.9 + *
105.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
105.11 + * Other names may be trademarks of their respective owners.
105.12 *
105.13 * The contents of this file are subject to the terms of either the GNU
105.14 * General Public License Version 2 only ("GPL") or the Common
105.15 @@ -13,9 +16,9 @@
105.16 * specific language governing permissions and limitations under the
105.17 * License. When distributing the software, include this License Header
105.18 * Notice in each file and include the License file at
105.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
105.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
105.21 * particular file as subject to the "Classpath" exception as provided
105.22 - * by Sun in the GPL Version 2 section of the License file that
105.23 + * by Oracle in the GPL Version 2 section of the License file that
105.24 * accompanied this code. If applicable, add the following below the
105.25 * License Header, with the fields enclosed by brackets [] replaced by
105.26 * your own identifying information:
106.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibsRootNode.java Mon May 17 14:11:51 2010 -0400
106.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibsRootNode.java Mon May 17 14:19:35 2010 -0400
106.3 @@ -1,7 +1,10 @@
106.4 /*
106.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
106.6 *
106.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
106.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
106.9 + *
106.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
106.11 + * Other names may be trademarks of their respective owners.
106.12 *
106.13 * The contents of this file are subject to the terms of either the GNU
106.14 * General Public License Version 2 only ("GPL") or the Common
106.15 @@ -13,9 +16,9 @@
106.16 * specific language governing permissions and limitations under the
106.17 * License. When distributing the software, include this License Header
106.18 * Notice in each file and include the License file at
106.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
106.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
106.21 * particular file as subject to the "Classpath" exception as provided
106.22 - * by Sun in the GPL Version 2 section of the License file that
106.23 + * by Oracle in the GPL Version 2 section of the License file that
106.24 * accompanied this code. If applicable, add the following below the
106.25 * License Header, with the fields enclosed by brackets [] replaced by
106.26 * your own identifying information:
107.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComponentLibraryManagerAction.java Mon May 17 14:11:51 2010 -0400
107.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComponentLibraryManagerAction.java Mon May 17 14:19:35 2010 -0400
107.3 @@ -1,7 +1,10 @@
107.4 /*
107.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
107.6 *
107.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
107.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
107.9 + *
107.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
107.11 + * Other names may be trademarks of their respective owners.
107.12 *
107.13 * The contents of this file are subject to the terms of either the GNU
107.14 * General Public License Version 2 only ("GPL") or the Common
107.15 @@ -13,9 +16,9 @@
107.16 * specific language governing permissions and limitations under the
107.17 * License. When distributing the software, include this License Header
107.18 * Notice in each file and include the License file at
107.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
107.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
107.21 * particular file as subject to the "Classpath" exception as provided
107.22 - * by Sun in the GPL Version 2 section of the License file that
107.23 + * by Oracle in the GPL Version 2 section of the License file that
107.24 * accompanied this code. If applicable, add the following below the
107.25 * License Header, with the fields enclosed by brackets [] replaced by
107.26 * your own identifying information:
108.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComponentsPanel.java Mon May 17 14:11:51 2010 -0400
108.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComponentsPanel.java Mon May 17 14:19:35 2010 -0400
108.3 @@ -1,7 +1,10 @@
108.4 /*
108.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
108.6 *
108.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
108.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
108.9 + *
108.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
108.11 + * Other names may be trademarks of their respective owners.
108.12 *
108.13 * The contents of this file are subject to the terms of either the GNU
108.14 * General Public License Version 2 only ("GPL") or the Common
108.15 @@ -13,9 +16,9 @@
108.16 * specific language governing permissions and limitations under the
108.17 * License. When distributing the software, include this License Header
108.18 * Notice in each file and include the License file at
108.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
108.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
108.21 * particular file as subject to the "Classpath" exception as provided
108.22 - * by Sun in the GPL Version 2 section of the License file that
108.23 + * by Oracle in the GPL Version 2 section of the License file that
108.24 * accompanied this code. If applicable, add the following below the
108.25 * License Header, with the fields enclosed by brackets [] replaced by
108.26 * your own identifying information:
109.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/HelpSourcesDetailPanel.java Mon May 17 14:11:51 2010 -0400
109.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/HelpSourcesDetailPanel.java Mon May 17 14:19:35 2010 -0400
109.3 @@ -1,7 +1,10 @@
109.4 /*
109.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
109.6 *
109.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
109.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
109.9 + *
109.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
109.11 + * Other names may be trademarks of their respective owners.
109.12 *
109.13 * The contents of this file are subject to the terms of either the GNU
109.14 * General Public License Version 2 only ("GPL") or the Common
109.15 @@ -13,9 +16,9 @@
109.16 * specific language governing permissions and limitations under the
109.17 * License. When distributing the software, include this License Header
109.18 * Notice in each file and include the License file at
109.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
109.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
109.21 * particular file as subject to the "Classpath" exception as provided
109.22 - * by Sun in the GPL Version 2 section of the License file that
109.23 + * by Oracle in the GPL Version 2 section of the License file that
109.24 * accompanied this code. If applicable, add the following below the
109.25 * License Header, with the fields enclosed by brackets [] replaced by
109.26 * your own identifying information:
110.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ImportComplibPanel.java Mon May 17 14:11:51 2010 -0400
110.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ImportComplibPanel.java Mon May 17 14:19:35 2010 -0400
110.3 @@ -1,7 +1,10 @@
110.4 /*
110.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
110.6 *
110.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
110.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
110.9 + *
110.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
110.11 + * Other names may be trademarks of their respective owners.
110.12 *
110.13 * The contents of this file are subject to the terms of either the GNU
110.14 * General Public License Version 2 only ("GPL") or the Common
110.15 @@ -13,9 +16,9 @@
110.16 * specific language governing permissions and limitations under the
110.17 * License. When distributing the software, include this License Header
110.18 * Notice in each file and include the License file at
110.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
110.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
110.21 * particular file as subject to the "Classpath" exception as provided
110.22 - * by Sun in the GPL Version 2 section of the License file that
110.23 + * by Oracle in the GPL Version 2 section of the License file that
110.24 * accompanied this code. If applicable, add the following below the
110.25 * License Header, with the fields enclosed by brackets [] replaced by
110.26 * your own identifying information:
111.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/MainDetailPanel.java Mon May 17 14:11:51 2010 -0400
111.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/MainDetailPanel.java Mon May 17 14:19:35 2010 -0400
111.3 @@ -1,7 +1,10 @@
111.4 /*
111.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
111.6 *
111.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
111.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
111.9 + *
111.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
111.11 + * Other names may be trademarks of their respective owners.
111.12 *
111.13 * The contents of this file are subject to the terms of either the GNU
111.14 * General Public License Version 2 only ("GPL") or the Common
111.15 @@ -13,9 +16,9 @@
111.16 * specific language governing permissions and limitations under the
111.17 * License. When distributing the software, include this License Header
111.18 * Notice in each file and include the License file at
111.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
111.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
111.21 * particular file as subject to the "Classpath" exception as provided
111.22 - * by Sun in the GPL Version 2 section of the License file that
111.23 + * by Oracle in the GPL Version 2 section of the License file that
111.24 * accompanied this code. If applicable, add the following below the
111.25 * License Header, with the fields enclosed by brackets [] replaced by
111.26 * your own identifying information:
112.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/PathDetailPanel.java Mon May 17 14:11:51 2010 -0400
112.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/PathDetailPanel.java Mon May 17 14:19:35 2010 -0400
112.3 @@ -1,7 +1,10 @@
112.4 /*
112.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
112.6 *
112.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
112.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
112.9 + *
112.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
112.11 + * Other names may be trademarks of their respective owners.
112.12 *
112.13 * The contents of this file are subject to the terms of either the GNU
112.14 * General Public License Version 2 only ("GPL") or the Common
112.15 @@ -13,9 +16,9 @@
112.16 * specific language governing permissions and limitations under the
112.17 * License. When distributing the software, include this License Header
112.18 * Notice in each file and include the License file at
112.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
112.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
112.21 * particular file as subject to the "Classpath" exception as provided
112.22 - * by Sun in the GPL Version 2 section of the License file that
112.23 + * by Oracle in the GPL Version 2 section of the License file that
112.24 * accompanied this code. If applicable, add the following below the
112.25 * License Header, with the fields enclosed by brackets [] replaced by
112.26 * your own identifying information:
113.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/PathListModel.java Mon May 17 14:11:51 2010 -0400
113.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/PathListModel.java Mon May 17 14:19:35 2010 -0400
113.3 @@ -1,7 +1,10 @@
113.4 /*
113.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
113.6 *
113.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
113.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
113.9 + *
113.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
113.11 + * Other names may be trademarks of their respective owners.
113.12 *
113.13 * The contents of this file are subject to the terms of either the GNU
113.14 * General Public License Version 2 only ("GPL") or the Common
113.15 @@ -13,9 +16,9 @@
113.16 * specific language governing permissions and limitations under the
113.17 * License. When distributing the software, include this License Header
113.18 * Notice in each file and include the License file at
113.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
113.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
113.21 * particular file as subject to the "Classpath" exception as provided
113.22 - * by Sun in the GPL Version 2 section of the License file that
113.23 + * by Oracle in the GPL Version 2 section of the License file that
113.24 * accompanied this code. If applicable, add the following below the
113.25 * License Header, with the fields enclosed by brackets [] replaced by
113.26 * your own identifying information:
114.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/SharedComplibAction.java Mon May 17 14:11:51 2010 -0400
114.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/SharedComplibAction.java Mon May 17 14:19:35 2010 -0400
114.3 @@ -1,7 +1,10 @@
114.4 /*
114.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
114.6 *
114.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
114.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
114.9 + *
114.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
114.11 + * Other names may be trademarks of their respective owners.
114.12 *
114.13 * The contents of this file are subject to the terms of either the GNU
114.14 * General Public License Version 2 only ("GPL") or the Common
114.15 @@ -13,9 +16,9 @@
114.16 * specific language governing permissions and limitations under the
114.17 * License. When distributing the software, include this License Header
114.18 * Notice in each file and include the License file at
114.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
114.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
114.21 * particular file as subject to the "Classpath" exception as provided
114.22 - * by Sun in the GPL Version 2 section of the License file that
114.23 + * by Oracle in the GPL Version 2 section of the License file that
114.24 * accompanied this code. If applicable, add the following below the
114.25 * License Header, with the fields enclosed by brackets [] replaced by
114.26 * your own identifying information:
115.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/SharedComplibPanel.java Mon May 17 14:11:51 2010 -0400
115.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/SharedComplibPanel.java Mon May 17 14:19:35 2010 -0400
115.3 @@ -1,7 +1,10 @@
115.4 /*
115.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
115.6 *
115.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
115.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
115.9 + *
115.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
115.11 + * Other names may be trademarks of their respective owners.
115.12 *
115.13 * The contents of this file are subject to the terms of either the GNU
115.14 * General Public License Version 2 only ("GPL") or the Common
115.15 @@ -13,9 +16,9 @@
115.16 * specific language governing permissions and limitations under the
115.17 * License. When distributing the software, include this License Header
115.18 * Notice in each file and include the License file at
115.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
115.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
115.21 * particular file as subject to the "Classpath" exception as provided
115.22 - * by Sun in the GPL Version 2 section of the License file that
115.23 + * by Oracle in the GPL Version 2 section of the License file that
115.24 * accompanied this code. If applicable, add the following below the
115.25 * License Header, with the fields enclosed by brackets [] replaced by
115.26 * your own identifying information:
116.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/TableSorter.java Mon May 17 14:11:51 2010 -0400
116.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/TableSorter.java Mon May 17 14:19:35 2010 -0400
116.3 @@ -1,7 +1,10 @@
116.4 /*
116.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
116.6 *
116.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
116.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
116.9 + *
116.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
116.11 + * Other names may be trademarks of their respective owners.
116.12 *
116.13 * The contents of this file are subject to the terms of either the GNU
116.14 * General Public License Version 2 only ("GPL") or the Common
116.15 @@ -13,9 +16,9 @@
116.16 * specific language governing permissions and limitations under the
116.17 * License. When distributing the software, include this License Header
116.18 * Notice in each file and include the License file at
116.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
116.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
116.21 * particular file as subject to the "Classpath" exception as provided
116.22 - * by Sun in the GPL Version 2 section of the License file that
116.23 + * by Oracle in the GPL Version 2 section of the License file that
116.24 * accompanied this code. If applicable, add the following below the
116.25 * License Header, with the fields enclosed by brackets [] replaced by
116.26 * your own identifying information:
117.1 --- a/visualweb.dataconnectivity.designtime/build.xml Mon May 17 14:11:51 2010 -0400
117.2 +++ b/visualweb.dataconnectivity.designtime/build.xml Mon May 17 14:19:35 2010 -0400
117.3 @@ -2,7 +2,10 @@
117.4 <!--
117.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
117.6
117.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
117.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
117.9 +
117.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
117.11 +Other names may be trademarks of their respective owners.
117.12
117.13
117.14 The contents of this file are subject to the terms of either the GNU
117.15 @@ -15,9 +18,9 @@
117.16 specific language governing permissions and limitations under the
117.17 License. When distributing the software, include this License Header
117.18 Notice in each file and include the License file at
117.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
117.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
117.21 particular file as subject to the "Classpath" exception as provided
117.22 -by Sun in the GPL Version 2 section of the License file that
117.23 +by Oracle in the GPL Version 2 section of the License file that
117.24 accompanied this code. If applicable, add the following below the
117.25 License Header, with the fields enclosed by brackets [] replaced by
117.26 your own identifying information:
118.1 --- a/visualweb.dataconnectivity.designtime/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
118.2 +++ b/visualweb.dataconnectivity.designtime/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
118.3 @@ -2,7 +2,10 @@
118.4 <!--
118.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
118.6
118.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
118.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
118.9 +
118.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
118.11 +Other names may be trademarks of their respective owners.
118.12
118.13
118.14 The contents of this file are subject to the terms of either the GNU
118.15 @@ -15,9 +18,9 @@
118.16 specific language governing permissions and limitations under the
118.17 License. When distributing the software, include this License Header
118.18 Notice in each file and include the License file at
118.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
118.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
118.21 particular file as subject to the "Classpath" exception as provided
118.22 -by Sun in the GPL Version 2 section of the License file that
118.23 +by Oracle in the GPL Version 2 section of the License file that
118.24 accompanied this code. If applicable, add the following below the
118.25 License Header, with the fields enclosed by brackets [] replaced by
118.26 your own identifying information:
119.1 --- a/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/Bundle.properties Mon May 17 14:11:51 2010 -0400
119.2 +++ b/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/Bundle.properties Mon May 17 14:19:35 2010 -0400
119.3 @@ -1,6 +1,9 @@
119.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
119.5 #
119.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
119.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
119.8 +#
119.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
119.10 +# Other names may be trademarks of their respective owners.
119.11 #
119.12 # The contents of this file are subject to the terms of either the GNU
119.13 # General Public License Version 2 only ("GPL") or the Common
119.14 @@ -12,9 +15,9 @@
119.15 # specific language governing permissions and limitations under the
119.16 # License. When distributing the software, include this License Header
119.17 # Notice in each file and include the License file at
119.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
119.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
119.20 # particular file as subject to the "Classpath" exception as provided
119.21 -# by Sun in the GPL Version 2 section of the License file that
119.22 +# by Oracle in the GPL Version 2 section of the License file that
119.23 # accompanied this code. If applicable, add the following below the
119.24 # License Header, with the fields enclosed by brackets [] replaced by
119.25 # your own identifying information:
120.1 --- a/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/CachedRowSetXImplBeanInfo.java Mon May 17 14:11:51 2010 -0400
120.2 +++ b/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/CachedRowSetXImplBeanInfo.java Mon May 17 14:19:35 2010 -0400
120.3 @@ -1,7 +1,10 @@
120.4 /*
120.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
120.6 *
120.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
120.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
120.9 + *
120.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
120.11 + * Other names may be trademarks of their respective owners.
120.12 *
120.13 * The contents of this file are subject to the terms of either the GNU
120.14 * General Public License Version 2 only ("GPL") or the Common
120.15 @@ -13,9 +16,9 @@
120.16 * specific language governing permissions and limitations under the
120.17 * License. When distributing the software, include this License Header
120.18 * Notice in each file and include the License file at
120.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
120.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
120.21 * particular file as subject to the "Classpath" exception as provided
120.22 - * by Sun in the GPL Version 2 section of the License file that
120.23 + * by Oracle in the GPL Version 2 section of the License file that
120.24 * accompanied this code. If applicable, add the following below the
120.25 * License Header, with the fields enclosed by brackets [] replaced by
120.26 * your own identifying information:
121.1 --- a/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/CachedRowSetXImplDesignInfo.java Mon May 17 14:11:51 2010 -0400
121.2 +++ b/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/CachedRowSetXImplDesignInfo.java Mon May 17 14:19:35 2010 -0400
121.3 @@ -1,7 +1,10 @@
121.4 /*
121.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
121.6 *
121.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
121.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
121.9 + *
121.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
121.11 + * Other names may be trademarks of their respective owners.
121.12 *
121.13 * The contents of this file are subject to the terms of either the GNU
121.14 * General Public License Version 2 only ("GPL") or the Common
121.15 @@ -13,9 +16,9 @@
121.16 * specific language governing permissions and limitations under the
121.17 * License. When distributing the software, include this License Header
121.18 * Notice in each file and include the License file at
121.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
121.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
121.21 * particular file as subject to the "Classpath" exception as provided
121.22 - * by Sun in the GPL Version 2 section of the License file that
121.23 + * by Oracle in the GPL Version 2 section of the License file that
121.24 * accompanied this code. If applicable, add the following below the
121.25 * License Header, with the fields enclosed by brackets [] replaced by
121.26 * your own identifying information:
122.1 --- a/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/Log.java Mon May 17 14:11:51 2010 -0400
122.2 +++ b/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/Log.java Mon May 17 14:19:35 2010 -0400
122.3 @@ -1,7 +1,10 @@
122.4 /*
122.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
122.6 *
122.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
122.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
122.9 + *
122.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
122.11 + * Other names may be trademarks of their respective owners.
122.12 *
122.13 * The contents of this file are subject to the terms of either the GNU
122.14 * General Public License Version 2 only ("GPL") or the Common
122.15 @@ -13,9 +16,9 @@
122.16 * specific language governing permissions and limitations under the
122.17 * License. When distributing the software, include this License Header
122.18 * Notice in each file and include the License file at
122.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
122.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
122.21 * particular file as subject to the "Classpath" exception as provided
122.22 - * by Sun in the GPL Version 2 section of the License file that
122.23 + * by Oracle in the GPL Version 2 section of the License file that
122.24 * accompanied this code. If applicable, add the following below the
122.25 * License Header, with the fields enclosed by brackets [] replaced by
122.26 * your own identifying information:
123.1 --- a/visualweb.dataconnectivity/build.xml Mon May 17 14:11:51 2010 -0400
123.2 +++ b/visualweb.dataconnectivity/build.xml Mon May 17 14:19:35 2010 -0400
123.3 @@ -2,7 +2,10 @@
123.4 <!--
123.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
123.6
123.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
123.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
123.9 +
123.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
123.11 +Other names may be trademarks of their respective owners.
123.12
123.13
123.14 The contents of this file are subject to the terms of either the GNU
123.15 @@ -15,9 +18,9 @@
123.16 specific language governing permissions and limitations under the
123.17 License. When distributing the software, include this License Header
123.18 Notice in each file and include the License file at
123.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
123.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
123.21 particular file as subject to the "Classpath" exception as provided
123.22 -by Sun in the GPL Version 2 section of the License file that
123.23 +by Oracle in the GPL Version 2 section of the License file that
123.24 accompanied this code. If applicable, add the following below the
123.25 License Header, with the fields enclosed by brackets [] replaced by
123.26 your own identifying information:
124.1 --- a/visualweb.dataconnectivity/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
124.2 +++ b/visualweb.dataconnectivity/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
124.3 @@ -1,6 +1,9 @@
124.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
124.5 #
124.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
124.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
124.8 +#
124.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
124.10 +# Other names may be trademarks of their respective owners.
124.11 #
124.12 # The contents of this file are subject to the terms of either the GNU
124.13 # General Public License Version 2 only ("GPL") or the Common
124.14 @@ -12,9 +15,9 @@
124.15 # specific language governing permissions and limitations under the
124.16 # License. When distributing the software, include this License Header
124.17 # Notice in each file and include the License file at
124.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
124.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
124.20 # particular file as subject to the "Classpath" exception as provided
124.21 -# by Sun in the GPL Version 2 section of the License file that
124.22 +# by Oracle in the GPL Version 2 section of the License file that
124.23 # accompanied this code. If applicable, add the following below the
124.24 # License Header, with the fields enclosed by brackets [] replaced by
124.25 # your own identifying information:
125.1 --- a/visualweb.dataconnectivity/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
125.2 +++ b/visualweb.dataconnectivity/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
125.3 @@ -2,7 +2,10 @@
125.4 <!--
125.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
125.6
125.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
125.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
125.9 +
125.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
125.11 +Other names may be trademarks of their respective owners.
125.12
125.13
125.14 The contents of this file are subject to the terms of either the GNU
125.15 @@ -15,9 +18,9 @@
125.16 specific language governing permissions and limitations under the
125.17 License. When distributing the software, include this License Header
125.18 Notice in each file and include the License file at
125.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
125.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
125.21 particular file as subject to the "Classpath" exception as provided
125.22 -by Sun in the GPL Version 2 section of the License file that
125.23 +by Oracle in the GPL Version 2 section of the License file that
125.24 accompanied this code. If applicable, add the following below the
125.25 License Header, with the fields enclosed by brackets [] replaced by
125.26 your own identifying information:
126.1 --- a/visualweb.dataconnectivity/release/startup/samples/CreateDerbyTravelDB.java Mon May 17 14:11:51 2010 -0400
126.2 +++ b/visualweb.dataconnectivity/release/startup/samples/CreateDerbyTravelDB.java Mon May 17 14:19:35 2010 -0400
126.3 @@ -1,7 +1,10 @@
126.4 /*
126.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
126.6 *
126.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
126.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
126.9 + *
126.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
126.11 + * Other names may be trademarks of their respective owners.
126.12 *
126.13 * The contents of this file are subject to the terms of either the GNU
126.14 * General Public License Version 2 only ("GPL") or the Common
126.15 @@ -13,9 +16,9 @@
126.16 * specific language governing permissions and limitations under the
126.17 * License. When distributing the software, include this License Header
126.18 * Notice in each file and include the License file at
126.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
126.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
126.21 * particular file as subject to the "Classpath" exception as provided
126.22 - * by Sun in the GPL Version 2 section of the License file that
126.23 + * by Oracle in the GPL Version 2 section of the License file that
126.24 * accompanied this code. If applicable, add the following below the
126.25 * License Header, with the fields enclosed by brackets [] replaced by
126.26 * your own identifying information:
127.1 --- a/visualweb.dataconnectivity/release/startup/samples/create-Travel-derby.sql Mon May 17 14:11:51 2010 -0400
127.2 +++ b/visualweb.dataconnectivity/release/startup/samples/create-Travel-derby.sql Mon May 17 14:19:35 2010 -0400
127.3 @@ -1,7 +1,10 @@
127.4
127.5 -- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
127.6
127.7 --- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
127.8 +-- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
127.9 +--
127.10 +-- Oracle and Java are registered trademarks of Oracle and/or its affiliates.
127.11 +-- Other names may be trademarks of their respective owners.
127.12
127.13 -- The contents of this file are subject to the terms of either the GNU
127.14 -- General Public License Version 2 only ("GPL") or the Common
127.15 @@ -13,9 +16,9 @@
127.16 -- specific language governing permissions and limitations under the
127.17 -- License. When distributing the software, include this License Header
127.18 -- Notice in each file and include the License file at
127.19 --- nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
127.20 +-- nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
127.21 -- particular file as subject to the "Classpath" exception as provided
127.22 --- by Sun in the GPL Version 2 section of the License file that
127.23 +-- by Oracle in the GPL Version 2 section of the License file that
127.24 -- accompanied this code. If applicable, add the following below the
127.25 -- License Header, with the fields enclosed by brackets [] replaced by
127.26 -- your own identifying information:
128.1 --- a/visualweb.dataconnectivity/release/startup/samples/create-schema-Travel.sql Mon May 17 14:11:51 2010 -0400
128.2 +++ b/visualweb.dataconnectivity/release/startup/samples/create-schema-Travel.sql Mon May 17 14:19:35 2010 -0400
128.3 @@ -1,7 +1,10 @@
128.4
128.5 -- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
128.6
128.7 --- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
128.8 +-- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
128.9 +--
128.10 +-- Oracle and Java are registered trademarks of Oracle and/or its affiliates.
128.11 +-- Other names may be trademarks of their respective owners.
128.12
128.13 -- The contents of this file are subject to the terms of either the GNU
128.14 -- General Public License Version 2 only ("GPL") or the Common
128.15 @@ -13,9 +16,9 @@
128.16 -- specific language governing permissions and limitations under the
128.17 -- License. When distributing the software, include this License Header
128.18 -- Notice in each file and include the License file at
128.19 --- nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
128.20 +-- nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
128.21 -- particular file as subject to the "Classpath" exception as provided
128.22 --- by Sun in the GPL Version 2 section of the License file that
128.23 +-- by Oracle in the GPL Version 2 section of the License file that
128.24 -- accompanied this code. If applicable, add the following below the
128.25 -- License Header, with the fields enclosed by brackets [] replaced by
128.26 -- your own identifying information:
129.1 --- a/visualweb.dataconnectivity/release/startup/samples/create-schema-vir-derby.sql Mon May 17 14:11:51 2010 -0400
129.2 +++ b/visualweb.dataconnectivity/release/startup/samples/create-schema-vir-derby.sql Mon May 17 14:19:35 2010 -0400
129.3 @@ -1,7 +1,10 @@
129.4
129.5 -- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
129.6
129.7 --- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
129.8 +-- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
129.9 +--
129.10 +-- Oracle and Java are registered trademarks of Oracle and/or its affiliates.
129.11 +-- Other names may be trademarks of their respective owners.
129.12
129.13 -- The contents of this file are subject to the terms of either the GNU
129.14 -- General Public License Version 2 only ("GPL") or the Common
129.15 @@ -13,9 +16,9 @@
129.16 -- specific language governing permissions and limitations under the
129.17 -- License. When distributing the software, include this License Header
129.18 -- Notice in each file and include the License file at
129.19 --- nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
129.20 +-- nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
129.21 -- particular file as subject to the "Classpath" exception as provided
129.22 --- by Sun in the GPL Version 2 section of the License file that
129.23 +-- by Oracle in the GPL Version 2 section of the License file that
129.24 -- accompanied this code. If applicable, add the following below the
129.25 -- License Header, with the fields enclosed by brackets [] replaced by
129.26 -- your own identifying information:
130.1 --- a/visualweb.dataconnectivity/release/startup/samples/create-vir-derby.sql Mon May 17 14:11:51 2010 -0400
130.2 +++ b/visualweb.dataconnectivity/release/startup/samples/create-vir-derby.sql Mon May 17 14:19:35 2010 -0400
130.3 @@ -1,7 +1,10 @@
130.4
130.5 -- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
130.6
130.7 --- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
130.8 +-- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
130.9 +--
130.10 +-- Oracle and Java are registered trademarks of Oracle and/or its affiliates.
130.11 +-- Other names may be trademarks of their respective owners.
130.12
130.13 -- The contents of this file are subject to the terms of either the GNU
130.14 -- General Public License Version 2 only ("GPL") or the Common
130.15 @@ -13,9 +16,9 @@
130.16 -- specific language governing permissions and limitations under the
130.17 -- License. When distributing the software, include this License Header
130.18 -- Notice in each file and include the License file at
130.19 --- nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
130.20 +-- nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
130.21 -- particular file as subject to the "Classpath" exception as provided
130.22 --- by Sun in the GPL Version 2 section of the License file that
130.23 +-- by Oracle in the GPL Version 2 section of the License file that
130.24 -- accompanied this code. If applicable, add the following below the
130.25 -- License Header, with the fields enclosed by brackets [] replaced by
130.26 -- your own identifying information:
131.1 --- a/visualweb.dataconnectivity/release/startup/samples/ws_urls.properties Mon May 17 14:11:51 2010 -0400
131.2 +++ b/visualweb.dataconnectivity/release/startup/samples/ws_urls.properties Mon May 17 14:19:35 2010 -0400
131.3 @@ -1,6 +1,9 @@
131.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
131.5 #
131.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
131.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
131.8 +#
131.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
131.10 +# Other names may be trademarks of their respective owners.
131.11 #
131.12 # The contents of this file are subject to the terms of either the GNU
131.13 # General Public License Version 2 only ("GPL") or the Common
131.14 @@ -12,9 +15,9 @@
131.15 # specific language governing permissions and limitations under the
131.16 # License. When distributing the software, include this License Header
131.17 # Notice in each file and include the License file at
131.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
131.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
131.20 # particular file as subject to the "Classpath" exception as provided
131.21 -# by Sun in the GPL Version 2 section of the License file that
131.22 +# by Oracle in the GPL Version 2 section of the License file that
131.23 # accompanied this code. If applicable, add the following below the
131.24 # License Header, with the fields enclosed by brackets [] replaced by
131.25 # your own identifying information:
132.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/Bundle.properties Mon May 17 14:11:51 2010 -0400
132.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/Bundle.properties Mon May 17 14:19:35 2010 -0400
132.3 @@ -1,7 +1,10 @@
132.4
132.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
132.6 #
132.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
132.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
132.9 +#
132.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
132.11 +# Other names may be trademarks of their respective owners.
132.12 #
132.13 # The contents of this file are subject to the terms of either the GNU
132.14 # General Public License Version 2 only ("GPL") or the Common
132.15 @@ -13,9 +16,9 @@
132.16 # specific language governing permissions and limitations under the
132.17 # License. When distributing the software, include this License Header
132.18 # Notice in each file and include the License file at
132.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
132.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
132.21 # particular file as subject to the "Classpath" exception as provided
132.22 -# by Sun in the GPL Version 2 section of the License file that
132.23 +# by Oracle in the GPL Version 2 section of the License file that
132.24 # accompanied this code. If applicable, add the following below the
132.25 # License Header, with the fields enclosed by brackets [] replaced by
132.26 # your own identifying information:
133.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/DataconnectivityModuleInstaller.java Mon May 17 14:11:51 2010 -0400
133.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/DataconnectivityModuleInstaller.java Mon May 17 14:19:35 2010 -0400
133.3 @@ -1,7 +1,10 @@
133.4 /*
133.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
133.6 *
133.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
133.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
133.9 + *
133.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
133.11 + * Other names may be trademarks of their respective owners.
133.12 *
133.13 * The contents of this file are subject to the terms of either the GNU
133.14 * General Public License Version 2 only ("GPL") or the Common
133.15 @@ -13,9 +16,9 @@
133.16 * specific language governing permissions and limitations under the
133.17 * License. When distributing the software, include this License Header
133.18 * Notice in each file and include the License file at
133.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
133.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
133.21 * particular file as subject to the "Classpath" exception as provided
133.22 - * by Sun in the GPL Version 2 section of the License file that
133.23 + * by Oracle in the GPL Version 2 section of the License file that
133.24 * accompanied this code. If applicable, add the following below the
133.25 * License Header, with the fields enclosed by brackets [] replaced by
133.26 * your own identifying information:
134.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/DataconnectivitySettings.java Mon May 17 14:11:51 2010 -0400
134.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/DataconnectivitySettings.java Mon May 17 14:19:35 2010 -0400
134.3 @@ -1,7 +1,10 @@
134.4 /*
134.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
134.6 *
134.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
134.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
134.9 + *
134.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
134.11 + * Other names may be trademarks of their respective owners.
134.12 *
134.13 * The contents of this file are subject to the terms of either the GNU
134.14 * General Public License Version 2 only ("GPL") or the Common
134.15 @@ -13,9 +16,9 @@
134.16 * specific language governing permissions and limitations under the
134.17 * License. When distributing the software, include this License Header
134.18 * Notice in each file and include the License file at
134.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
134.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
134.21 * particular file as subject to the "Classpath" exception as provided
134.22 - * by Sun in the GPL Version 2 section of the License file that
134.23 + * by Oracle in the GPL Version 2 section of the License file that
134.24 * accompanied this code. If applicable, add the following below the
134.25 * License Header, with the fields enclosed by brackets [] replaced by
134.26 * your own identifying information:
135.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/DataconnectivitySettingsBeanInfo.java Mon May 17 14:11:51 2010 -0400
135.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/DataconnectivitySettingsBeanInfo.java Mon May 17 14:19:35 2010 -0400
135.3 @@ -1,7 +1,10 @@
135.4 /*
135.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
135.6 *
135.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
135.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
135.9 + *
135.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
135.11 + * Other names may be trademarks of their respective owners.
135.12 *
135.13 * The contents of this file are subject to the terms of either the GNU
135.14 * General Public License Version 2 only ("GPL") or the Common
135.15 @@ -13,9 +16,9 @@
135.16 * specific language governing permissions and limitations under the
135.17 * License. When distributing the software, include this License Header
135.18 * Notice in each file and include the License file at
135.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
135.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
135.21 * particular file as subject to the "Classpath" exception as provided
135.22 - * by Sun in the GPL Version 2 section of the License file that
135.23 + * by Oracle in the GPL Version 2 section of the License file that
135.24 * accompanied this code. If applicable, add the following below the
135.25 * License Header, with the fields enclosed by brackets [] replaced by
135.26 * your own identifying information:
136.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/Log.java Mon May 17 14:11:51 2010 -0400
136.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/Log.java Mon May 17 14:19:35 2010 -0400
136.3 @@ -1,7 +1,10 @@
136.4 /*
136.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
136.6 *
136.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
136.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
136.9 + *
136.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
136.11 + * Other names may be trademarks of their respective owners.
136.12 *
136.13 * The contents of this file are subject to the terms of either the GNU
136.14 * General Public License Version 2 only ("GPL") or the Common
136.15 @@ -13,9 +16,9 @@
136.16 * specific language governing permissions and limitations under the
136.17 * License. When distributing the software, include this License Header
136.18 * Notice in each file and include the License file at
136.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
136.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
136.21 * particular file as subject to the "Classpath" exception as provided
136.22 - * by Sun in the GPL Version 2 section of the License file that
136.23 + * by Oracle in the GPL Version 2 section of the License file that
136.24 * accompanied this code. If applicable, add the following below the
136.25 * License Header, with the fields enclosed by brackets [] replaced by
136.26 * your own identifying information:
137.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/Bundle.properties Mon May 17 14:11:51 2010 -0400
137.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/Bundle.properties Mon May 17 14:19:35 2010 -0400
137.3 @@ -1,7 +1,10 @@
137.4
137.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
137.6 #
137.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
137.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
137.9 +#
137.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
137.11 +# Other names may be trademarks of their respective owners.
137.12 #
137.13 # The contents of this file are subject to the terms of either the GNU
137.14 # General Public License Version 2 only ("GPL") or the Common
137.15 @@ -13,9 +16,9 @@
137.16 # specific language governing permissions and limitations under the
137.17 # License. When distributing the software, include this License Header
137.18 # Notice in each file and include the License file at
137.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
137.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
137.21 # particular file as subject to the "Classpath" exception as provided
137.22 -# by Sun in the GPL Version 2 section of the License file that
137.23 +# by Oracle in the GPL Version 2 section of the License file that
137.24 # accompanied this code. If applicable, add the following below the
137.25 # License Header, with the fields enclosed by brackets [] replaced by
137.26 # your own identifying information:
138.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/RowSetSelection.java Mon May 17 14:11:51 2010 -0400
138.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/RowSetSelection.java Mon May 17 14:19:35 2010 -0400
138.3 @@ -1,7 +1,10 @@
138.4 /*
138.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
138.6 *
138.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
138.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
138.9 + *
138.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
138.11 + * Other names may be trademarks of their respective owners.
138.12 *
138.13 * The contents of this file are subject to the terms of either the GNU
138.14 * General Public License Version 2 only ("GPL") or the Common
138.15 @@ -13,9 +16,9 @@
138.16 * specific language governing permissions and limitations under the
138.17 * License. When distributing the software, include this License Header
138.18 * Notice in each file and include the License file at
138.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
138.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
138.21 * particular file as subject to the "Classpath" exception as provided
138.22 - * by Sun in the GPL Version 2 section of the License file that
138.23 + * by Oracle in the GPL Version 2 section of the License file that
138.24 * accompanied this code. If applicable, add the following below the
138.25 * License Header, with the fields enclosed by brackets [] replaced by
138.26 * your own identifying information:
139.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/RowSetSelectionQuery.java Mon May 17 14:11:51 2010 -0400
139.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/RowSetSelectionQuery.java Mon May 17 14:19:35 2010 -0400
139.3 @@ -1,7 +1,10 @@
139.4 /*
139.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
139.6 *
139.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
139.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
139.9 + *
139.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
139.11 + * Other names may be trademarks of their respective owners.
139.12 *
139.13 * The contents of this file are subject to the terms of either the GNU
139.14 * General Public License Version 2 only ("GPL") or the Common
139.15 @@ -13,9 +16,9 @@
139.16 * specific language governing permissions and limitations under the
139.17 * License. When distributing the software, include this License Header
139.18 * Notice in each file and include the License file at
139.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
139.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
139.21 * particular file as subject to the "Classpath" exception as provided
139.22 - * by Sun in the GPL Version 2 section of the License file that
139.23 + * by Oracle in the GPL Version 2 section of the License file that
139.24 * accompanied this code. If applicable, add the following below the
139.25 * License Header, with the fields enclosed by brackets [] replaced by
139.26 * your own identifying information:
140.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/SqlCommandCustomizer.java Mon May 17 14:11:51 2010 -0400
140.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/SqlCommandCustomizer.java Mon May 17 14:19:35 2010 -0400
140.3 @@ -1,7 +1,10 @@
140.4 /*
140.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
140.6 *
140.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
140.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
140.9 + *
140.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
140.11 + * Other names may be trademarks of their respective owners.
140.12 *
140.13 * The contents of this file are subject to the terms of either the GNU
140.14 * General Public License Version 2 only ("GPL") or the Common
140.15 @@ -13,9 +16,9 @@
140.16 * specific language governing permissions and limitations under the
140.17 * License. When distributing the software, include this License Header
140.18 * Notice in each file and include the License file at
140.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
140.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
140.21 * particular file as subject to the "Classpath" exception as provided
140.22 - * by Sun in the GPL Version 2 section of the License file that
140.23 + * by Oracle in the GPL Version 2 section of the License file that
140.24 * accompanied this code. If applicable, add the following below the
140.25 * License Header, with the fields enclosed by brackets [] replaced by
140.26 * your own identifying information:
141.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/VisualSQLEditorMetaDataImpl.java Mon May 17 14:11:51 2010 -0400
141.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/VisualSQLEditorMetaDataImpl.java Mon May 17 14:19:35 2010 -0400
141.3 @@ -1,7 +1,10 @@
141.4 /*
141.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
141.6 *
141.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
141.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
141.9 + *
141.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
141.11 + * Other names may be trademarks of their respective owners.
141.12 *
141.13 * The contents of this file are subject to the terms of either the GNU
141.14 * General Public License Version 2 only ("GPL") or the Common
141.15 @@ -13,9 +16,9 @@
141.16 * specific language governing permissions and limitations under the
141.17 * License. When distributing the software, include this License Header
141.18 * Notice in each file and include the License file at
141.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
141.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
141.21 * particular file as subject to the "Classpath" exception as provided
141.22 - * by Sun in the GPL Version 2 section of the License file that
141.23 + * by Oracle in the GPL Version 2 section of the License file that
141.24 * accompanied this code. If applicable, add the following below the
141.25 * License Header, with the fields enclosed by brackets [] replaced by
141.26 * your own identifying information:
142.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/BrokenDataSourceSupport.java Mon May 17 14:11:51 2010 -0400
142.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/BrokenDataSourceSupport.java Mon May 17 14:19:35 2010 -0400
142.3 @@ -1,7 +1,10 @@
142.4 /*
142.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
142.6 *
142.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
142.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
142.9 + *
142.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
142.11 + * Other names may be trademarks of their respective owners.
142.12 *
142.13 * The contents of this file are subject to the terms of either the GNU
142.14 * General Public License Version 2 only ("GPL") or the Common
142.15 @@ -13,9 +16,9 @@
142.16 * specific language governing permissions and limitations under the
142.17 * License. When distributing the software, include this License Header
142.18 * Notice in each file and include the License file at
142.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
142.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
142.21 * particular file as subject to the "Classpath" exception as provided
142.22 - * by Sun in the GPL Version 2 section of the License file that
142.23 + * by Oracle in the GPL Version 2 section of the License file that
142.24 * accompanied this code. If applicable, add the following below the
142.25 * License Header, with the fields enclosed by brackets [] replaced by
142.26 * your own identifying information:
143.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/Bundle.properties Mon May 17 14:11:51 2010 -0400
143.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/Bundle.properties Mon May 17 14:19:35 2010 -0400
143.3 @@ -1,6 +1,9 @@
143.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
143.5 #
143.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
143.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
143.8 +#
143.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
143.10 +# Other names may be trademarks of their respective owners.
143.11 #
143.12 # The contents of this file are subject to the terms of either the GNU
143.13 # General Public License Version 2 only ("GPL") or the Common
143.14 @@ -12,9 +15,9 @@
143.15 # specific language governing permissions and limitations under the
143.16 # License. When distributing the software, include this License Header
143.17 # Notice in each file and include the License file at
143.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
143.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
143.20 # particular file as subject to the "Classpath" exception as provided
143.21 -# by Sun in the GPL Version 2 section of the License file that
143.22 +# by Oracle in the GPL Version 2 section of the License file that
143.23 # accompanied this code. If applicable, add the following below the
143.24 # License Header, with the fields enclosed by brackets [] replaced by
143.25 # your own identifying information:
144.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/CurrentProject.java Mon May 17 14:11:51 2010 -0400
144.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/CurrentProject.java Mon May 17 14:19:35 2010 -0400
144.3 @@ -2,7 +2,10 @@
144.4 /*
144.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
144.6 *
144.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
144.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
144.9 + *
144.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
144.11 + * Other names may be trademarks of their respective owners.
144.12 *
144.13 * The contents of this file are subject to the terms of either the GNU
144.14 * General Public License Version 2 only ("GPL") or the Common
144.15 @@ -14,9 +17,9 @@
144.16 * specific language governing permissions and limitations under the
144.17 * License. When distributing the software, include this License Header
144.18 * Notice in each file and include the License file at
144.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
144.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
144.21 * particular file as subject to the "Classpath" exception as provided
144.22 - * by Sun in the GPL Version 2 section of the License file that
144.23 + * by Oracle in the GPL Version 2 section of the License file that
144.24 * accompanied this code. If applicable, add the following below the
144.25 * License Header, with the fields enclosed by brackets [] replaced by
144.26 * your own identifying information:
145.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/DataSourceResolver.java Mon May 17 14:11:51 2010 -0400
145.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/DataSourceResolver.java Mon May 17 14:19:35 2010 -0400
145.3 @@ -1,7 +1,10 @@
145.4 /*
145.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
145.6 *
145.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
145.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
145.9 + *
145.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
145.11 + * Other names may be trademarks of their respective owners.
145.12 *
145.13 * The contents of this file are subject to the terms of either the GNU
145.14 * General Public License Version 2 only ("GPL") or the Common
145.15 @@ -13,9 +16,9 @@
145.16 * specific language governing permissions and limitations under the
145.17 * License. When distributing the software, include this License Header
145.18 * Notice in each file and include the License file at
145.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
145.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
145.21 * particular file as subject to the "Classpath" exception as provided
145.22 - * by Sun in the GPL Version 2 section of the License file that
145.23 + * by Oracle in the GPL Version 2 section of the License file that
145.24 * accompanied this code. If applicable, add the following below the
145.25 * License Header, with the fields enclosed by brackets [] replaced by
145.26 * your own identifying information:
146.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/Bundle.properties Mon May 17 14:11:51 2010 -0400
146.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/Bundle.properties Mon May 17 14:19:35 2010 -0400
146.3 @@ -1,6 +1,9 @@
146.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
146.5 #
146.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
146.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
146.8 +#
146.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
146.10 +# Other names may be trademarks of their respective owners.
146.11 #
146.12 # The contents of this file are subject to the terms of either the GNU
146.13 # General Public License Version 2 only ("GPL") or the Common
146.14 @@ -12,9 +15,9 @@
146.15 # specific language governing permissions and limitations under the
146.16 # License. When distributing the software, include this License Header
146.17 # Notice in each file and include the License file at
146.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
146.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
146.20 # particular file as subject to the "Classpath" exception as provided
146.21 -# by Sun in the GPL Version 2 section of the License file that
146.22 +# by Oracle in the GPL Version 2 section of the License file that
146.23 # accompanied this code. If applicable, add the following below the
146.24 # License Header, with the fields enclosed by brackets [] replaced by
146.25 # your own identifying information:
147.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/DataSourcePropertyEditor.java Mon May 17 14:11:51 2010 -0400
147.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/DataSourcePropertyEditor.java Mon May 17 14:19:35 2010 -0400
147.3 @@ -1,7 +1,10 @@
147.4 /*
147.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
147.6 *
147.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
147.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
147.9 + *
147.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
147.11 + * Other names may be trademarks of their respective owners.
147.12 *
147.13 * The contents of this file are subject to the terms of either the GNU
147.14 * General Public License Version 2 only ("GPL") or the Common
147.15 @@ -13,9 +16,9 @@
147.16 * specific language governing permissions and limitations under the
147.17 * License. When distributing the software, include this License Header
147.18 * Notice in each file and include the License file at
147.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
147.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
147.21 * particular file as subject to the "Classpath" exception as provided
147.22 - * by Sun in the GPL Version 2 section of the License file that
147.23 + * by Oracle in the GPL Version 2 section of the License file that
147.24 * accompanied this code. If applicable, add the following below the
147.25 * License Header, with the fields enclosed by brackets [] replaced by
147.26 * your own identifying information:
148.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/ProjectDataSourceNode.java Mon May 17 14:11:51 2010 -0400
148.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/ProjectDataSourceNode.java Mon May 17 14:19:35 2010 -0400
148.3 @@ -1,7 +1,10 @@
148.4 /*
148.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
148.6 *
148.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
148.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
148.9 + *
148.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
148.11 + * Other names may be trademarks of their respective owners.
148.12 *
148.13 * The contents of this file are subject to the terms of either the GNU
148.14 * General Public License Version 2 only ("GPL") or the Common
148.15 @@ -13,9 +16,9 @@
148.16 * specific language governing permissions and limitations under the
148.17 * License. When distributing the software, include this License Header
148.18 * Notice in each file and include the License file at
148.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
148.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
148.21 * particular file as subject to the "Classpath" exception as provided
148.22 - * by Sun in the GPL Version 2 section of the License file that
148.23 + * by Oracle in the GPL Version 2 section of the License file that
148.24 * accompanied this code. If applicable, add the following below the
148.25 * License Header, with the fields enclosed by brackets [] replaced by
148.26 * your own identifying information:
149.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/ProjectDataSourceNodeChildren.java Mon May 17 14:11:51 2010 -0400
149.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/ProjectDataSourceNodeChildren.java Mon May 17 14:19:35 2010 -0400
149.3 @@ -1,7 +1,10 @@
149.4 /*
149.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
149.6 *
149.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
149.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
149.9 + *
149.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
149.11 + * Other names may be trademarks of their respective owners.
149.12 *
149.13 * The contents of this file are subject to the terms of either the GNU
149.14 * General Public License Version 2 only ("GPL") or the Common
149.15 @@ -13,9 +16,9 @@
149.16 * specific language governing permissions and limitations under the
149.17 * License. When distributing the software, include this License Header
149.18 * Notice in each file and include the License file at
149.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
149.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
149.21 * particular file as subject to the "Classpath" exception as provided
149.22 - * by Sun in the GPL Version 2 section of the License file that
149.23 + * by Oracle in the GPL Version 2 section of the License file that
149.24 * accompanied this code. If applicable, add the following below the
149.25 * License Header, with the fields enclosed by brackets [] replaced by
149.26 * your own identifying information:
150.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/RowSetBeanCreateInfoSet.java Mon May 17 14:11:51 2010 -0400
150.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/RowSetBeanCreateInfoSet.java Mon May 17 14:19:35 2010 -0400
150.3 @@ -1,7 +1,10 @@
150.4 /*
150.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
150.6 *
150.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
150.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
150.9 + *
150.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
150.11 + * Other names may be trademarks of their respective owners.
150.12 *
150.13 * The contents of this file are subject to the terms of either the GNU
150.14 * General Public License Version 2 only ("GPL") or the Common
150.15 @@ -13,9 +16,9 @@
150.16 * specific language governing permissions and limitations under the
150.17 * License. When distributing the software, include this License Header
150.18 * Notice in each file and include the License file at
150.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
150.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
150.21 * particular file as subject to the "Classpath" exception as provided
150.22 - * by Sun in the GPL Version 2 section of the License file that
150.23 + * by Oracle in the GPL Version 2 section of the License file that
150.24 * accompanied this code. If applicable, add the following below the
150.25 * License Header, with the fields enclosed by brackets [] replaced by
150.26 * your own identifying information:
151.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/mf-layer.xml Mon May 17 14:11:51 2010 -0400
151.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/mf-layer.xml Mon May 17 14:19:35 2010 -0400
151.3 @@ -2,7 +2,10 @@
151.4 <!--
151.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
151.6
151.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
151.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
151.9 +
151.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
151.11 +Other names may be trademarks of their respective owners.
151.12
151.13
151.14 The contents of this file are subject to the terms of either the GNU
151.15 @@ -15,9 +18,9 @@
151.16 specific language governing permissions and limitations under the
151.17 License. When distributing the software, include this License Header
151.18 Notice in each file and include the License file at
151.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
151.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
151.21 particular file as subject to the "Classpath" exception as provided
151.22 -by Sun in the GPL Version 2 section of the License file that
151.23 +by Oracle in the GPL Version 2 section of the License file that
151.24 accompanied this code. If applicable, add the following below the
151.25 License Header, with the fields enclosed by brackets [] replaced by
151.26 your own identifying information:
152.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/Bundle.properties Mon May 17 14:11:51 2010 -0400
152.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/Bundle.properties Mon May 17 14:19:35 2010 -0400
152.3 @@ -1,6 +1,9 @@
152.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
152.5 #
152.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
152.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
152.8 +#
152.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
152.10 +# Other names may be trademarks of their respective owners.
152.11 #
152.12 # The contents of this file are subject to the terms of either the GNU
152.13 # General Public License Version 2 only ("GPL") or the Common
152.14 @@ -12,9 +15,9 @@
152.15 # specific language governing permissions and limitations under the
152.16 # License. When distributing the software, include this License Header
152.17 # Notice in each file and include the License file at
152.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
152.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
152.20 # particular file as subject to the "Classpath" exception as provided
152.21 -# by Sun in the GPL Version 2 section of the License file that
152.22 +# by Oracle in the GPL Version 2 section of the License file that
152.23 # accompanied this code. If applicable, add the following below the
152.24 # License Header, with the fields enclosed by brackets [] replaced by
152.25 # your own identifying information:
153.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfo.java Mon May 17 14:11:51 2010 -0400
153.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfo.java Mon May 17 14:19:35 2010 -0400
153.3 @@ -1,7 +1,10 @@
153.4 /*
153.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
153.6 *
153.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
153.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
153.9 + *
153.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
153.11 + * Other names may be trademarks of their respective owners.
153.12 *
153.13 * The contents of this file are subject to the terms of either the GNU
153.14 * General Public License Version 2 only ("GPL") or the Common
153.15 @@ -13,9 +16,9 @@
153.16 * specific language governing permissions and limitations under the
153.17 * License. When distributing the software, include this License Header
153.18 * Notice in each file and include the License file at
153.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
153.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
153.21 * particular file as subject to the "Classpath" exception as provided
153.22 - * by Sun in the GPL Version 2 section of the License file that
153.23 + * by Oracle in the GPL Version 2 section of the License file that
153.24 * accompanied this code. If applicable, add the following below the
153.25 * License Header, with the fields enclosed by brackets [] replaced by
153.26 * your own identifying information:
154.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfoEvent.java Mon May 17 14:11:51 2010 -0400
154.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfoEvent.java Mon May 17 14:19:35 2010 -0400
154.3 @@ -1,7 +1,10 @@
154.4 /*
154.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
154.6 *
154.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
154.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
154.9 + *
154.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
154.11 + * Other names may be trademarks of their respective owners.
154.12 *
154.13 * The contents of this file are subject to the terms of either the GNU
154.14 * General Public License Version 2 only ("GPL") or the Common
154.15 @@ -13,9 +16,9 @@
154.16 * specific language governing permissions and limitations under the
154.17 * License. When distributing the software, include this License Header
154.18 * Notice in each file and include the License file at
154.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
154.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
154.21 * particular file as subject to the "Classpath" exception as provided
154.22 - * by Sun in the GPL Version 2 section of the License file that
154.23 + * by Oracle in the GPL Version 2 section of the License file that
154.24 * accompanied this code. If applicable, add the following below the
154.25 * License Header, with the fields enclosed by brackets [] replaced by
154.26 * your own identifying information:
155.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfoListener.java Mon May 17 14:11:51 2010 -0400
155.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfoListener.java Mon May 17 14:19:35 2010 -0400
155.3 @@ -1,7 +1,10 @@
155.4 /*
155.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
155.6 *
155.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
155.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
155.9 + *
155.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
155.11 + * Other names may be trademarks of their respective owners.
155.12 *
155.13 * The contents of this file are subject to the terms of either the GNU
155.14 * General Public License Version 2 only ("GPL") or the Common
155.15 @@ -13,9 +16,9 @@
155.16 * specific language governing permissions and limitations under the
155.17 * License. When distributing the software, include this License Header
155.18 * Notice in each file and include the License file at
155.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
155.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
155.21 * particular file as subject to the "Classpath" exception as provided
155.22 - * by Sun in the GPL Version 2 section of the License file that
155.23 + * by Oracle in the GPL Version 2 section of the License file that
155.24 * accompanied this code. If applicable, add the following below the
155.25 * License Header, with the fields enclosed by brackets [] replaced by
155.26 * your own identifying information:
156.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DatasourceConnectionListener.java Mon May 17 14:11:51 2010 -0400
156.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DatasourceConnectionListener.java Mon May 17 14:19:35 2010 -0400
156.3 @@ -1,7 +1,10 @@
156.4 /*
156.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
156.6 *
156.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
156.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
156.9 + *
156.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
156.11 + * Other names may be trademarks of their respective owners.
156.12 *
156.13 * The contents of this file are subject to the terms of either the GNU
156.14 * General Public License Version 2 only ("GPL") or the Common
156.15 @@ -13,9 +16,9 @@
156.16 * specific language governing permissions and limitations under the
156.17 * License. When distributing the software, include this License Header
156.18 * Notice in each file and include the License file at
156.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
156.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
156.21 * particular file as subject to the "Classpath" exception as provided
156.22 - * by Sun in the GPL Version 2 section of the License file that
156.23 + * by Oracle in the GPL Version 2 section of the License file that
156.24 * accompanied this code. If applicable, add the following below the
156.25 * License Header, with the fields enclosed by brackets [] replaced by
156.26 * your own identifying information:
157.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DatasourceTransferManager.java Mon May 17 14:11:51 2010 -0400
157.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DatasourceTransferManager.java Mon May 17 14:19:35 2010 -0400
157.3 @@ -1,7 +1,10 @@
157.4 /*
157.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
157.6 *
157.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
157.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
157.9 + *
157.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
157.11 + * Other names may be trademarks of their respective owners.
157.12 *
157.13 * The contents of this file are subject to the terms of either the GNU
157.14 * General Public License Version 2 only ("GPL") or the Common
157.15 @@ -13,9 +16,9 @@
157.16 * specific language governing permissions and limitations under the
157.17 * License. When distributing the software, include this License Header
157.18 * Notice in each file and include the License file at
157.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
157.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
157.21 * particular file as subject to the "Classpath" exception as provided
157.22 - * by Sun in the GPL Version 2 section of the License file that
157.23 + * by Oracle in the GPL Version 2 section of the License file that
157.24 * accompanied this code. If applicable, add the following below the
157.25 * License Header, with the fields enclosed by brackets [] replaced by
157.26 * your own identifying information:
158.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/OpenProjectDetector.java Mon May 17 14:11:51 2010 -0400
158.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/OpenProjectDetector.java Mon May 17 14:19:35 2010 -0400
158.3 @@ -1,7 +1,10 @@
158.4 /*
158.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
158.6 *
158.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
158.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
158.9 + *
158.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
158.11 + * Other names may be trademarks of their respective owners.
158.12 *
158.13 * The contents of this file are subject to the terms of either the GNU
158.14 * General Public License Version 2 only ("GPL") or the Common
158.15 @@ -13,9 +16,9 @@
158.16 * specific language governing permissions and limitations under the
158.17 * License. When distributing the software, include this License Header
158.18 * Notice in each file and include the License file at
158.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
158.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
158.21 * particular file as subject to the "Classpath" exception as provided
158.22 - * by Sun in the GPL Version 2 section of the License file that
158.23 + * by Oracle in the GPL Version 2 section of the License file that
158.24 * accompanied this code. If applicable, add the following below the
158.25 * License Header, with the fields enclosed by brackets [] replaced by
158.26 * your own identifying information:
159.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/ProjectChangeEvent.java Mon May 17 14:11:51 2010 -0400
159.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/ProjectChangeEvent.java Mon May 17 14:19:35 2010 -0400
159.3 @@ -1,7 +1,10 @@
159.4 /*
159.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
159.6 *
159.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
159.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
159.9 + *
159.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
159.11 + * Other names may be trademarks of their respective owners.
159.12 *
159.13 * The contents of this file are subject to the terms of either the GNU
159.14 * General Public License Version 2 only ("GPL") or the Common
159.15 @@ -13,9 +16,9 @@
159.16 * specific language governing permissions and limitations under the
159.17 * License. When distributing the software, include this License Header
159.18 * Notice in each file and include the License file at
159.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
159.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
159.21 * particular file as subject to the "Classpath" exception as provided
159.22 - * by Sun in the GPL Version 2 section of the License file that
159.23 + * by Oracle in the GPL Version 2 section of the License file that
159.24 * accompanied this code. If applicable, add the following below the
159.25 * License Header, with the fields enclosed by brackets [] replaced by
159.26 * your own identifying information:
160.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/ProjectChangeListener.java Mon May 17 14:11:51 2010 -0400
160.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/ProjectChangeListener.java Mon May 17 14:19:35 2010 -0400
160.3 @@ -1,7 +1,10 @@
160.4 /*
160.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
160.6 *
160.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
160.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
160.9 + *
160.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
160.11 + * Other names may be trademarks of their respective owners.
160.12 *
160.13 * The contents of this file are subject to the terms of either the GNU
160.14 * General Public License Version 2 only ("GPL") or the Common
160.15 @@ -13,9 +16,9 @@
160.16 * specific language governing permissions and limitations under the
160.17 * License. When distributing the software, include this License Header
160.18 * Notice in each file and include the License file at
160.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
160.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
160.21 * particular file as subject to the "Classpath" exception as provided
160.22 - * by Sun in the GPL Version 2 section of the License file that
160.23 + * by Oracle in the GPL Version 2 section of the License file that
160.24 * accompanied this code. If applicable, add the following below the
160.25 * License Header, with the fields enclosed by brackets [] replaced by
160.26 * your own identifying information:
161.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/ProjectDataSourceManager.java Mon May 17 14:11:51 2010 -0400
161.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/ProjectDataSourceManager.java Mon May 17 14:19:35 2010 -0400
161.3 @@ -1,7 +1,10 @@
161.4 /*
161.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
161.6 *
161.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
161.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
161.9 + *
161.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
161.11 + * Other names may be trademarks of their respective owners.
161.12 *
161.13 * The contents of this file are subject to the terms of either the GNU
161.14 * General Public License Version 2 only ("GPL") or the Common
161.15 @@ -13,9 +16,9 @@
161.16 * specific language governing permissions and limitations under the
161.17 * License. When distributing the software, include this License Header
161.18 * Notice in each file and include the License file at
161.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
161.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
161.21 * particular file as subject to the "Classpath" exception as provided
161.22 - * by Sun in the GPL Version 2 section of the License file that
161.23 + * by Oracle in the GPL Version 2 section of the License file that
161.24 * accompanied this code. If applicable, add the following below the
161.25 * License Header, with the fields enclosed by brackets [] replaced by
161.26 * your own identifying information:
162.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/Bundle.properties Mon May 17 14:11:51 2010 -0400
162.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/Bundle.properties Mon May 17 14:19:35 2010 -0400
162.3 @@ -1,6 +1,9 @@
162.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
162.5 #
162.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
162.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
162.8 +#
162.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
162.10 +# Other names may be trademarks of their respective owners.
162.11 #
162.12 # The contents of this file are subject to the terms of either the GNU
162.13 # General Public License Version 2 only ("GPL") or the Common
162.14 @@ -12,9 +15,9 @@
162.15 # specific language governing permissions and limitations under the
162.16 # License. When distributing the software, include this License Header
162.17 # Notice in each file and include the License file at
162.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
162.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
162.20 # particular file as subject to the "Classpath" exception as provided
162.21 -# by Sun in the GPL Version 2 section of the License file that
162.22 +# by Oracle in the GPL Version 2 section of the License file that
162.23 # accompanied this code. If applicable, add the following below the
162.24 # License Header, with the fields enclosed by brackets [] replaced by
162.25 # your own identifying information:
163.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ContextPersistance.java Mon May 17 14:11:51 2010 -0400
163.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ContextPersistance.java Mon May 17 14:19:35 2010 -0400
163.3 @@ -1,7 +1,10 @@
163.4 /*
163.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
163.6 *
163.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
163.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
163.9 + *
163.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
163.11 + * Other names may be trademarks of their respective owners.
163.12 *
163.13 * The contents of this file are subject to the terms of either the GNU
163.14 * General Public License Version 2 only ("GPL") or the Common
163.15 @@ -13,9 +16,9 @@
163.16 * specific language governing permissions and limitations under the
163.17 * License. When distributing the software, include this License Header
163.18 * Notice in each file and include the License file at
163.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
163.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
163.21 * particular file as subject to the "Classpath" exception as provided
163.22 - * by Sun in the GPL Version 2 section of the License file that
163.23 + * by Oracle in the GPL Version 2 section of the License file that
163.24 * accompanied this code. If applicable, add the following below the
163.25 * License Header, with the fields enclosed by brackets [] replaced by
163.26 * your own identifying information:
164.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java Mon May 17 14:11:51 2010 -0400
164.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java Mon May 17 14:19:35 2010 -0400
164.3 @@ -1,7 +1,10 @@
164.4 /*
164.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
164.6 *
164.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
164.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
164.9 + *
164.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
164.11 + * Other names may be trademarks of their respective owners.
164.12 *
164.13 * The contents of this file are subject to the terms of either the GNU
164.14 * General Public License Version 2 only ("GPL") or the Common
164.15 @@ -13,9 +16,9 @@
164.16 * specific language governing permissions and limitations under the
164.17 * License. When distributing the software, include this License Header
164.18 * Notice in each file and include the License file at
164.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
164.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
164.21 * particular file as subject to the "Classpath" exception as provided
164.22 - * by Sun in the GPL Version 2 section of the License file that
164.23 + * by Oracle in the GPL Version 2 section of the License file that
164.24 * accompanied this code. If applicable, add the following below the
164.25 * License Header, with the fields enclosed by brackets [] replaced by
164.26 * your own identifying information:
165.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DerbyWaiter.java Mon May 17 14:11:51 2010 -0400
165.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DerbyWaiter.java Mon May 17 14:19:35 2010 -0400
165.3 @@ -1,7 +1,10 @@
165.4 /*
165.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
165.6 *
165.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
165.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
165.9 + *
165.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
165.11 + * Other names may be trademarks of their respective owners.
165.12 *
165.13 * The contents of this file are subject to the terms of either the GNU
165.14 * General Public License Version 2 only ("GPL") or the Common
165.15 @@ -13,9 +16,9 @@
165.16 * specific language governing permissions and limitations under the
165.17 * License. When distributing the software, include this License Header
165.18 * Notice in each file and include the License file at
165.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
165.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
165.21 * particular file as subject to the "Classpath" exception as provided
165.22 - * by Sun in the GPL Version 2 section of the License file that
165.23 + * by Oracle in the GPL Version 2 section of the License file that
165.24 * accompanied this code. If applicable, add the following below the
165.25 * License Header, with the fields enclosed by brackets [] replaced by
165.26 * your own identifying information:
166.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeContext.java Mon May 17 14:11:51 2010 -0400
166.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeContext.java Mon May 17 14:19:35 2010 -0400
166.3 @@ -1,7 +1,10 @@
166.4 /*
166.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
166.6 *
166.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
166.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
166.9 + *
166.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
166.11 + * Other names may be trademarks of their respective owners.
166.12 *
166.13 * The contents of this file are subject to the terms of either the GNU
166.14 * General Public License Version 2 only ("GPL") or the Common
166.15 @@ -13,9 +16,9 @@
166.16 * specific language governing permissions and limitations under the
166.17 * License. When distributing the software, include this License Header
166.18 * Notice in each file and include the License file at
166.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
166.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
166.21 * particular file as subject to the "Classpath" exception as provided
166.22 - * by Sun in the GPL Version 2 section of the License file that
166.23 + * by Oracle in the GPL Version 2 section of the License file that
166.24 * accompanied this code. If applicable, add the following below the
166.25 * License Header, with the fields enclosed by brackets [] replaced by
166.26 * your own identifying information:
167.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeInitialContextFactory.java Mon May 17 14:11:51 2010 -0400
167.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeInitialContextFactory.java Mon May 17 14:19:35 2010 -0400
167.3 @@ -1,7 +1,10 @@
167.4 /*
167.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
167.6 *
167.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
167.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
167.9 + *
167.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
167.11 + * Other names may be trademarks of their respective owners.
167.12 *
167.13 * The contents of this file are subject to the terms of either the GNU
167.14 * General Public License Version 2 only ("GPL") or the Common
167.15 @@ -13,9 +16,9 @@
167.16 * specific language governing permissions and limitations under the
167.17 * License. When distributing the software, include this License Header
167.18 * Notice in each file and include the License file at
167.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
167.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
167.21 * particular file as subject to the "Classpath" exception as provided
167.22 - * by Sun in the GPL Version 2 section of the License file that
167.23 + * by Oracle in the GPL Version 2 section of the License file that
167.24 * accompanied this code. If applicable, add the following below the
167.25 * License Header, with the fields enclosed by brackets [] replaced by
167.26 * your own identifying information:
168.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeNameParser.java Mon May 17 14:11:51 2010 -0400
168.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeNameParser.java Mon May 17 14:19:35 2010 -0400
168.3 @@ -1,7 +1,10 @@
168.4 /*
168.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
168.6 *
168.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
168.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
168.9 + *
168.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
168.11 + * Other names may be trademarks of their respective owners.
168.12 *
168.13 * The contents of this file are subject to the terms of either the GNU
168.14 * General Public License Version 2 only ("GPL") or the Common
168.15 @@ -13,9 +16,9 @@
168.16 * specific language governing permissions and limitations under the
168.17 * License. When distributing the software, include this License Header
168.18 * Notice in each file and include the License file at
168.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
168.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
168.21 * particular file as subject to the "Classpath" exception as provided
168.22 - * by Sun in the GPL Version 2 section of the License file that
168.23 + * by Oracle in the GPL Version 2 section of the License file that
168.24 * accompanied this code. If applicable, add the following below the
168.25 * License Header, with the fields enclosed by brackets [] replaced by
168.26 * your own identifying information:
169.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeNamingEnumeration.java Mon May 17 14:11:51 2010 -0400
169.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeNamingEnumeration.java Mon May 17 14:19:35 2010 -0400
169.3 @@ -1,7 +1,10 @@
169.4 /*
169.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
169.6 *
169.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
169.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
169.9 + *
169.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
169.11 + * Other names may be trademarks of their respective owners.
169.12 *
169.13 * The contents of this file are subject to the terms of either the GNU
169.14 * General Public License Version 2 only ("GPL") or the Common
169.15 @@ -13,9 +16,9 @@
169.16 * specific language governing permissions and limitations under the
169.17 * License. When distributing the software, include this License Header
169.18 * Notice in each file and include the License file at
169.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
169.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
169.21 * particular file as subject to the "Classpath" exception as provided
169.22 - * by Sun in the GPL Version 2 section of the License file that
169.23 + * by Oracle in the GPL Version 2 section of the License file that
169.24 * accompanied this code. If applicable, add the following below the
169.25 * License Header, with the fields enclosed by brackets [] replaced by
169.26 * your own identifying information:
170.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/Log.java Mon May 17 14:11:51 2010 -0400
170.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/Log.java Mon May 17 14:19:35 2010 -0400
170.3 @@ -1,7 +1,10 @@
170.4 /*
170.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
170.6 *
170.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
170.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
170.9 + *
170.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
170.11 + * Other names may be trademarks of their respective owners.
170.12 *
170.13 * The contents of this file are subject to the terms of either the GNU
170.14 * General Public License Version 2 only ("GPL") or the Common
170.15 @@ -13,9 +16,9 @@
170.16 * specific language governing permissions and limitations under the
170.17 * License. When distributing the software, include this License Header
170.18 * Notice in each file and include the License file at
170.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
170.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
170.21 * particular file as subject to the "Classpath" exception as provided
170.22 - * by Sun in the GPL Version 2 section of the License file that
170.23 + * by Oracle in the GPL Version 2 section of the License file that
170.24 * accompanied this code. If applicable, add the following below the
170.25 * License Header, with the fields enclosed by brackets [] replaced by
170.26 * your own identifying information:
171.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/LogBase.java Mon May 17 14:11:51 2010 -0400
171.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/LogBase.java Mon May 17 14:19:35 2010 -0400
171.3 @@ -1,7 +1,10 @@
171.4 /*
171.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
171.6 *
171.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
171.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
171.9 + *
171.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
171.11 + * Other names may be trademarks of their respective owners.
171.12 *
171.13 * The contents of this file are subject to the terms of either the GNU
171.14 * General Public License Version 2 only ("GPL") or the Common
171.15 @@ -13,9 +16,9 @@
171.16 * specific language governing permissions and limitations under the
171.17 * License. When distributing the software, include this License Header
171.18 * Notice in each file and include the License file at
171.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
171.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
171.21 * particular file as subject to the "Classpath" exception as provided
171.22 - * by Sun in the GPL Version 2 section of the License file that
171.23 + * by Oracle in the GPL Version 2 section of the License file that
171.24 * accompanied this code. If applicable, add the following below the
171.25 * License Header, with the fields enclosed by brackets [] replaced by
171.26 * your own identifying information:
172.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ObjectChangeEvent.java Mon May 17 14:11:51 2010 -0400
172.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ObjectChangeEvent.java Mon May 17 14:19:35 2010 -0400
172.3 @@ -1,7 +1,10 @@
172.4 /*
172.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
172.6 *
172.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
172.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
172.9 + *
172.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
172.11 + * Other names may be trademarks of their respective owners.
172.12 *
172.13 * The contents of this file are subject to the terms of either the GNU
172.14 * General Public License Version 2 only ("GPL") or the Common
172.15 @@ -13,9 +16,9 @@
172.16 * specific language governing permissions and limitations under the
172.17 * License. When distributing the software, include this License Header
172.18 * Notice in each file and include the License file at
172.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
172.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
172.21 * particular file as subject to the "Classpath" exception as provided
172.22 - * by Sun in the GPL Version 2 section of the License file that
172.23 + * by Oracle in the GPL Version 2 section of the License file that
172.24 * accompanied this code. If applicable, add the following below the
172.25 * License Header, with the fields enclosed by brackets [] replaced by
172.26 * your own identifying information:
173.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ObjectChangeListener.java Mon May 17 14:11:51 2010 -0400
173.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ObjectChangeListener.java Mon May 17 14:19:35 2010 -0400
173.3 @@ -1,7 +1,10 @@
173.4 /*
173.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
173.6 *
173.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
173.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
173.9 + *
173.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
173.11 + * Other names may be trademarks of their respective owners.
173.12 *
173.13 * The contents of this file are subject to the terms of either the GNU
173.14 * General Public License Version 2 only ("GPL") or the Common
173.15 @@ -13,9 +16,9 @@
173.16 * specific language governing permissions and limitations under the
173.17 * License. When distributing the software, include this License Header
173.18 * Notice in each file and include the License file at
173.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
173.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
173.21 * particular file as subject to the "Classpath" exception as provided
173.22 - * by Sun in the GPL Version 2 section of the License file that
173.23 + * by Oracle in the GPL Version 2 section of the License file that
173.24 * accompanied this code. If applicable, add the following below the
173.25 * License Header, with the fields enclosed by brackets [] replaced by
173.26 * your own identifying information:
174.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceChangeEvent.java Mon May 17 14:11:51 2010 -0400
174.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceChangeEvent.java Mon May 17 14:19:35 2010 -0400
174.3 @@ -1,7 +1,10 @@
174.4 /*
174.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
174.6 *
174.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
174.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
174.9 + *
174.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
174.11 + * Other names may be trademarks of their respective owners.
174.12 *
174.13 * The contents of this file are subject to the terms of either the GNU
174.14 * General Public License Version 2 only ("GPL") or the Common
174.15 @@ -13,9 +16,9 @@
174.16 * specific language governing permissions and limitations under the
174.17 * License. When distributing the software, include this License Header
174.18 * Notice in each file and include the License file at
174.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
174.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
174.21 * particular file as subject to the "Classpath" exception as provided
174.22 - * by Sun in the GPL Version 2 section of the License file that
174.23 + * by Oracle in the GPL Version 2 section of the License file that
174.24 * accompanied this code. If applicable, add the following below the
174.25 * License Header, with the fields enclosed by brackets [] replaced by
174.26 * your own identifying information:
175.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceListener.java Mon May 17 14:11:51 2010 -0400
175.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceListener.java Mon May 17 14:19:35 2010 -0400
175.3 @@ -1,7 +1,10 @@
175.4 /*
175.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
175.6 *
175.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
175.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
175.9 + *
175.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
175.11 + * Other names may be trademarks of their respective owners.
175.12 *
175.13 * The contents of this file are subject to the terms of either the GNU
175.14 * General Public License Version 2 only ("GPL") or the Common
175.15 @@ -13,9 +16,9 @@
175.16 * specific language governing permissions and limitations under the
175.17 * License. When distributing the software, include this License Header
175.18 * Notice in each file and include the License file at
175.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
175.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
175.21 * particular file as subject to the "Classpath" exception as provided
175.22 - * by Sun in the GPL Version 2 section of the License file that
175.23 + * by Oracle in the GPL Version 2 section of the License file that
175.24 * accompanied this code. If applicable, add the following below the
175.25 * License Header, with the fields enclosed by brackets [] replaced by
175.26 * your own identifying information:
176.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceServiceImpl.java Mon May 17 14:11:51 2010 -0400
176.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceServiceImpl.java Mon May 17 14:19:35 2010 -0400
176.3 @@ -1,7 +1,10 @@
176.4 /*
176.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
176.6 *
176.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
176.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
176.9 + *
176.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
176.11 + * Other names may be trademarks of their respective owners.
176.12 *
176.13 * The contents of this file are subject to the terms of either the GNU
176.14 * General Public License Version 2 only ("GPL") or the Common
176.15 @@ -13,9 +16,9 @@
176.16 * specific language governing permissions and limitations under the
176.17 * License. When distributing the software, include this License Header
176.18 * Notice in each file and include the License file at
176.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
176.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
176.21 * particular file as subject to the "Classpath" exception as provided
176.22 - * by Sun in the GPL Version 2 section of the License file that
176.23 + * by Oracle in the GPL Version 2 section of the License file that
176.24 * accompanied this code. If applicable, add the following below the
176.25 * License Header, with the fields enclosed by brackets [] replaced by
176.26 * your own identifying information:
177.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceTracker.java Mon May 17 14:11:51 2010 -0400
177.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceTracker.java Mon May 17 14:19:35 2010 -0400
177.3 @@ -1,7 +1,10 @@
177.4 /*
177.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
177.6 *
177.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
177.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
177.9 + *
177.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
177.11 + * Other names may be trademarks of their respective owners.
177.12 *
177.13 * The contents of this file are subject to the terms of either the GNU
177.14 * General Public License Version 2 only ("GPL") or the Common
177.15 @@ -13,9 +16,9 @@
177.16 * specific language governing permissions and limitations under the
177.17 * License. When distributing the software, include this License Header
177.18 * Notice in each file and include the License file at
177.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
177.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
177.21 * particular file as subject to the "Classpath" exception as provided
177.22 - * by Sun in the GPL Version 2 section of the License file that
177.23 + * by Oracle in the GPL Version 2 section of the License file that
177.24 * accompanied this code. If applicable, add the following below the
177.25 * License Header, with the fields enclosed by brackets [] replaced by
177.26 * your own identifying information:
178.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourcesChangeEvent.java Mon May 17 14:11:51 2010 -0400
178.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourcesChangeEvent.java Mon May 17 14:19:35 2010 -0400
178.3 @@ -1,7 +1,10 @@
178.4 /*
178.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
178.6 *
178.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
178.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
178.9 + *
178.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
178.11 + * Other names may be trademarks of their respective owners.
178.12 *
178.13 * The contents of this file are subject to the terms of either the GNU
178.14 * General Public License Version 2 only ("GPL") or the Common
178.15 @@ -13,9 +16,9 @@
178.16 * specific language governing permissions and limitations under the
178.17 * License. When distributing the software, include this License Header
178.18 * Notice in each file and include the License file at
178.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
178.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
178.21 * particular file as subject to the "Classpath" exception as provided
178.22 - * by Sun in the GPL Version 2 section of the License file that
178.23 + * by Oracle in the GPL Version 2 section of the License file that
178.24 * accompanied this code. If applicable, add the following below the
178.25 * License Header, with the fields enclosed by brackets [] replaced by
178.26 * your own identifying information:
179.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourcesListener.java Mon May 17 14:11:51 2010 -0400
179.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourcesListener.java Mon May 17 14:19:35 2010 -0400
179.3 @@ -1,7 +1,10 @@
179.4 /*
179.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
179.6 *
179.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
179.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
179.9 + *
179.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
179.11 + * Other names may be trademarks of their respective owners.
179.12 *
179.13 * The contents of this file are subject to the terms of either the GNU
179.14 * General Public License Version 2 only ("GPL") or the Common
179.15 @@ -13,9 +16,9 @@
179.16 * specific language governing permissions and limitations under the
179.17 * License. When distributing the software, include this License Header
179.18 * Notice in each file and include the License file at
179.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
179.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
179.21 * particular file as subject to the "Classpath" exception as provided
179.22 - * by Sun in the GPL Version 2 section of the License file that
179.23 + * by Oracle in the GPL Version 2 section of the License file that
179.24 * accompanied this code. If applicable, add the following below the
179.25 * License Header, with the fields enclosed by brackets [] replaced by
179.26 * your own identifying information:
180.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectOpenedEvent.java Mon May 17 14:11:51 2010 -0400
180.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectOpenedEvent.java Mon May 17 14:19:35 2010 -0400
180.3 @@ -1,7 +1,10 @@
180.4 /*
180.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
180.6 *
180.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
180.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
180.9 + *
180.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
180.11 + * Other names may be trademarks of their respective owners.
180.12 *
180.13 * The contents of this file are subject to the terms of either the GNU
180.14 * General Public License Version 2 only ("GPL") or the Common
180.15 @@ -13,9 +16,9 @@
180.16 * specific language governing permissions and limitations under the
180.17 * License. When distributing the software, include this License Header
180.18 * Notice in each file and include the License file at
180.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
180.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
180.21 * particular file as subject to the "Classpath" exception as provided
180.22 - * by Sun in the GPL Version 2 section of the License file that
180.23 + * by Oracle in the GPL Version 2 section of the License file that
180.24 * accompanied this code. If applicable, add the following below the
180.25 * License Header, with the fields enclosed by brackets [] replaced by
180.26 * your own identifying information:
181.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectOpenedListener.java Mon May 17 14:11:51 2010 -0400
181.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectOpenedListener.java Mon May 17 14:19:35 2010 -0400
181.3 @@ -1,7 +1,10 @@
181.4 /*
181.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
181.6 *
181.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
181.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
181.9 + *
181.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
181.11 + * Other names may be trademarks of their respective owners.
181.12 *
181.13 * The contents of this file are subject to the terms of either the GNU
181.14 * General Public License Version 2 only ("GPL") or the Common
181.15 @@ -13,9 +16,9 @@
181.16 * specific language governing permissions and limitations under the
181.17 * License. When distributing the software, include this License Header
181.18 * Notice in each file and include the License file at
181.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
181.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
181.21 * particular file as subject to the "Classpath" exception as provided
181.22 - * by Sun in the GPL Version 2 section of the License file that
181.23 + * by Oracle in the GPL Version 2 section of the License file that
181.24 * accompanied this code. If applicable, add the following below the
181.25 * License Header, with the fields enclosed by brackets [] replaced by
181.26 * your own identifying information:
182.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/Bundle.properties Mon May 17 14:11:51 2010 -0400
182.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/Bundle.properties Mon May 17 14:19:35 2010 -0400
182.3 @@ -1,6 +1,9 @@
182.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
182.5 #
182.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
182.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
182.8 +#
182.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
182.10 +# Other names may be trademarks of their respective owners.
182.11 #
182.12 # The contents of this file are subject to the terms of either the GNU
182.13 # General Public License Version 2 only ("GPL") or the Common
182.14 @@ -12,9 +15,9 @@
182.15 # specific language governing permissions and limitations under the
182.16 # License. When distributing the software, include this License Header
182.17 # Notice in each file and include the License file at
182.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
182.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
182.20 # particular file as subject to the "Classpath" exception as provided
182.21 -# by Sun in the GPL Version 2 section of the License file that
182.22 +# by Oracle in the GPL Version 2 section of the License file that
182.23 # accompanied this code. If applicable, add the following below the
182.24 # License Header, with the fields enclosed by brackets [] replaced by
182.25 # your own identifying information:
183.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ColumnMetaData.java Mon May 17 14:11:51 2010 -0400
183.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ColumnMetaData.java Mon May 17 14:19:35 2010 -0400
183.3 @@ -1,7 +1,10 @@
183.4 /*
183.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
183.6 *
183.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
183.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
183.9 + *
183.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
183.11 + * Other names may be trademarks of their respective owners.
183.12 *
183.13 * The contents of this file are subject to the terms of either the GNU
183.14 * General Public License Version 2 only ("GPL") or the Common
183.15 @@ -13,9 +16,9 @@
183.16 * specific language governing permissions and limitations under the
183.17 * License. When distributing the software, include this License Header
183.18 * Notice in each file and include the License file at
183.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
183.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
183.21 * particular file as subject to the "Classpath" exception as provided
183.22 - * by Sun in the GPL Version 2 section of the License file that
183.23 + * by Oracle in the GPL Version 2 section of the License file that
183.24 * accompanied this code. If applicable, add the following below the
183.25 * License Header, with the fields enclosed by brackets [] replaced by
183.26 * your own identifying information:
184.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ColumnMetaDataHelper.java Mon May 17 14:11:51 2010 -0400
184.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ColumnMetaDataHelper.java Mon May 17 14:19:35 2010 -0400
184.3 @@ -1,7 +1,10 @@
184.4 /*
184.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
184.6 *
184.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
184.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
184.9 + *
184.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
184.11 + * Other names may be trademarks of their respective owners.
184.12 *
184.13 * The contents of this file are subject to the terms of either the GNU
184.14 * General Public License Version 2 only ("GPL") or the Common
184.15 @@ -13,9 +16,9 @@
184.16 * specific language governing permissions and limitations under the
184.17 * License. When distributing the software, include this License Header
184.18 * Notice in each file and include the License file at
184.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
184.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
184.21 * particular file as subject to the "Classpath" exception as provided
184.22 - * by Sun in the GPL Version 2 section of the License file that
184.23 + * by Oracle in the GPL Version 2 section of the License file that
184.24 * accompanied this code. If applicable, add the following below the
184.25 * License Header, with the fields enclosed by brackets [] replaced by
184.26 * your own identifying information:
185.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DataSourceExport.java Mon May 17 14:11:51 2010 -0400
185.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DataSourceExport.java Mon May 17 14:19:35 2010 -0400
185.3 @@ -1,7 +1,10 @@
185.4 /*
185.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
185.6 *
185.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
185.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
185.9 + *
185.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
185.11 + * Other names may be trademarks of their respective owners.
185.12 *
185.13 * The contents of this file are subject to the terms of either the GNU
185.14 * General Public License Version 2 only ("GPL") or the Common
185.15 @@ -13,9 +16,9 @@
185.16 * specific language governing permissions and limitations under the
185.17 * License. When distributing the software, include this License Header
185.18 * Notice in each file and include the License file at
185.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
185.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
185.21 * particular file as subject to the "Classpath" exception as provided
185.22 - * by Sun in the GPL Version 2 section of the License file that
185.23 + * by Oracle in the GPL Version 2 section of the License file that
185.24 * accompanied this code. If applicable, add the following below the
185.25 * License Header, with the fields enclosed by brackets [] replaced by
185.26 * your own identifying information:
186.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DataSourceImport.java Mon May 17 14:11:51 2010 -0400
186.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DataSourceImport.java Mon May 17 14:19:35 2010 -0400
186.3 @@ -1,7 +1,10 @@
186.4 /*
186.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
186.6 *
186.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
186.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
186.9 + *
186.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
186.11 + * Other names may be trademarks of their respective owners.
186.12 *
186.13 * The contents of this file are subject to the terms of either the GNU
186.14 * General Public License Version 2 only ("GPL") or the Common
186.15 @@ -13,9 +16,9 @@
186.16 * specific language governing permissions and limitations under the
186.17 * License. When distributing the software, include this License Header
186.18 * Notice in each file and include the License file at
186.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
186.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
186.21 * particular file as subject to the "Classpath" exception as provided
186.22 - * by Sun in the GPL Version 2 section of the License file that
186.23 + * by Oracle in the GPL Version 2 section of the License file that
186.24 * accompanied this code. If applicable, add the following below the
186.25 * License Header, with the fields enclosed by brackets [] replaced by
186.26 * your own identifying information:
187.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DatabaseMetaDataHelper.java Mon May 17 14:11:51 2010 -0400
187.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DatabaseMetaDataHelper.java Mon May 17 14:19:35 2010 -0400
187.3 @@ -1,7 +1,10 @@
187.4 /*
187.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
187.6 *
187.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
187.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
187.9 + *
187.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
187.11 + * Other names may be trademarks of their respective owners.
187.12 *
187.13 * The contents of this file are subject to the terms of either the GNU
187.14 * General Public License Version 2 only ("GPL") or the Common
187.15 @@ -13,9 +16,9 @@
187.16 * specific language governing permissions and limitations under the
187.17 * License. When distributing the software, include this License Header
187.18 * Notice in each file and include the License file at
187.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
187.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
187.21 * particular file as subject to the "Classpath" exception as provided
187.22 - * by Sun in the GPL Version 2 section of the License file that
187.23 + * by Oracle in the GPL Version 2 section of the License file that
187.24 * accompanied this code. If applicable, add the following below the
187.25 * License Header, with the fields enclosed by brackets [] replaced by
187.26 * your own identifying information:
188.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeConnection.java Mon May 17 14:11:51 2010 -0400
188.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeConnection.java Mon May 17 14:19:35 2010 -0400
188.3 @@ -1,7 +1,10 @@
188.4 /*
188.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
188.6 *
188.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
188.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
188.9 + *
188.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
188.11 + * Other names may be trademarks of their respective owners.
188.12 *
188.13 * The contents of this file are subject to the terms of either the GNU
188.14 * General Public License Version 2 only ("GPL") or the Common
188.15 @@ -13,9 +16,9 @@
188.16 * specific language governing permissions and limitations under the
188.17 * License. When distributing the software, include this License Header
188.18 * Notice in each file and include the License file at
188.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
188.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
188.21 * particular file as subject to the "Classpath" exception as provided
188.22 - * by Sun in the GPL Version 2 section of the License file that
188.23 + * by Oracle in the GPL Version 2 section of the License file that
188.24 * accompanied this code. If applicable, add the following below the
188.25 * License Header, with the fields enclosed by brackets [] replaced by
188.26 * your own identifying information:
189.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSource.java Mon May 17 14:11:51 2010 -0400
189.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSource.java Mon May 17 14:19:35 2010 -0400
189.3 @@ -1,7 +1,10 @@
189.4 /*
189.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
189.6 *
189.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
189.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
189.9 + *
189.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
189.11 + * Other names may be trademarks of their respective owners.
189.12 *
189.13 * The contents of this file are subject to the terms of either the GNU
189.14 * General Public License Version 2 only ("GPL") or the Common
189.15 @@ -13,9 +16,9 @@
189.16 * specific language governing permissions and limitations under the
189.17 * License. When distributing the software, include this License Header
189.18 * Notice in each file and include the License file at
189.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
189.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
189.21 * particular file as subject to the "Classpath" exception as provided
189.22 - * by Sun in the GPL Version 2 section of the License file that
189.23 + * by Oracle in the GPL Version 2 section of the License file that
189.24 * accompanied this code. If applicable, add the following below the
189.25 * License Header, with the fields enclosed by brackets [] replaced by
189.26 * your own identifying information:
190.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceAlias.java Mon May 17 14:11:51 2010 -0400
190.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceAlias.java Mon May 17 14:19:35 2010 -0400
190.3 @@ -1,7 +1,10 @@
190.4 /*
190.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
190.6 *
190.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
190.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
190.9 + *
190.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
190.11 + * Other names may be trademarks of their respective owners.
190.12 *
190.13 * The contents of this file are subject to the terms of either the GNU
190.14 * General Public License Version 2 only ("GPL") or the Common
190.15 @@ -13,9 +16,9 @@
190.16 * specific language governing permissions and limitations under the
190.17 * License. When distributing the software, include this License Header
190.18 * Notice in each file and include the License file at
190.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
190.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
190.21 * particular file as subject to the "Classpath" exception as provided
190.22 - * by Sun in the GPL Version 2 section of the License file that
190.23 + * by Oracle in the GPL Version 2 section of the License file that
190.24 * accompanied this code. If applicable, add the following below the
190.25 * License Header, with the fields enclosed by brackets [] replaced by
190.26 * your own identifying information:
191.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java Mon May 17 14:11:51 2010 -0400
191.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java Mon May 17 14:19:35 2010 -0400
191.3 @@ -1,7 +1,10 @@
191.4 /*
191.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
191.6 *
191.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
191.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
191.9 + *
191.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
191.11 + * Other names may be trademarks of their respective owners.
191.12 *
191.13 * The contents of this file are subject to the terms of either the GNU
191.14 * General Public License Version 2 only ("GPL") or the Common
191.15 @@ -13,9 +16,9 @@
191.16 * specific language governing permissions and limitations under the
191.17 * License. When distributing the software, include this License Header
191.18 * Notice in each file and include the License file at
191.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
191.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
191.21 * particular file as subject to the "Classpath" exception as provided
191.22 - * by Sun in the GPL Version 2 section of the License file that
191.23 + * by Oracle in the GPL Version 2 section of the License file that
191.24 * accompanied this code. If applicable, add the following below the
191.25 * License Header, with the fields enclosed by brackets [] replaced by
191.26 * your own identifying information:
192.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/Log.java Mon May 17 14:11:51 2010 -0400
192.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/Log.java Mon May 17 14:19:35 2010 -0400
192.3 @@ -1,7 +1,10 @@
192.4 /*
192.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
192.6 *
192.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
192.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
192.9 + *
192.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
192.11 + * Other names may be trademarks of their respective owners.
192.12 *
192.13 * The contents of this file are subject to the terms of either the GNU
192.14 * General Public License Version 2 only ("GPL") or the Common
192.15 @@ -13,9 +16,9 @@
192.16 * specific language governing permissions and limitations under the
192.17 * License. When distributing the software, include this License Header
192.18 * Notice in each file and include the License file at
192.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
192.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
192.21 * particular file as subject to the "Classpath" exception as provided
192.22 - * by Sun in the GPL Version 2 section of the License file that
192.23 + * by Oracle in the GPL Version 2 section of the License file that
192.24 * accompanied this code. If applicable, add the following below the
192.25 * License Header, with the fields enclosed by brackets [] replaced by
192.26 * your own identifying information:
193.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ProcedureColumnMetaData.java Mon May 17 14:11:51 2010 -0400
193.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ProcedureColumnMetaData.java Mon May 17 14:19:35 2010 -0400
193.3 @@ -1,7 +1,10 @@
193.4 /*
193.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
193.6 *
193.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
193.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
193.9 + *
193.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
193.11 + * Other names may be trademarks of their respective owners.
193.12 *
193.13 * The contents of this file are subject to the terms of either the GNU
193.14 * General Public License Version 2 only ("GPL") or the Common
193.15 @@ -13,9 +16,9 @@
193.16 * specific language governing permissions and limitations under the
193.17 * License. When distributing the software, include this License Header
193.18 * Notice in each file and include the License file at
193.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
193.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
193.21 * particular file as subject to the "Classpath" exception as provided
193.22 - * by Sun in the GPL Version 2 section of the License file that
193.23 + * by Oracle in the GPL Version 2 section of the License file that
193.24 * accompanied this code. If applicable, add the following below the
193.25 * License Header, with the fields enclosed by brackets [] replaced by
193.26 * your own identifying information:
194.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ProcedureMetaData.java Mon May 17 14:11:51 2010 -0400
194.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ProcedureMetaData.java Mon May 17 14:19:35 2010 -0400
194.3 @@ -1,7 +1,10 @@
194.4 /*
194.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
194.6 *
194.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
194.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
194.9 + *
194.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
194.11 + * Other names may be trademarks of their respective owners.
194.12 *
194.13 * The contents of this file are subject to the terms of either the GNU
194.14 * General Public License Version 2 only ("GPL") or the Common
194.15 @@ -13,9 +16,9 @@
194.16 * specific language governing permissions and limitations under the
194.17 * License. When distributing the software, include this License Header
194.18 * Notice in each file and include the License file at
194.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
194.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
194.21 * particular file as subject to the "Classpath" exception as provided
194.22 - * by Sun in the GPL Version 2 section of the License file that
194.23 + * by Oracle in the GPL Version 2 section of the License file that
194.24 * accompanied this code. If applicable, add the following below the
194.25 * License Header, with the fields enclosed by brackets [] replaced by
194.26 * your own identifying information:
195.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/TableMetaData.java Mon May 17 14:11:51 2010 -0400
195.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/TableMetaData.java Mon May 17 14:19:35 2010 -0400
195.3 @@ -1,7 +1,10 @@
195.4 /*
195.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
195.6 *
195.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
195.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
195.9 + *
195.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
195.11 + * Other names may be trademarks of their respective owners.
195.12 *
195.13 * The contents of this file are subject to the terms of either the GNU
195.14 * General Public License Version 2 only ("GPL") or the Common
195.15 @@ -13,9 +16,9 @@
195.16 * specific language governing permissions and limitations under the
195.17 * License. When distributing the software, include this License Header
195.18 * Notice in each file and include the License file at
195.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
195.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
195.21 * particular file as subject to the "Classpath" exception as provided
195.22 - * by Sun in the GPL Version 2 section of the License file that
195.23 + * by Oracle in the GPL Version 2 section of the License file that
195.24 * accompanied this code. If applicable, add the following below the
195.25 * License Header, with the fields enclosed by brackets [] replaced by
195.26 * your own identifying information:
196.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/Bundle.properties Mon May 17 14:11:51 2010 -0400
196.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/Bundle.properties Mon May 17 14:19:35 2010 -0400
196.3 @@ -1,6 +1,9 @@
196.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
196.5 #
196.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
196.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
196.8 +#
196.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
196.10 +# Other names may be trademarks of their respective owners.
196.11 #
196.12 # The contents of this file are subject to the terms of either the GNU
196.13 # General Public License Version 2 only ("GPL") or the Common
196.14 @@ -12,9 +15,9 @@
196.15 # specific language governing permissions and limitations under the
196.16 # License. When distributing the software, include this License Header
196.17 # Notice in each file and include the License file at
196.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
196.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
196.20 # particular file as subject to the "Classpath" exception as provided
196.21 -# by Sun in the GPL Version 2 section of the License file that
196.22 +# by Oracle in the GPL Version 2 section of the License file that
196.23 # accompanied this code. If applicable, add the following below the
196.24 # License Header, with the fields enclosed by brackets [] replaced by
196.25 # your own identifying information:
197.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/DataSourceNamePanel.java Mon May 17 14:11:51 2010 -0400
197.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/DataSourceNamePanel.java Mon May 17 14:19:35 2010 -0400
197.3 @@ -1,7 +1,10 @@
197.4 /*
197.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
197.6 *
197.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
197.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
197.9 + *
197.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
197.11 + * Other names may be trademarks of their respective owners.
197.12 *
197.13 * The contents of this file are subject to the terms of either the GNU
197.14 * General Public License Version 2 only ("GPL") or the Common
197.15 @@ -13,9 +16,9 @@
197.16 * specific language governing permissions and limitations under the
197.17 * License. When distributing the software, include this License Header
197.18 * Notice in each file and include the License file at
197.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
197.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
197.21 * particular file as subject to the "Classpath" exception as provided
197.22 - * by Sun in the GPL Version 2 section of the License file that
197.23 + * by Oracle in the GPL Version 2 section of the License file that
197.24 * accompanied this code. If applicable, add the following below the
197.25 * License Header, with the fields enclosed by brackets [] replaced by
197.26 * your own identifying information:
198.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/DatasourceUISettings.java Mon May 17 14:11:51 2010 -0400
198.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/DatasourceUISettings.java Mon May 17 14:19:35 2010 -0400
198.3 @@ -1,7 +1,10 @@
198.4 /*
198.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
198.6 *
198.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
198.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
198.9 + *
198.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
198.11 + * Other names may be trademarks of their respective owners.
198.12 *
198.13 * The contents of this file are subject to the terms of either the GNU
198.14 * General Public License Version 2 only ("GPL") or the Common
198.15 @@ -13,9 +16,9 @@
198.16 * specific language governing permissions and limitations under the
198.17 * License. When distributing the software, include this License Header
198.18 * Notice in each file and include the License file at
198.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
198.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
198.21 * particular file as subject to the "Classpath" exception as provided
198.22 - * by Sun in the GPL Version 2 section of the License file that
198.23 + * by Oracle in the GPL Version 2 section of the License file that
198.24 * accompanied this code. If applicable, add the following below the
198.25 * License Header, with the fields enclosed by brackets [] replaced by
198.26 * your own identifying information:
199.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/MissingConnectionsAlertPanel.java Mon May 17 14:11:51 2010 -0400
199.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/MissingConnectionsAlertPanel.java Mon May 17 14:19:35 2010 -0400
199.3 @@ -1,7 +1,10 @@
199.4 /*
199.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
199.6 *
199.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
199.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
199.9 + *
199.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
199.11 + * Other names may be trademarks of their respective owners.
199.12 *
199.13 * The contents of this file are subject to the terms of either the GNU
199.14 * General Public License Version 2 only ("GPL") or the Common
199.15 @@ -13,9 +16,9 @@
199.16 * specific language governing permissions and limitations under the
199.17 * License. When distributing the software, include this License Header
199.18 * Notice in each file and include the License file at
199.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
199.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
199.21 * particular file as subject to the "Classpath" exception as provided
199.22 - * by Sun in the GPL Version 2 section of the License file that
199.23 + * by Oracle in the GPL Version 2 section of the License file that
199.24 * accompanied this code. If applicable, add the following below the
199.25 * License Header, with the fields enclosed by brackets [] replaced by
199.26 * your own identifying information:
200.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/Bundle.properties Mon May 17 14:11:51 2010 -0400
200.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/Bundle.properties Mon May 17 14:19:35 2010 -0400
200.3 @@ -1,6 +1,9 @@
200.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
200.5 #
200.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
200.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
200.8 +#
200.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
200.10 +# Other names may be trademarks of their respective owners.
200.11 #
200.12 # The contents of this file are subject to the terms of either the GNU
200.13 # General Public License Version 2 only ("GPL") or the Common
200.14 @@ -12,9 +15,9 @@
200.15 # specific language governing permissions and limitations under the
200.16 # License. When distributing the software, include this License Header
200.17 # Notice in each file and include the License file at
200.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
200.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
200.20 # particular file as subject to the "Classpath" exception as provided
200.21 -# by Sun in the GPL Version 2 section of the License file that
200.22 +# by Oracle in the GPL Version 2 section of the License file that
200.23 # accompanied this code. If applicable, add the following below the
200.24 # License Header, with the fields enclosed by brackets [] replaced by
200.25 # your own identifying information:
201.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/DriverListUtil.java Mon May 17 14:11:51 2010 -0400
201.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/DriverListUtil.java Mon May 17 14:19:35 2010 -0400
201.3 @@ -1,7 +1,10 @@
201.4 /*
201.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
201.6 *
201.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
201.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
201.9 + *
201.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
201.11 + * Other names may be trademarks of their respective owners.
201.12 *
201.13 * The contents of this file are subject to the terms of either the GNU
201.14 * General Public License Version 2 only ("GPL") or the Common
201.15 @@ -13,9 +16,9 @@
201.16 * specific language governing permissions and limitations under the
201.17 * License. When distributing the software, include this License Header
201.18 * Notice in each file and include the License file at
201.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
201.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
201.21 * particular file as subject to the "Classpath" exception as provided
201.22 - * by Sun in the GPL Version 2 section of the License file that
201.23 + * by Oracle in the GPL Version 2 section of the License file that
201.24 * accompanied this code. If applicable, add the following below the
201.25 * License Header, with the fields enclosed by brackets [] replaced by
201.26 * your own identifying information:
202.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/ImportDataSource.java Mon May 17 14:11:51 2010 -0400
202.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/ImportDataSource.java Mon May 17 14:19:35 2010 -0400
202.3 @@ -1,7 +1,10 @@
202.4 /*
202.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
202.6 *
202.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
202.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
202.9 + *
202.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
202.11 + * Other names may be trademarks of their respective owners.
202.12 *
202.13 * The contents of this file are subject to the terms of either the GNU
202.14 * General Public License Version 2 only ("GPL") or the Common
202.15 @@ -13,9 +16,9 @@
202.16 * specific language governing permissions and limitations under the
202.17 * License. When distributing the software, include this License Header
202.18 * Notice in each file and include the License file at
202.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
202.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
202.21 * particular file as subject to the "Classpath" exception as provided
202.22 - * by Sun in the GPL Version 2 section of the License file that
202.23 + * by Oracle in the GPL Version 2 section of the License file that
202.24 * accompanied this code. If applicable, add the following below the
202.25 * License Header, with the fields enclosed by brackets [] replaced by
202.26 * your own identifying information:
203.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/SampleDatabaseCreator.java Mon May 17 14:11:51 2010 -0400
203.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/SampleDatabaseCreator.java Mon May 17 14:19:35 2010 -0400
203.3 @@ -1,7 +1,10 @@
203.4 /*
203.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
203.6 *
203.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
203.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
203.9 + *
203.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
203.11 + * Other names may be trademarks of their respective owners.
203.12 *
203.13 * The contents of this file are subject to the terms of either the GNU
203.14 * General Public License Version 2 only ("GPL") or the Common
203.15 @@ -13,9 +16,9 @@
203.16 * specific language governing permissions and limitations under the
203.17 * License. When distributing the software, include this License Header
203.18 * Notice in each file and include the License file at
203.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
203.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
203.21 * particular file as subject to the "Classpath" exception as provided
203.22 - * by Sun in the GPL Version 2 section of the License file that
203.23 + * by Oracle in the GPL Version 2 section of the License file that
203.24 * accompanied this code. If applicable, add the following below the
203.25 * License Header, with the fields enclosed by brackets [] replaced by
203.26 * your own identifying information:
204.1 --- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/DatasourceBeanCreateInfoSetTest.java Mon May 17 14:11:51 2010 -0400
204.2 +++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/DatasourceBeanCreateInfoSetTest.java Mon May 17 14:19:35 2010 -0400
204.3 @@ -1,8 +1,11 @@
204.4 /*
204.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
204.6 - *
204.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
204.8 - *
204.9 + *
204.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
204.11 + *
204.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
204.13 + * Other names may be trademarks of their respective owners.
204.14 + *
204.15 * The contents of this file are subject to the terms of either the GNU
204.16 * General Public License Version 2 only ("GPL") or the Common
204.17 * Development and Distribution License("CDDL") (collectively, the
204.18 @@ -13,9 +16,9 @@
204.19 * specific language governing permissions and limitations under the
204.20 * License. When distributing the software, include this License Header
204.21 * Notice in each file and include the License file at
204.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
204.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
204.24 * particular file as subject to the "Classpath" exception as provided
204.25 - * by Sun in the GPL Version 2 section of the License file that
204.26 + * by Oracle in the GPL Version 2 section of the License file that
204.27 * accompanied this code. If applicable, add the following below the
204.28 * License Header, with the fields enclosed by brackets [] replaced by
204.29 * your own identifying information:
205.1 --- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/MockOpenProjectsTrampoline.java Mon May 17 14:11:51 2010 -0400
205.2 +++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/MockOpenProjectsTrampoline.java Mon May 17 14:19:35 2010 -0400
205.3 @@ -1,7 +1,10 @@
205.4 /*
205.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
205.6 *
205.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
205.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
205.9 + *
205.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
205.11 + * Other names may be trademarks of their respective owners.
205.12 *
205.13 * The contents of this file are subject to the terms of either the GNU
205.14 * General Public License Version 2 only ("GPL") or the Common
205.15 @@ -13,9 +16,9 @@
205.16 * specific language governing permissions and limitations under the
205.17 * License. When distributing the software, include this License Header
205.18 * Notice in each file and include the License file at
205.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
205.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
205.21 * particular file as subject to the "Classpath" exception as provided
205.22 - * by Sun in the GPL Version 2 section of the License file that
205.23 + * by Oracle in the GPL Version 2 section of the License file that
205.24 * accompanied this code. If applicable, add the following below the
205.25 * License Header, with the fields enclosed by brackets [] replaced by
205.26 * your own identifying information:
206.1 --- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java Mon May 17 14:11:51 2010 -0400
206.2 +++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java Mon May 17 14:19:35 2010 -0400
206.3 @@ -1,8 +1,11 @@
206.4 /*
206.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
206.6 - *
206.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
206.8 - *
206.9 + *
206.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
206.11 + *
206.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
206.13 + * Other names may be trademarks of their respective owners.
206.14 + *
206.15 * The contents of this file are subject to the terms of either the GNU
206.16 * General Public License Version 2 only ("GPL") or the Common
206.17 * Development and Distribution License("CDDL") (collectively, the
206.18 @@ -13,9 +16,9 @@
206.19 * specific language governing permissions and limitations under the
206.20 * License. When distributing the software, include this License Header
206.21 * Notice in each file and include the License file at
206.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
206.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
206.24 * particular file as subject to the "Classpath" exception as provided
206.25 - * by Sun in the GPL Version 2 section of the License file that
206.26 + * by Oracle in the GPL Version 2 section of the License file that
206.27 * accompanied this code. If applicable, add the following below the
206.28 * License Header, with the fields enclosed by brackets [] replaced by
206.29 * your own identifying information:
207.1 --- a/visualweb.dataprovider.designtime/build.xml Mon May 17 14:11:51 2010 -0400
207.2 +++ b/visualweb.dataprovider.designtime/build.xml Mon May 17 14:19:35 2010 -0400
207.3 @@ -2,7 +2,10 @@
207.4 <!--
207.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
207.6
207.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
207.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
207.9 +
207.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
207.11 +Other names may be trademarks of their respective owners.
207.12
207.13
207.14 The contents of this file are subject to the terms of either the GNU
207.15 @@ -15,9 +18,9 @@
207.16 specific language governing permissions and limitations under the
207.17 License. When distributing the software, include this License Header
207.18 Notice in each file and include the License file at
207.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
207.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
207.21 particular file as subject to the "Classpath" exception as provided
207.22 -by Sun in the GPL Version 2 section of the License file that
207.23 +by Oracle in the GPL Version 2 section of the License file that
207.24 accompanied this code. If applicable, add the following below the
207.25 License Header, with the fields enclosed by brackets [] replaced by
207.26 your own identifying information:
208.1 --- a/visualweb.dataprovider.designtime/nbproject/project.properties Mon May 17 14:11:51 2010 -0400
208.2 +++ b/visualweb.dataprovider.designtime/nbproject/project.properties Mon May 17 14:19:35 2010 -0400
208.3 @@ -1,6 +1,9 @@
208.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
208.5 #
208.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
208.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
208.8 +#
208.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
208.10 +# Other names may be trademarks of their respective owners.
208.11 #
208.12 # The contents of this file are subject to the terms of either the GNU
208.13 # General Public License Version 2 only ("GPL") or the Common
208.14 @@ -12,9 +15,9 @@
208.15 # specific language governing permissions and limitations under the
208.16 # License. When distributing the software, include this License Header
208.17 # Notice in each file and include the License file at
208.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
208.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
208.20 # particular file as subject to the "Classpath" exception as provided
208.21 -# by Sun in the GPL Version 2 section of the License file that
208.22 +# by Oracle in the GPL Version 2 section of the License file that
208.23 # accompanied this code. If applicable, add the following below the
208.24 # License Header, with the fields enclosed by brackets [] replaced by
208.25 # your own identifying information:
209.1 --- a/visualweb.dataprovider.designtime/nbproject/project.xml Mon May 17 14:11:51 2010 -0400
209.2 +++ b/visualweb.dataprovider.designtime/nbproject/project.xml Mon May 17 14:19:35 2010 -0400
209.3 @@ -2,7 +2,10 @@
209.4 <!--
209.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
209.6
209.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
209.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
209.9 +
209.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
209.11 +Other names may be trademarks of their respective owners.
209.12
209.13
209.14 The contents of this file are subject to the terms of either the GNU
209.15 @@ -15,9 +18,9 @@
209.16 specific language governing permissions and limitations under the
209.17 License. When distributing the software, include this License Header
209.18 Notice in each file and include the License file at
209.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
209.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
209.21 particular file as subject to the "Classpath" exception as provided
209.22 -by Sun in the GPL Version 2 section of the License file that
209.23 +by Oracle in the GPL Version 2 section of the License file that
209.24 accompanied this code. If applicable, add the following below the
209.25 License Header, with the fields enclosed by brackets [] replaced by
209.26 your own identifying information:
210.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/AbstractDesignInfo.java Mon May 17 14:11:51 2010 -0400
210.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/AbstractDesignInfo.java Mon May 17 14:19:35 2010 -0400
210.3 @@ -1,7 +1,10 @@
210.4 /*
210.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
210.6 *
210.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
210.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
210.9 + *
210.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
210.11 + * Other names may be trademarks of their respective owners.
210.12 *
210.13 * The contents of this file are subject to the terms of either the GNU
210.14 * General Public License Version 2 only ("GPL") or the Common
210.15 @@ -13,9 +16,9 @@
210.16 * specific language governing permissions and limitations under the
210.17 * License. When distributing the software, include this License Header
210.18 * Notice in each file and include the License file at
210.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
210.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
210.21 * particular file as subject to the "Classpath" exception as provided
210.22 - * by Sun in the GPL Version 2 section of the License file that
210.23 + * by Oracle in the GPL Version 2 section of the License file that
210.24 * accompanied this code. If applicable, add the following below the
210.25 * License Header, with the fields enclosed by brackets [] replaced by
210.26 * your own identifying information:
211.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/BeanInfoSupport.java Mon May 17 14:11:51 2010 -0400
211.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/BeanInfoSupport.java Mon May 17 14:19:35 2010 -0400
211.3 @@ -1,7 +1,10 @@
211.4 /*
211.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
211.6 *
211.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
211.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
211.9 + *
211.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
211.11 + * Other names may be trademarks of their respective owners.
211.12 *
211.13 * The contents of this file are subject to the terms of either the GNU
211.14 * General Public License Version 2 only ("GPL") or the Common
211.15 @@ -13,9 +16,9 @@
211.16 * specific language governing permissions and limitations under the
211.17 * License. When distributing the software, include this License Header
211.18 * Notice in each file and include the License file at
211.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
211.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
211.21 * particular file as subject to the "Classpath" exception as provided
211.22 - * by Sun in the GPL Version 2 section of the License file that
211.23 + * by Oracle in the GPL Version 2 section of the License file that
211.24 * accompanied this code. If applicable, add the following below the
211.25 * License Header, with the fields enclosed by brackets [] replaced by
211.26 * your own identifying information:
212.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/Bundle.properties Mon May 17 14:11:51 2010 -0400
212.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/Bundle.properties Mon May 17 14:19:35 2010 -0400
212.3 @@ -1,6 +1,9 @@
212.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
212.5 #
212.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
212.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
212.8 +#
212.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
212.10 +# Other names may be trademarks of their respective owners.
212.11 #
212.12 # The contents of this file are subject to the terms of either the GNU
212.13 # General Public License Version 2 only ("GPL") or the Common
212.14 @@ -12,9 +15,9 @@
212.15 # specific language governing permissions and limitations under the
212.16 # License. When distributing the software, include this License Header
212.17 # Notice in each file and include the License file at
212.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
212.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
212.20 # particular file as subject to the "Classpath" exception as provided
212.21 -# by Sun in the GPL Version 2 section of the License file that
212.22 +# by Oracle in the GPL Version 2 section of the License file that
212.23 # accompanied this code. If applicable, add the following below the
212.24 # License Header, with the fields enclosed by brackets [] replaced by
212.25 # your own identifying information:
213.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/Install.java Mon May 17 14:11:51 2010 -0400
213.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/Install.java Mon May 17 14:19:35 2010 -0400
213.3 @@ -1,7 +1,10 @@
213.4 /*
213.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
213.6 *
213.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
213.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
213.9 + *
213.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
213.11 + * Other names may be trademarks of their respective owners.
213.12 *
213.13 * The contents of this file are subject to the terms of either the GNU
213.14 * General Public License Version 2 only ("GPL") or the Common
213.15 @@ -13,9 +16,9 @@
213.16 * specific language governing permissions and limitations under the
213.17 * License. When distributing the software, include this License Header
213.18 * Notice in each file and include the License file at
213.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
213.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
213.21 * particular file as subject to the "Classpath" exception as provided
213.22 - * by Sun in the GPL Version 2 section of the License file that
213.23 + * by Oracle in the GPL Version 2 section of the License file that
213.24 * accompanied this code. If applicable, add the following below the
213.25 * License Header, with the fields enclosed by brackets [] replaced by
213.26 * your own identifying information:
214.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/Bundle.properties Mon May 17 14:11:51 2010 -0400
214.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/Bundle.properties Mon May 17 14:19:35 2010 -0400
214.3 @@ -1,6 +1,9 @@
214.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
214.5 #
214.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
214.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
214.8 +#
214.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
214.10 +# Other names may be trademarks of their respective owners.
214.11 #
214.12 # The contents of this file are subject to the terms of either the GNU
214.13 # General Public License Version 2 only ("GPL") or the Common
214.14 @@ -12,9 +15,9 @@
214.15 # specific language governing permissions and limitations under the
214.16 # License. When distributing the software, include this License Header
214.17 # Notice in each file and include the License file at
214.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
214.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
214.20 # particular file as subject to the "Classpath" exception as provided
214.21 -# by Sun in the GPL Version 2 section of the License file that
214.22 +# by Oracle in the GPL Version 2 section of the License file that
214.23 # accompanied this code. If applicable, add the following below the
214.24 # License Header, with the fields enclosed by brackets [] replaced by
214.25 # your own identifying information:
215.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseDeleteRow.xml Mon May 17 14:11:51 2010 -0400
215.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseDeleteRow.xml Mon May 17 14:19:35 2010 -0400
215.3 @@ -2,7 +2,10 @@
215.4 <!--
215.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
215.6
215.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
215.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
215.9 +
215.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
215.11 +Other names may be trademarks of their respective owners.
215.12
215.13
215.14 The contents of this file are subject to the terms of either the GNU
215.15 @@ -15,9 +18,9 @@
215.16 specific language governing permissions and limitations under the
215.17 License. When distributing the software, include this License Header
215.18 Notice in each file and include the License file at
215.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
215.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
215.21 particular file as subject to the "Classpath" exception as provided
215.22 -by Sun in the GPL Version 2 section of the License file that
215.23 +by Oracle in the GPL Version 2 section of the License file that
215.24 accompanied this code. If applicable, add the following below the
215.25 License Header, with the fields enclosed by brackets [] replaced by
215.26 your own identifying information:
216.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseFirst.xml Mon May 17 14:11:51 2010 -0400
216.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseFirst.xml Mon May 17 14:19:35 2010 -0400
216.3 @@ -2,7 +2,10 @@
216.4 <!--
216.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
216.6
216.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
216.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
216.9 +
216.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
216.11 +Other names may be trademarks of their respective owners.
216.12
216.13
216.14 The contents of this file are subject to the terms of either the GNU
216.15 @@ -15,9 +18,9 @@
216.16 specific language governing permissions and limitations under the
216.17 License. When distributing the software, include this License Header
216.18 Notice in each file and include the License file at
216.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
216.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
216.21 particular file as subject to the "Classpath" exception as provided
216.22 -by Sun in the GPL Version 2 section of the License file that
216.23 +by Oracle in the GPL Version 2 section of the License file that
216.24 accompanied this code. If applicable, add the following below the
216.25 License Header, with the fields enclosed by brackets [] replaced by
216.26 your own identifying information:
217.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseInsertRow.xml Mon May 17 14:11:51 2010 -0400
217.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseInsertRow.xml Mon May 17 14:19:35 2010 -0400
217.3 @@ -2,7 +2,10 @@
217.4 <!--
217.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
217.6
217.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
217.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
217.9 +
217.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
217.11 +Other names may be trademarks of their respective owners.
217.12
217.13
217.14 The contents of this file are subject to the terms of either the GNU
217.15 @@ -15,9 +18,9 @@
217.16 specific language governing permissions and limitations under the
217.17 License. When distributing the software, include this License Header
217.18 Notice in each file and include the License file at
217.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
217.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
217.21 particular file as subject to the "Classpath" exception as provided
217.22 -by Sun in the GPL Version 2 section of the License file that
217.23 +by Oracle in the GPL Version 2 section of the License file that
217.24 accompanied this code. If applicable, add the following below the
217.25 License Header, with the fields enclosed by brackets [] replaced by
217.26 your own identifying information:
218.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseLast.xml Mon May 17 14:11:51 2010 -0400
218.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseLast.xml Mon May 17 14:19:35 2010 -0400
218.3 @@ -2,7 +2,10 @@
218.4 <!--
218.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
218.6
218.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
218.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
218.9 +
218.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
218.11 +Other names may be trademarks of their respective owners.
218.12
218.13
218.14 The contents of this file are subject to the terms of either the GNU
218.15 @@ -15,9 +18,9 @@
218.16 specific language governing permissions and limitations under the
218.17 License. When distributing the software, include this License Header
218.18 Notice in each file and include the License file at
218.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
218.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
218.21 particular file as subject to the "Classpath" exception as provided
218.22 -by Sun in the GPL Version 2 section of the License file that
218.23 +by Oracle in the GPL Version 2 section of the License file that
218.24 accompanied this code. If applicable, add the following below the
218.25 License Header, with the fields enclosed by brackets [] replaced by
218.26 your own identifying information:
219.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseNext.xml Mon May 17 14:11:51 2010 -0400
219.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseNext.xml Mon May 17 14:19:35 2010 -0400
219.3 @@ -2,7 +2,10 @@
219.4 <!--
219.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
219.6
219.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
219.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
219.9 +
219.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
219.11 +Other names may be trademarks of their respective owners.
219.12
219.13
219.14 The contents of this file are subject to the terms of either the GNU
219.15 @@ -15,9 +18,9 @@
219.16 specific language governing permissions and limitations under the
219.17 License. When distributing the software, include this License Header
219.18 Notice in each file and include the License file at
219.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
219.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
219.21 particular file as subject to the "Classpath" exception as provided
219.22 -by Sun in the GPL Version 2 section of the License file that
219.23 +by Oracle in the GPL Version 2 section of the License file that
219.24 accompanied this code. If applicable, add the following below the
219.25 License Header, with the fields enclosed by brackets [] replaced by
219.26 your own identifying information:
220.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabasePrevious.xml Mon May 17 14:11:51 2010 -0400
220.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabasePrevious.xml Mon May 17 14:19:35 2010 -0400
220.3 @@ -2,7 +2,10 @@
220.4 <!--
220.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
220.6
220.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
220.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
220.9 +
220.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
220.11 +Other names may be trademarks of their respective owners.
220.12
220.13
220.14 The contents of this file are subject to the terms of either the GNU
220.15 @@ -15,9 +18,9 @@
220.16 specific language governing permissions and limitations under the
220.17 License. When distributing the software, include this License Header
220.18 Notice in each file and include the License file at
220.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
220.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
220.21 particular file as subject to the "Classpath" exception as provided
220.22 -by Sun in the GPL Version 2 section of the License file that
220.23 +by Oracle in the GPL Version 2 section of the License file that
220.24 accompanied this code. If applicable, add the following below the
220.25 License Header, with the fields enclosed by brackets [] replaced by
220.26 your own identifying information:
221.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseUpdate.xml Mon May 17 14:11:51 2010 -0400
221.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseUpdate.xml Mon May 17 14:19:35 2010 -0400
221.3 @@ -2,7 +2,10 @@
221.4 <!--
221.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
221.6
221.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
221.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
221.9 +
221.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
221.11 +Other names may be trademarks of their respective owners.
221.12
221.13
221.14 The contents of this file are subject to the terms of either the GNU
221.15 @@ -15,9 +18,9 @@
221.16 specific language governing permissions and limitations under the
221.17 License. When distributing the software, include this License Header
221.18 Notice in each file and include the License file at
221.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
221.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
221.21 particular file as subject to the "Classpath" exception as provided
221.22 -by Sun in the GPL Version 2 section of the License file that
221.23 +by Oracle in the GPL Version 2 section of the License file that
221.24 accompanied this code. If applicable, add the following below the
221.25 License Header, with the fields enclosed by brackets [] replaced by
221.26 your own identifying information:
222.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/PrimaryKeyMethod.xml Mon May 17 14:11:51 2010 -0400
222.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/PrimaryKeyMethod.xml Mon May 17 14:19:35 2010 -0400
222.3 @@ -2,7 +2,10 @@
222.4 <!--
222.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
222.6
222.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
222.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
222.9 +
222.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
222.11 +Other names may be trademarks of their respective owners.
222.12
222.13
222.14 The contents of this file are subject to the terms of either the GNU
222.15 @@ -15,9 +18,9 @@
222.16 specific language governing permissions and limitations under the
222.17 License. When distributing the software, include this License Header
222.18 Notice in each file and include the License file at
222.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
222.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
222.21 particular file as subject to the "Classpath" exception as provided
222.22 -by Sun in the GPL Version 2 section of the License file that
222.23 +by Oracle in the GPL Version 2 section of the License file that
222.24 accompanied this code. If applicable, add the following below the
222.25 License Header, with the fields enclosed by brackets [] replaced by
222.26 your own identifying information:
223.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/SetValueFromDB.xml Mon May 17 14:11:51 2010 -0400
223.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/SetValueFromDB.xml Mon May 17 14:19:35 2010 -0400
223.3 @@ -2,7 +2,10 @@
223.4 <!--
223.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
223.6
223.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
223.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
223.9 +
223.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
223.11 +Other names may be trademarks of their respective owners.
223.12
223.13
223.14 The contents of this file are subject to the terms of either the GNU
223.15 @@ -15,9 +18,9 @@
223.16 specific language governing permissions and limitations under the
223.17 License. When distributing the software, include this License Header
223.18 Notice in each file and include the License file at
223.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
223.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
223.21 particular file as subject to the "Classpath" exception as provided
223.22 -by Sun in the GPL Version 2 section of the License file that
223.23 +by Oracle in the GPL Version 2 section of the License file that
223.24 accompanied this code. If applicable, add the following below the
223.25 License Header, with the fields enclosed by brackets [] replaced by
223.26 your own identifying information:
224.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataFilterBeanInfo.java Mon May 17 14:11:51 2010 -0400
224.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataFilterBeanInfo.java Mon May 17 14:19:35 2010 -0400
224.3 @@ -1,7 +1,10 @@
224.4 /*
224.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
224.6 *
224.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
224.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
224.9 + *
224.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
224.11 + * Other names may be trademarks of their respective owners.
224.12 *
224.13 * The contents of this file are subject to the terms of either the GNU
224.14 * General Public License Version 2 only ("GPL") or the Common
224.15 @@ -13,9 +16,9 @@
224.16 * specific language governing permissions and limitations under the
224.17 * License. When distributing the software, include this License Header
224.18 * Notice in each file and include the License file at
224.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
224.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
224.21 * particular file as subject to the "Classpath" exception as provided
224.22 - * by Sun in the GPL Version 2 section of the License file that
224.23 + * by Oracle in the GPL Version 2 section of the License file that
224.24 * accompanied this code. If applicable, add the following below the
224.25 * License Header, with the fields enclosed by brackets [] replaced by
224.26 * your own identifying information:
225.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataFilterBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
225.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataFilterBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
225.3 @@ -2,7 +2,10 @@
225.4 /*
225.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
225.6 *
225.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
225.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
225.9 + *
225.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
225.11 + * Other names may be trademarks of their respective owners.
225.12 *
225.13 * The contents of this file are subject to the terms of either the GNU
225.14 * General Public License Version 2 only ("GPL") or the Common
225.15 @@ -14,9 +17,9 @@
225.16 * specific language governing permissions and limitations under the
225.17 * License. When distributing the software, include this License Header
225.18 * Notice in each file and include the License file at
225.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
225.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
225.21 * particular file as subject to the "Classpath" exception as provided
225.22 - * by Sun in the GPL Version 2 section of the License file that
225.23 + * by Oracle in the GPL Version 2 section of the License file that
225.24 * accompanied this code. If applicable, add the following below the
225.25 * License Header, with the fields enclosed by brackets [] replaced by
225.26 * your own identifying information:
226.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataSorterBeanInfo.java Mon May 17 14:11:51 2010 -0400
226.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataSorterBeanInfo.java Mon May 17 14:19:35 2010 -0400
226.3 @@ -1,7 +1,10 @@
226.4 /*
226.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
226.6 *
226.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
226.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
226.9 + *
226.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
226.11 + * Other names may be trademarks of their respective owners.
226.12 *
226.13 * The contents of this file are subject to the terms of either the GNU
226.14 * General Public License Version 2 only ("GPL") or the Common
226.15 @@ -13,9 +16,9 @@
226.16 * specific language governing permissions and limitations under the
226.17 * License. When distributing the software, include this License Header
226.18 * Notice in each file and include the License file at
226.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
226.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
226.21 * particular file as subject to the "Classpath" exception as provided
226.22 - * by Sun in the GPL Version 2 section of the License file that
226.23 + * by Oracle in the GPL Version 2 section of the License file that
226.24 * accompanied this code. If applicable, add the following below the
226.25 * License Header, with the fields enclosed by brackets [] replaced by
226.26 * your own identifying information:
227.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataSorterBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
227.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataSorterBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
227.3 @@ -2,7 +2,10 @@
227.4 /*
227.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
227.6 *
227.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
227.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
227.9 + *
227.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
227.11 + * Other names may be trademarks of their respective owners.
227.12 *
227.13 * The contents of this file are subject to the terms of either the GNU
227.14 * General Public License Version 2 only ("GPL") or the Common
227.15 @@ -14,9 +17,9 @@
227.16 * specific language governing permissions and limitations under the
227.17 * License. When distributing the software, include this License Header
227.18 * Notice in each file and include the License file at
227.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
227.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
227.21 * particular file as subject to the "Classpath" exception as provided
227.22 - * by Sun in the GPL Version 2 section of the License file that
227.23 + * by Oracle in the GPL Version 2 section of the License file that
227.24 * accompanied this code. If applicable, add the following below the
227.25 * License Header, with the fields enclosed by brackets [] replaced by
227.26 * your own identifying information:
228.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
228.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
228.3 @@ -1,7 +1,10 @@
228.4 /*
228.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
228.6 *
228.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
228.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
228.9 + *
228.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
228.11 + * Other names may be trademarks of their respective owners.
228.12 *
228.13 * The contents of this file are subject to the terms of either the GNU
228.14 * General Public License Version 2 only ("GPL") or the Common
228.15 @@ -13,9 +16,9 @@
228.16 * specific language governing permissions and limitations under the
228.17 * License. When distributing the software, include this License Header
228.18 * Notice in each file and include the License file at
228.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
228.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
228.21 * particular file as subject to the "Classpath" exception as provided
228.22 - * by Sun in the GPL Version 2 section of the License file that
228.23 + * by Oracle in the GPL Version 2 section of the License file that
228.24 * accompanied this code. If applicable, add the following below the
228.25 * License Header, with the fields enclosed by brackets [] replaced by
228.26 * your own identifying information:
229.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
229.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
229.3 @@ -2,7 +2,10 @@
229.4 /*
229.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
229.6 *
229.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
229.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
229.9 + *
229.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
229.11 + * Other names may be trademarks of their respective owners.
229.12 *
229.13 * The contents of this file are subject to the terms of either the GNU
229.14 * General Public License Version 2 only ("GPL") or the Common
229.15 @@ -14,9 +17,9 @@
229.16 * specific language governing permissions and limitations under the
229.17 * License. When distributing the software, include this License Header
229.18 * Notice in each file and include the License file at
229.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
229.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
229.21 * particular file as subject to the "Classpath" exception as provided
229.22 - * by Sun in the GPL Version 2 section of the License file that
229.23 + * by Oracle in the GPL Version 2 section of the License file that
229.24 * accompanied this code. If applicable, add the following below the
229.25 * License Header, with the fields enclosed by brackets [] replaced by
229.26 * your own identifying information:
230.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalTableDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
230.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalTableDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
230.3 @@ -1,7 +1,10 @@
230.4 /*
230.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
230.6 *
230.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
230.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
230.9 + *
230.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
230.11 + * Other names may be trademarks of their respective owners.
230.12 *
230.13 * The contents of this file are subject to the terms of either the GNU
230.14 * General Public License Version 2 only ("GPL") or the Common
230.15 @@ -13,9 +16,9 @@
230.16 * specific language governing permissions and limitations under the
230.17 * License. When distributing the software, include this License Header
230.18 * Notice in each file and include the License file at
230.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
230.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
230.21 * particular file as subject to the "Classpath" exception as provided
230.22 - * by Sun in the GPL Version 2 section of the License file that
230.23 + * by Oracle in the GPL Version 2 section of the License file that
230.24 * accompanied this code. If applicable, add the following below the
230.25 * License Header, with the fields enclosed by brackets [] replaced by
230.26 * your own identifying information:
231.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalTableDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
231.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalTableDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
231.3 @@ -2,7 +2,10 @@
231.4 /*
231.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
231.6 *
231.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
231.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
231.9 + *
231.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
231.11 + * Other names may be trademarks of their respective owners.
231.12 *
231.13 * The contents of this file are subject to the terms of either the GNU
231.14 * General Public License Version 2 only ("GPL") or the Common
231.15 @@ -14,9 +17,9 @@
231.16 * specific language governing permissions and limitations under the
231.17 * License. When distributing the software, include this License Header
231.18 * Notice in each file and include the License file at
231.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
231.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
231.21 * particular file as subject to the "Classpath" exception as provided
231.22 - * by Sun in the GPL Version 2 section of the License file that
231.23 + * by Oracle in the GPL Version 2 section of the License file that
231.24 * accompanied this code. If applicable, add the following below the
231.25 * License Header, with the fields enclosed by brackets [] replaced by
231.26 * your own identifying information:
232.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/Bundle-JSF.properties Mon May 17 14:11:51 2010 -0400
232.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/Bundle-JSF.properties Mon May 17 14:19:35 2010 -0400
232.3 @@ -1,6 +1,9 @@
232.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
232.5 #
232.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
232.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
232.8 +#
232.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
232.10 +# Other names may be trademarks of their respective owners.
232.11 #
232.12 # The contents of this file are subject to the terms of either the GNU
232.13 # General Public License Version 2 only ("GPL") or the Common
232.14 @@ -12,9 +15,9 @@
232.15 # specific language governing permissions and limitations under the
232.16 # License. When distributing the software, include this License Header
232.17 # Notice in each file and include the License file at
232.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
232.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
232.20 # particular file as subject to the "Classpath" exception as provided
232.21 -# by Sun in the GPL Version 2 section of the License file that
232.22 +# by Oracle in the GPL Version 2 section of the License file that
232.23 # accompanied this code. If applicable, add the following below the
232.24 # License Header, with the fields enclosed by brackets [] replaced by
232.25 # your own identifying information:
233.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CachedRowSetDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
233.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CachedRowSetDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
233.3 @@ -1,7 +1,10 @@
233.4 /*
233.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
233.6 *
233.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
233.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
233.9 + *
233.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
233.11 + * Other names may be trademarks of their respective owners.
233.12 *
233.13 * The contents of this file are subject to the terms of either the GNU
233.14 * General Public License Version 2 only ("GPL") or the Common
233.15 @@ -13,9 +16,9 @@
233.16 * specific language governing permissions and limitations under the
233.17 * License. When distributing the software, include this License Header
233.18 * Notice in each file and include the License file at
233.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
233.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
233.21 * particular file as subject to the "Classpath" exception as provided
233.22 - * by Sun in the GPL Version 2 section of the License file that
233.23 + * by Oracle in the GPL Version 2 section of the License file that
233.24 * accompanied this code. If applicable, add the following below the
233.25 * License Header, with the fields enclosed by brackets [] replaced by
233.26 * your own identifying information:
234.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CachedRowSetDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
234.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CachedRowSetDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
234.3 @@ -2,7 +2,10 @@
234.4 /*
234.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
234.6 *
234.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
234.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
234.9 + *
234.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
234.11 + * Other names may be trademarks of their respective owners.
234.12 *
234.13 * The contents of this file are subject to the terms of either the GNU
234.14 * General Public License Version 2 only ("GPL") or the Common
234.15 @@ -14,9 +17,9 @@
234.16 * specific language governing permissions and limitations under the
234.17 * License. When distributing the software, include this License Header
234.18 * Notice in each file and include the License file at
234.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
234.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
234.21 * particular file as subject to the "Classpath" exception as provided
234.22 - * by Sun in the GPL Version 2 section of the License file that
234.23 + * by Oracle in the GPL Version 2 section of the License file that
234.24 * accompanied this code. If applicable, add the following below the
234.25 * License Header, with the fields enclosed by brackets [] replaced by
234.26 * your own identifying information:
235.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CompareFilterCriteriaBeanInfo.java Mon May 17 14:11:51 2010 -0400
235.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CompareFilterCriteriaBeanInfo.java Mon May 17 14:19:35 2010 -0400
235.3 @@ -1,7 +1,10 @@
235.4 /*
235.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
235.6 *
235.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
235.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
235.9 + *
235.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
235.11 + * Other names may be trademarks of their respective owners.
235.12 *
235.13 * The contents of this file are subject to the terms of either the GNU
235.14 * General Public License Version 2 only ("GPL") or the Common
235.15 @@ -13,9 +16,9 @@
235.16 * specific language governing permissions and limitations under the
235.17 * License. When distributing the software, include this License Header
235.18 * Notice in each file and include the License file at
235.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
235.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
235.21 * particular file as subject to the "Classpath" exception as provided
235.22 - * by Sun in the GPL Version 2 section of the License file that
235.23 + * by Oracle in the GPL Version 2 section of the License file that
235.24 * accompanied this code. If applicable, add the following below the
235.25 * License Header, with the fields enclosed by brackets [] replaced by
235.26 * your own identifying information:
236.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CompareFilterCriteriaBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
236.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CompareFilterCriteriaBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
236.3 @@ -2,7 +2,10 @@
236.4 /*
236.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
236.6 *
236.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
236.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
236.9 + *
236.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
236.11 + * Other names may be trademarks of their respective owners.
236.12 *
236.13 * The contents of this file are subject to the terms of either the GNU
236.14 * General Public License Version 2 only ("GPL") or the Common
236.15 @@ -14,9 +17,9 @@
236.16 * specific language governing permissions and limitations under the
236.17 * License. When distributing the software, include this License Header
236.18 * Notice in each file and include the License file at
236.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
236.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
236.21 * particular file as subject to the "Classpath" exception as provided
236.22 - * by Sun in the GPL Version 2 section of the License file that
236.23 + * by Oracle in the GPL Version 2 section of the License file that
236.24 * accompanied this code. If applicable, add the following below the
236.25 * License Header, with the fields enclosed by brackets [] replaced by
236.26 * your own identifying information:
237.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldIdSortCriteriaBeanInfo.java Mon May 17 14:11:51 2010 -0400
237.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldIdSortCriteriaBeanInfo.java Mon May 17 14:19:35 2010 -0400
237.3 @@ -1,7 +1,10 @@
237.4 /*
237.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
237.6 *
237.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
237.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
237.9 + *
237.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
237.11 + * Other names may be trademarks of their respective owners.
237.12 *
237.13 * The contents of this file are subject to the terms of either the GNU
237.14 * General Public License Version 2 only ("GPL") or the Common
237.15 @@ -13,9 +16,9 @@
237.16 * specific language governing permissions and limitations under the
237.17 * License. When distributing the software, include this License Header
237.18 * Notice in each file and include the License file at
237.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
237.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
237.21 * particular file as subject to the "Classpath" exception as provided
237.22 - * by Sun in the GPL Version 2 section of the License file that
237.23 + * by Oracle in the GPL Version 2 section of the License file that
237.24 * accompanied this code. If applicable, add the following below the
237.25 * License Header, with the fields enclosed by brackets [] replaced by
237.26 * your own identifying information:
238.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldIdSortCriteriaBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
238.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldIdSortCriteriaBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
238.3 @@ -2,7 +2,10 @@
238.4 /*
238.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
238.6 *
238.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
238.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
238.9 + *
238.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
238.11 + * Other names may be trademarks of their respective owners.
238.12 *
238.13 * The contents of this file are subject to the terms of either the GNU
238.14 * General Public License Version 2 only ("GPL") or the Common
238.15 @@ -14,9 +17,9 @@
238.16 * specific language governing permissions and limitations under the
238.17 * License. When distributing the software, include this License Header
238.18 * Notice in each file and include the License file at
238.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
238.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
238.21 * particular file as subject to the "Classpath" exception as provided
238.22 - * by Sun in the GPL Version 2 section of the License file that
238.23 + * by Oracle in the GPL Version 2 section of the License file that
238.24 * accompanied this code. If applicable, add the following below the
238.25 * License Header, with the fields enclosed by brackets [] replaced by
238.26 * your own identifying information:
239.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldKeySortCriteriaBeanInfo.java Mon May 17 14:11:51 2010 -0400
239.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldKeySortCriteriaBeanInfo.java Mon May 17 14:19:35 2010 -0400
239.3 @@ -1,7 +1,10 @@
239.4 /*
239.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
239.6 *
239.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
239.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
239.9 + *
239.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
239.11 + * Other names may be trademarks of their respective owners.
239.12 *
239.13 * The contents of this file are subject to the terms of either the GNU
239.14 * General Public License Version 2 only ("GPL") or the Common
239.15 @@ -13,9 +16,9 @@
239.16 * specific language governing permissions and limitations under the
239.17 * License. When distributing the software, include this License Header
239.18 * Notice in each file and include the License file at
239.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
239.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
239.21 * particular file as subject to the "Classpath" exception as provided
239.22 - * by Sun in the GPL Version 2 section of the License file that
239.23 + * by Oracle in the GPL Version 2 section of the License file that
239.24 * accompanied this code. If applicable, add the following below the
239.25 * License Header, with the fields enclosed by brackets [] replaced by
239.26 * your own identifying information:
240.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldKeySortCriteriaBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
240.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldKeySortCriteriaBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
240.3 @@ -2,7 +2,10 @@
240.4 /*
240.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
240.6 *
240.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
240.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
240.9 + *
240.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
240.11 + * Other names may be trademarks of their respective owners.
240.12 *
240.13 * The contents of this file are subject to the terms of either the GNU
240.14 * General Public License Version 2 only ("GPL") or the Common
240.15 @@ -14,9 +17,9 @@
240.16 * specific language governing permissions and limitations under the
240.17 * License. When distributing the software, include this License Header
240.18 * Notice in each file and include the License file at
240.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
240.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
240.21 * particular file as subject to the "Classpath" exception as provided
240.22 - * by Sun in the GPL Version 2 section of the License file that
240.23 + * by Oracle in the GPL Version 2 section of the License file that
240.24 * accompanied this code. If applicable, add the following below the
240.25 * License Header, with the fields enclosed by brackets [] replaced by
240.26 * your own identifying information:
241.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FilteredTableDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
241.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FilteredTableDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
241.3 @@ -1,7 +1,10 @@
241.4 /*
241.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
241.6 *
241.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
241.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
241.9 + *
241.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
241.11 + * Other names may be trademarks of their respective owners.
241.12 *
241.13 * The contents of this file are subject to the terms of either the GNU
241.14 * General Public License Version 2 only ("GPL") or the Common
241.15 @@ -13,9 +16,9 @@
241.16 * specific language governing permissions and limitations under the
241.17 * License. When distributing the software, include this License Header
241.18 * Notice in each file and include the License file at
241.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
241.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
241.21 * particular file as subject to the "Classpath" exception as provided
241.22 - * by Sun in the GPL Version 2 section of the License file that
241.23 + * by Oracle in the GPL Version 2 section of the License file that
241.24 * accompanied this code. If applicable, add the following below the
241.25 * License Header, with the fields enclosed by brackets [] replaced by
241.26 * your own identifying information:
242.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FilteredTableDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
242.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FilteredTableDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
242.3 @@ -2,7 +2,10 @@
242.4 /*
242.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
242.6 *
242.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
242.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
242.9 + *
242.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
242.11 + * Other names may be trademarks of their respective owners.
242.12 *
242.13 * The contents of this file are subject to the terms of either the GNU
242.14 * General Public License Version 2 only ("GPL") or the Common
242.15 @@ -14,9 +17,9 @@
242.16 * specific language governing permissions and limitations under the
242.17 * License. When distributing the software, include this License Header
242.18 * Notice in each file and include the License file at
242.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
242.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
242.21 * particular file as subject to the "Classpath" exception as provided
242.22 - * by Sun in the GPL Version 2 section of the License file that
242.23 + * by Oracle in the GPL Version 2 section of the License file that
242.24 * accompanied this code. If applicable, add the following below the
242.25 * License Header, with the fields enclosed by brackets [] replaced by
242.26 * your own identifying information:
243.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ListDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
243.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ListDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
243.3 @@ -1,7 +1,10 @@
243.4 /*
243.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
243.6 *
243.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
243.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
243.9 + *
243.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
243.11 + * Other names may be trademarks of their respective owners.
243.12 *
243.13 * The contents of this file are subject to the terms of either the GNU
243.14 * General Public License Version 2 only ("GPL") or the Common
243.15 @@ -13,9 +16,9 @@
243.16 * specific language governing permissions and limitations under the
243.17 * License. When distributing the software, include this License Header
243.18 * Notice in each file and include the License file at
243.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
243.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
243.21 * particular file as subject to the "Classpath" exception as provided
243.22 - * by Sun in the GPL Version 2 section of the License file that
243.23 + * by Oracle in the GPL Version 2 section of the License file that
243.24 * accompanied this code. If applicable, add the following below the
243.25 * License Header, with the fields enclosed by brackets [] replaced by
243.26 * your own identifying information:
244.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ListDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
244.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ListDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
244.3 @@ -2,7 +2,10 @@
244.4 /*
244.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
244.6 *
244.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
244.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
244.9 + *
244.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
244.11 + * Other names may be trademarks of their respective owners.
244.12 *
244.13 * The contents of this file are subject to the terms of either the GNU
244.14 * General Public License Version 2 only ("GPL") or the Common
244.15 @@ -14,9 +17,9 @@
244.16 * specific language governing permissions and limitations under the
244.17 * License. When distributing the software, include this License Header
244.18 * Notice in each file and include the License file at
244.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
244.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
244.21 * particular file as subject to the "Classpath" exception as provided
244.22 - * by Sun in the GPL Version 2 section of the License file that
244.23 + * by Oracle in the GPL Version 2 section of the License file that
244.24 * accompanied this code. If applicable, add the following below the
244.25 * License Header, with the fields enclosed by brackets [] replaced by
244.26 * your own identifying information:
245.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MapDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
245.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MapDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
245.3 @@ -1,7 +1,10 @@
245.4 /*
245.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
245.6 *
245.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
245.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
245.9 + *
245.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
245.11 + * Other names may be trademarks of their respective owners.
245.12 *
245.13 * The contents of this file are subject to the terms of either the GNU
245.14 * General Public License Version 2 only ("GPL") or the Common
245.15 @@ -13,9 +16,9 @@
245.16 * specific language governing permissions and limitations under the
245.17 * License. When distributing the software, include this License Header
245.18 * Notice in each file and include the License file at
245.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
245.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
245.21 * particular file as subject to the "Classpath" exception as provided
245.22 - * by Sun in the GPL Version 2 section of the License file that
245.23 + * by Oracle in the GPL Version 2 section of the License file that
245.24 * accompanied this code. If applicable, add the following below the
245.25 * License Header, with the fields enclosed by brackets [] replaced by
245.26 * your own identifying information:
246.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MapDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
246.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MapDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
246.3 @@ -2,7 +2,10 @@
246.4 /*
246.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
246.6 *
246.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
246.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
246.9 + *
246.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
246.11 + * Other names may be trademarks of their respective owners.
246.12 *
246.13 * The contents of this file are subject to the terms of either the GNU
246.14 * General Public License Version 2 only ("GPL") or the Common
246.15 @@ -14,9 +17,9 @@
246.16 * specific language governing permissions and limitations under the
246.17 * License. When distributing the software, include this License Header
246.18 * Notice in each file and include the License file at
246.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
246.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
246.21 * particular file as subject to the "Classpath" exception as provided
246.22 - * by Sun in the GPL Version 2 section of the License file that
246.23 + * by Oracle in the GPL Version 2 section of the License file that
246.24 * accompanied this code. If applicable, add the following below the
246.25 * License Header, with the fields enclosed by brackets [] replaced by
246.26 * your own identifying information:
247.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
247.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
247.3 @@ -1,7 +1,10 @@
247.4 /*
247.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
247.6 *
247.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
247.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
247.9 + *
247.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
247.11 + * Other names may be trademarks of their respective owners.
247.12 *
247.13 * The contents of this file are subject to the terms of either the GNU
247.14 * General Public License Version 2 only ("GPL") or the Common
247.15 @@ -13,9 +16,9 @@
247.16 * specific language governing permissions and limitations under the
247.17 * License. When distributing the software, include this License Header
247.18 * Notice in each file and include the License file at
247.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
247.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
247.21 * particular file as subject to the "Classpath" exception as provided
247.22 - * by Sun in the GPL Version 2 section of the License file that
247.23 + * by Oracle in the GPL Version 2 section of the License file that
247.24 * accompanied this code. If applicable, add the following below the
247.25 * License Header, with the fields enclosed by brackets [] replaced by
247.26 * your own identifying information:
248.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
248.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
248.3 @@ -2,7 +2,10 @@
248.4 /*
248.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
248.6 *
248.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
248.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
248.9 + *
248.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
248.11 + * Other names may be trademarks of their respective owners.
248.12 *
248.13 * The contents of this file are subject to the terms of either the GNU
248.14 * General Public License Version 2 only ("GPL") or the Common
248.15 @@ -14,9 +17,9 @@
248.16 * specific language governing permissions and limitations under the
248.17 * License. When distributing the software, include this License Header
248.18 * Notice in each file and include the License file at
248.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
248.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
248.21 * particular file as subject to the "Classpath" exception as provided
248.22 - * by Sun in the GPL Version 2 section of the License file that
248.23 + * by Oracle in the GPL Version 2 section of the License file that
248.24 * accompanied this code. If applicable, add the following below the
248.25 * License Header, with the fields enclosed by brackets [] replaced by
248.26 * your own identifying information:
249.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultTableDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
249.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultTableDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
249.3 @@ -1,7 +1,10 @@
249.4 /*
249.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
249.6 *
249.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
249.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
249.9 + *
249.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
249.11 + * Other names may be trademarks of their respective owners.
249.12 *
249.13 * The contents of this file are subject to the terms of either the GNU
249.14 * General Public License Version 2 only ("GPL") or the Common
249.15 @@ -13,9 +16,9 @@
249.16 * specific language governing permissions and limitations under the
249.17 * License. When distributing the software, include this License Header
249.18 * Notice in each file and include the License file at
249.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
249.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
249.21 * particular file as subject to the "Classpath" exception as provided
249.22 - * by Sun in the GPL Version 2 section of the License file that
249.23 + * by Oracle in the GPL Version 2 section of the License file that
249.24 * accompanied this code. If applicable, add the following below the
249.25 * License Header, with the fields enclosed by brackets [] replaced by
249.26 * your own identifying information:
250.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultTableDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
250.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultTableDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
250.3 @@ -2,7 +2,10 @@
250.4 /*
250.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
250.6 *
250.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
250.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
250.9 + *
250.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
250.11 + * Other names may be trademarks of their respective owners.
250.12 *
250.13 * The contents of this file are subject to the terms of either the GNU
250.14 * General Public License Version 2 only ("GPL") or the Common
250.15 @@ -14,9 +17,9 @@
250.16 * specific language governing permissions and limitations under the
250.17 * License. When distributing the software, include this License Header
250.18 * Notice in each file and include the License file at
250.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
250.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
250.21 * particular file as subject to the "Classpath" exception as provided
250.22 - * by Sun in the GPL Version 2 section of the License file that
250.23 + * by Oracle in the GPL Version 2 section of the License file that
250.24 * accompanied this code. If applicable, add the following below the
250.25 * License Header, with the fields enclosed by brackets [] replaced by
250.26 * your own identifying information:
251.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/NestedFilterCriteriaBeanInfo.java Mon May 17 14:11:51 2010 -0400
251.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/NestedFilterCriteriaBeanInfo.java Mon May 17 14:19:35 2010 -0400
251.3 @@ -1,7 +1,10 @@
251.4 /*
251.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
251.6 *
251.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
251.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
251.9 + *
251.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
251.11 + * Other names may be trademarks of their respective owners.
251.12 *
251.13 * The contents of this file are subject to the terms of either the GNU
251.14 * General Public License Version 2 only ("GPL") or the Common
251.15 @@ -13,9 +16,9 @@
251.16 * specific language governing permissions and limitations under the
251.17 * License. When distributing the software, include this License Header
251.18 * Notice in each file and include the License file at
251.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
251.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
251.21 * particular file as subject to the "Classpath" exception as provided
251.22 - * by Sun in the GPL Version 2 section of the License file that
251.23 + * by Oracle in the GPL Version 2 section of the License file that
251.24 * accompanied this code. If applicable, add the following below the
251.25 * License Header, with the fields enclosed by brackets [] replaced by
251.26 * your own identifying information:
252.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/NestedFilterCriteriaBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
252.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/NestedFilterCriteriaBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
252.3 @@ -2,7 +2,10 @@
252.4 /*
252.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
252.6 *
252.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
252.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
252.9 + *
252.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
252.11 + * Other names may be trademarks of their respective owners.
252.12 *
252.13 * The contents of this file are subject to the terms of either the GNU
252.14 * General Public License Version 2 only ("GPL") or the Common
252.15 @@ -14,9 +17,9 @@
252.16 * specific language governing permissions and limitations under the
252.17 * License. When distributing the software, include this License Header
252.18 * Notice in each file and include the License file at
252.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
252.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
252.21 * particular file as subject to the "Classpath" exception as provided
252.22 - * by Sun in the GPL Version 2 section of the License file that
252.23 + * by Oracle in the GPL Version 2 section of the License file that
252.24 * accompanied this code. If applicable, add the following below the
252.25 * License Header, with the fields enclosed by brackets [] replaced by
252.26 * your own identifying information:
253.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectArrayDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
253.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectArrayDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
253.3 @@ -1,7 +1,10 @@
253.4 /*
253.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
253.6 *
253.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
253.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
253.9 + *
253.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
253.11 + * Other names may be trademarks of their respective owners.
253.12 *
253.13 * The contents of this file are subject to the terms of either the GNU
253.14 * General Public License Version 2 only ("GPL") or the Common
253.15 @@ -13,9 +16,9 @@
253.16 * specific language governing permissions and limitations under the
253.17 * License. When distributing the software, include this License Header
253.18 * Notice in each file and include the License file at
253.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
253.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
253.21 * particular file as subject to the "Classpath" exception as provided
253.22 - * by Sun in the GPL Version 2 section of the License file that
253.23 + * by Oracle in the GPL Version 2 section of the License file that
253.24 * accompanied this code. If applicable, add the following below the
253.25 * License Header, with the fields enclosed by brackets [] replaced by
253.26 * your own identifying information:
254.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectArrayDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
254.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectArrayDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
254.3 @@ -2,7 +2,10 @@
254.4 /*
254.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
254.6 *
254.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
254.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
254.9 + *
254.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
254.11 + * Other names may be trademarks of their respective owners.
254.12 *
254.13 * The contents of this file are subject to the terms of either the GNU
254.14 * General Public License Version 2 only ("GPL") or the Common
254.15 @@ -14,9 +17,9 @@
254.16 * specific language governing permissions and limitations under the
254.17 * License. When distributing the software, include this License Header
254.18 * Notice in each file and include the License file at
254.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
254.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
254.21 * particular file as subject to the "Classpath" exception as provided
254.22 - * by Sun in the GPL Version 2 section of the License file that
254.23 + * by Oracle in the GPL Version 2 section of the License file that
254.24 * accompanied this code. If applicable, add the following below the
254.25 * License Header, with the fields enclosed by brackets [] replaced by
254.26 * your own identifying information:
255.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
255.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
255.3 @@ -1,7 +1,10 @@
255.4 /*
255.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
255.6 *
255.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
255.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
255.9 + *
255.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
255.11 + * Other names may be trademarks of their respective owners.
255.12 *
255.13 * The contents of this file are subject to the terms of either the GNU
255.14 * General Public License Version 2 only ("GPL") or the Common
255.15 @@ -13,9 +16,9 @@
255.16 * specific language governing permissions and limitations under the
255.17 * License. When distributing the software, include this License Header
255.18 * Notice in each file and include the License file at
255.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
255.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
255.21 * particular file as subject to the "Classpath" exception as provided
255.22 - * by Sun in the GPL Version 2 section of the License file that
255.23 + * by Oracle in the GPL Version 2 section of the License file that
255.24 * accompanied this code. If applicable, add the following below the
255.25 * License Header, with the fields enclosed by brackets [] replaced by
255.26 * your own identifying information:
256.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
256.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
256.3 @@ -2,7 +2,10 @@
256.4 /*
256.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
256.6 *
256.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
256.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
256.9 + *
256.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
256.11 + * Other names may be trademarks of their respective owners.
256.12 *
256.13 * The contents of this file are subject to the terms of either the GNU
256.14 * General Public License Version 2 only ("GPL") or the Common
256.15 @@ -14,9 +17,9 @@
256.16 * specific language governing permissions and limitations under the
256.17 * License. When distributing the software, include this License Header
256.18 * Notice in each file and include the License file at
256.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
256.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
256.21 * particular file as subject to the "Classpath" exception as provided
256.22 - * by Sun in the GPL Version 2 section of the License file that
256.23 + * by Oracle in the GPL Version 2 section of the License file that
256.24 * accompanied this code. If applicable, add the following below the
256.25 * License Header, with the fields enclosed by brackets [] replaced by
256.26 * your own identifying information:
257.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectListDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
257.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectListDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
257.3 @@ -1,7 +1,10 @@
257.4 /*
257.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
257.6 *
257.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
257.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
257.9 + *
257.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
257.11 + * Other names may be trademarks of their respective owners.
257.12 *
257.13 * The contents of this file are subject to the terms of either the GNU
257.14 * General Public License Version 2 only ("GPL") or the Common
257.15 @@ -13,9 +16,9 @@
257.16 * specific language governing permissions and limitations under the
257.17 * License. When distributing the software, include this License Header
257.18 * Notice in each file and include the License file at
257.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
257.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
257.21 * particular file as subject to the "Classpath" exception as provided
257.22 - * by Sun in the GPL Version 2 section of the License file that
257.23 + * by Oracle in the GPL Version 2 section of the License file that
257.24 * accompanied this code. If applicable, add the following below the
257.25 * License Header, with the fields enclosed by brackets [] replaced by
257.26 * your own identifying information:
258.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectListDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
258.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectListDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
258.3 @@ -2,7 +2,10 @@
258.4 /*
258.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
258.6 *
258.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
258.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
258.9 + *
258.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
258.11 + * Other names may be trademarks of their respective owners.
258.12 *
258.13 * The contents of this file are subject to the terms of either the GNU
258.14 * General Public License Version 2 only ("GPL") or the Common
258.15 @@ -14,9 +17,9 @@
258.16 * specific language governing permissions and limitations under the
258.17 * License. When distributing the software, include this License Header
258.18 * Notice in each file and include the License file at
258.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
258.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
258.21 * particular file as subject to the "Classpath" exception as provided
258.22 - * by Sun in the GPL Version 2 section of the License file that
258.23 + * by Oracle in the GPL Version 2 section of the License file that
258.24 * accompanied this code. If applicable, add the following below the
258.25 * License Header, with the fields enclosed by brackets [] replaced by
258.26 * your own identifying information:
259.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/RegexFilterCriteriaBeanInfo.java Mon May 17 14:11:51 2010 -0400
259.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/RegexFilterCriteriaBeanInfo.java Mon May 17 14:19:35 2010 -0400
259.3 @@ -1,7 +1,10 @@
259.4 /*
259.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
259.6 *
259.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
259.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
259.9 + *
259.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
259.11 + * Other names may be trademarks of their respective owners.
259.12 *
259.13 * The contents of this file are subject to the terms of either the GNU
259.14 * General Public License Version 2 only ("GPL") or the Common
259.15 @@ -13,9 +16,9 @@
259.16 * specific language governing permissions and limitations under the
259.17 * License. When distributing the software, include this License Header
259.18 * Notice in each file and include the License file at
259.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
259.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
259.21 * particular file as subject to the "Classpath" exception as provided
259.22 - * by Sun in the GPL Version 2 section of the License file that
259.23 + * by Oracle in the GPL Version 2 section of the License file that
259.24 * accompanied this code. If applicable, add the following below the
259.25 * License Header, with the fields enclosed by brackets [] replaced by
259.26 * your own identifying information:
260.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/RegexFilterCriteriaBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
260.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/RegexFilterCriteriaBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
260.3 @@ -2,7 +2,10 @@
260.4 /*
260.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
260.6 *
260.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
260.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
260.9 + *
260.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
260.11 + * Other names may be trademarks of their respective owners.
260.12 *
260.13 * The contents of this file are subject to the terms of either the GNU
260.14 * General Public License Version 2 only ("GPL") or the Common
260.15 @@ -14,9 +17,9 @@
260.16 * specific language governing permissions and limitations under the
260.17 * License. When distributing the software, include this License Header
260.18 * Notice in each file and include the License file at
260.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
260.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
260.21 * particular file as subject to the "Classpath" exception as provided
260.22 - * by Sun in the GPL Version 2 section of the License file that
260.23 + * by Oracle in the GPL Version 2 section of the License file that
260.24 * accompanied this code. If applicable, add the following below the
260.25 * License Header, with the fields enclosed by brackets [] replaced by
260.26 * your own identifying information:
261.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/TableRowDataProviderBeanInfo.java Mon May 17 14:11:51 2010 -0400
261.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/TableRowDataProviderBeanInfo.java Mon May 17 14:19:35 2010 -0400
261.3 @@ -1,7 +1,10 @@
261.4 /*
261.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
261.6 *
261.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
261.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
261.9 + *
261.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
261.11 + * Other names may be trademarks of their respective owners.
261.12 *
261.13 * The contents of this file are subject to the terms of either the GNU
261.14 * General Public License Version 2 only ("GPL") or the Common
261.15 @@ -13,9 +16,9 @@
261.16 * specific language governing permissions and limitations under the
261.17 * License. When distributing the software, include this License Header
261.18 * Notice in each file and include the License file at
261.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
261.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
261.21 * particular file as subject to the "Classpath" exception as provided
261.22 - * by Sun in the GPL Version 2 section of the License file that
261.23 + * by Oracle in the GPL Version 2 section of the License file that
261.24 * accompanied this code. If applicable, add the following below the
261.25 * License Header, with the fields enclosed by brackets [] replaced by
261.26 * your own identifying information:
262.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/TableRowDataProviderBeanInfoBase.java Mon May 17 14:11:51 2010 -0400
262.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/TableRowDataProviderBeanInfoBase.java Mon May 17 14:19:35 2010 -0400
262.3 @@ -2,7 +2,10 @@
262.4 /*
262.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
262.6 *
262.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
262.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
262.9 + *
262.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
262.11 + * Other names may be trademarks of their respective owners.
262.12 *
262.13 * The contents of this file are subject to the terms of either the GNU
262.14 * General Public License Version 2 only ("GPL") or the Common
262.15 @@ -14,9 +17,9 @@
262.16 * specific language governing permissions and limitations under the
262.17 * License. When distributing the software, include this License Header
262.18 * Notice in each file and include the License file at
262.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
262.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
262.21 * particular file as subject to the "Classpath" exception as provided
262.22 - * by Sun in the GPL Version 2 section of the License file that
262.23 + * by Oracle in the GPL Version 2 section of the License file that
262.24 * accompanied this code. If applicable, add the following below the
262.25 * License Header, with the fields enclosed by brackets [] replaced by
262.26 * your own identifying information:
263.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/layer.xml Mon May 17 14:11:51 2010 -0400
263.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/layer.xml Mon May 17 14:19:35 2010 -0400
263.3 @@ -2,7 +2,10 @@
263.4 <!--
263.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
263.6
263.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
263.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
263.9 +
263.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
263.11 +Other names may be trademarks of their respective owners.
263.12
263.13
263.14 The contents of this file are subject to the terms of either the GNU
263.15 @@ -15,9 +18,9 @@
263.16 specific language governing permissions and limitations under the
263.17 License. When distributing the software, include this License Header
263.18 Notice in each file and include the License file at
263.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
263.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
263.21 particular file as subject to the "Classpath" exception as provided
263.22 -by Sun in the GPL Version 2 section of the License file that
263.23 +by Oracle in the GPL Version 2 section of the License file that
263.24 accompanied this code. If applicable, add the following below the
263.25 License Header, with the fields enclosed by brackets [] replaced by
263.26 your own identifying information:
264.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/resources/Bundle.properties Mon May 17 14:11:51 2010 -0400
264.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/resources/Bundle.properties Mon May 17 14:19:35 2010 -0400
264.3 @@ -1,6 +1,9 @@
264.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
264.5 #
264.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
264.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
264.8 +#
264.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
264.10 +# Other names may be trademarks of their respective owners.
264.11 #
264.12 # The contents of this file are subject to the terms of either the GNU
264.13 # General Public License Version 2 only ("GPL") or the Common
264.14 @@ -12,9 +15,9 @@
264.15 # specific language governing permissions and limitations under the
264.16 # License. When distributing the software, include this License Header
264.17 # Notice in each file and include the License file at
264.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
264.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
264.20 # particular file as subject to the "Classpath" exception as provided
264.21 -# by Sun in the GPL Version 2 section of the License file that
264.22 +# by Oracle in the GPL Version 2 section of the License file that
264.23 # accompanied this code. If applicable, add the following below the
264.24 # License Header, with the fields enclosed by brackets [] replaced by
264.25 # your own identifying information:
265.1 --- a/visualweb.dataprovider/build.xml Mon May 17 14:11:51 2010 -0400
265.2 +++ b/visualweb.dataprovider/build.xml Mon May 17 14:19:35 2010 -0400
265.3 @@ -2,7 +2,10 @@
265.4 <!--
265.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
265.6
265.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
265.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
265.9 +
265.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
265.11 +Other names may be trademarks of their respective owners.
265.12
265.13
265.14 The contents of this file are subject to the terms of either the GNU
265.15 @@ -15,9 +18,9 @@
265.16 specific language governing permissions and limitations under the
265.17 License. When distributing the software, include this License Header
265.18 Notice in each file and include the License file at
265.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
265.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
265.21 particular file as subject to the "Classpath" exception as provided
265.22 -by Sun in the GPL Version 2 section of the License file that
265.23 +by Oracle in the GPL Version 2 section of the License file that
265.24 accompanied this code. If applicable, add the following below the
265.25 License Header, with the fields enclosed by brackets [] replaced by
265.26 your own identifying information:
266.1 --- a/visualweb.dataprovider/library/build.xml Mon May 17 14:11:51 2010 -0400
266.2 +++ b/visualweb.dataprovider/library/build.xml Mon May 17 14:19:35 2010 -0400
266.3 @@ -2,7 +2,10 @@
266.4 <!--
266.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
266.6
266.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
266.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
266.9 +
266.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
266.11 +Other names may be trademarks of their respective owners.
266.12
266.13
266.14 The contents of this file are subject to the terms of either the GNU
266.15 @@ -15,9 +18,9 @@
266.16 specific language governing permissions and limitations under the
266.17 License. When distributing the software, include this License Header
266.18 Notice in each file and include the License file at
266.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
266.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
266.21 particular file as subject to the "Classpath" exception as provided
266.22 -by Sun in the GPL Version 2 section of the License file that
266.23 +by Oracle in the GPL Version 2 section of the License file that
266.24 accompanied this code. If applicable, add the following below the
266.25 License Header, with the fields enclosed by brackets [] replaced by
266.26 your own identifying information: