Merged default into maven-dev.
Made no attempt to fix compilability or other semantic errors.
Conflict markers left for now in:
maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
maven.embedder/src/org/netbeans/modules/maven/embedder/EmbedderFactory.java
maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
maven.model/test/unit/src/org/netbeans/modules/maven/pom/ModelTest.java
maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
maven/src/org/netbeans/modules/maven/execute/MavenJavaExecutor.java
1.1 --- a/libs.httpunit/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1.2 +++ b/libs.httpunit/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1.3 @@ -1,6 +1,9 @@
1.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1.5 #
1.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1.8 +#
1.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1.10 +# Other names may be trademarks of their respective owners.
1.11 #
1.12 # The contents of this file are subject to the terms of either the GNU
1.13 # General Public License Version 2 only ("GPL") or the Common
1.14 @@ -12,9 +15,9 @@
1.15 # specific language governing permissions and limitations under the
1.16 # License. When distributing the software, include this License Header
1.17 # Notice in each file and include the License file at
1.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1.20 # particular file as subject to the "Classpath" exception as provided
1.21 -# by Sun in the GPL Version 2 section of the License file that
1.22 +# by Oracle in the GPL Version 2 section of the License file that
1.23 # accompanied this code. If applicable, add the following below the
1.24 # License Header, with the fields enclosed by brackets [] replaced by
1.25 # your own identifying information:
1.26 @@ -40,4 +43,4 @@
1.27 is.autoload=true
1.28 release.external/httpunit-1.6.2.jar=modules/ext/httpunit-1.6.2.jar
1.29 module.jar.verifylinkageignores=com.meterware.*
1.30 -spec.version.base=1.16.0
1.31 +spec.version.base=1.17.0
2.1 --- a/visualweb.api.designer/build.xml Fri Jul 16 11:47:36 2010 -0400
2.2 +++ b/visualweb.api.designer/build.xml Fri Jul 16 14:21:50 2010 -0400
2.3 @@ -2,7 +2,10 @@
2.4 <!--
2.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2.6
2.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2.9 +
2.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2.11 +Other names may be trademarks of their respective owners.
2.12
2.13
2.14 The contents of this file are subject to the terms of either the GNU
2.15 @@ -15,9 +18,9 @@
2.16 specific language governing permissions and limitations under the
2.17 License. When distributing the software, include this License Header
2.18 Notice in each file and include the License file at
2.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2.21 particular file as subject to the "Classpath" exception as provided
2.22 -by Sun in the GPL Version 2 section of the License file that
2.23 +by Oracle in the GPL Version 2 section of the License file that
2.24 accompanied this code. If applicable, add the following below the
2.25 License Header, with the fields enclosed by brackets [] replaced by
2.26 your own identifying information:
3.1 --- a/visualweb.api.designer/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
3.2 +++ b/visualweb.api.designer/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
3.3 @@ -1,6 +1,9 @@
3.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3.5 #
3.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3.8 +#
3.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3.10 +# Other names may be trademarks of their respective owners.
3.11 #
3.12 # The contents of this file are subject to the terms of either the GNU
3.13 # General Public License Version 2 only ("GPL") or the Common
3.14 @@ -12,9 +15,9 @@
3.15 # specific language governing permissions and limitations under the
3.16 # License. When distributing the software, include this License Header
3.17 # Notice in each file and include the License file at
3.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3.20 # particular file as subject to the "Classpath" exception as provided
3.21 -# by Sun in the GPL Version 2 section of the License file that
3.22 +# by Oracle in the GPL Version 2 section of the License file that
3.23 # accompanied this code. If applicable, add the following below the
3.24 # License Header, with the fields enclosed by brackets [] replaced by
3.25 # your own identifying information:
3.26 @@ -38,6 +41,6 @@
3.27 # made subject to such option by the copyright holder.
3.28
3.29 javac.compilerargs=-Xlint:unchecked
3.30 -javac.source=1.5
3.31 +javac.source=1.6
3.32 javadoc.name=DesignerAPI
3.33 javadoc.title=Visual Editor API
4.1 --- a/visualweb.api.designer/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
4.2 +++ b/visualweb.api.designer/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
4.3 @@ -2,7 +2,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
4.14 The contents of this file are subject to the terms of either the GNU
4.15 @@ -15,9 +18,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:
4.27 @@ -86,7 +89,15 @@
4.28 <build-prerequisite/>
4.29 <compile-dependency/>
4.30 <run-dependency>
4.31 - <specification-version>6.5.1</specification-version>
4.32 + <specification-version>8.0</specification-version>
4.33 + </run-dependency>
4.34 + </dependency>
4.35 + <dependency>
4.36 + <code-name-base>org.openide.util.lookup</code-name-base>
4.37 + <build-prerequisite/>
4.38 + <compile-dependency/>
4.39 + <run-dependency>
4.40 + <specification-version>8.0</specification-version>
4.41 </run-dependency>
4.42 </dependency>
4.43 <dependency>
5.1 --- a/visualweb.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/DesignTimeTransferDataCreator.java Fri Jul 16 11:47:36 2010 -0400
5.2 +++ b/visualweb.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/DesignTimeTransferDataCreator.java Fri Jul 16 14:21:50 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/DesignerServiceHack.java Fri Jul 16 11:47:36 2010 -0400
6.2 +++ b/visualweb.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/DesignerServiceHack.java Fri Jul 16 14:21:50 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.designer/src/org/netbeans/modules/visualweb/api/designerapi/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
7.2 +++ b/visualweb.api.designer/src/org/netbeans/modules/visualweb/api/designerapi/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
7.3 @@ -1,7 +1,10 @@
7.4 #
7.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
7.6 #
7.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
7.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
7.9 +#
7.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7.11 +# Other names may be trademarks of their respective owners.
7.12 #
7.13 # The contents of this file are subject to the terms of either the GNU
7.14 # General Public License Version 2 only ("GPL") or the Common
7.15 @@ -13,9 +16,9 @@
7.16 # specific language governing permissions and limitations under the
7.17 # License. When distributing the software, include this License Header
7.18 # Notice in each file and include the License file at
7.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
7.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
7.21 # particular file as subject to the "Classpath" exception as provided
7.22 -# by Sun in the GPL Version 2 section of the License file that
7.23 +# by Oracle in the GPL Version 2 section of the License file that
7.24 # accompanied this code. If applicable, add the following below the
7.25 # License Header, with the fields enclosed by brackets [] replaced by
7.26 # your own identifying information:
8.1 --- a/visualweb.api.insync/build.xml Fri Jul 16 11:47:36 2010 -0400
8.2 +++ b/visualweb.api.insync/build.xml Fri Jul 16 14:21:50 2010 -0400
8.3 @@ -2,7 +2,10 @@
8.4 <!--
8.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
8.6
8.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
8.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
8.9 +
8.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
8.11 +Other names may be trademarks of their respective owners.
8.12
8.13
8.14 The contents of this file are subject to the terms of either the GNU
8.15 @@ -15,9 +18,9 @@
8.16 specific language governing permissions and limitations under the
8.17 License. When distributing the software, include this License Header
8.18 Notice in each file and include the License file at
8.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
8.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
8.21 particular file as subject to the "Classpath" exception as provided
8.22 -by Sun in the GPL Version 2 section of the License file that
8.23 +by Oracle in the GPL Version 2 section of the License file that
8.24 accompanied this code. If applicable, add the following below the
8.25 License Header, with the fields enclosed by brackets [] replaced by
8.26 your own identifying information:
9.1 --- a/visualweb.api.insync/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
9.2 +++ b/visualweb.api.insync/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
9.3 @@ -1,6 +1,9 @@
9.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
9.5 #
9.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
9.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
9.8 +#
9.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
9.10 +# Other names may be trademarks of their respective owners.
9.11 #
9.12 # The contents of this file are subject to the terms of either the GNU
9.13 # General Public License Version 2 only ("GPL") or the Common
9.14 @@ -12,9 +15,9 @@
9.15 # specific language governing permissions and limitations under the
9.16 # License. When distributing the software, include this License Header
9.17 # Notice in each file and include the License file at
9.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
9.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
9.20 # particular file as subject to the "Classpath" exception as provided
9.21 -# by Sun in the GPL Version 2 section of the License file that
9.22 +# by Oracle in the GPL Version 2 section of the License file that
9.23 # accompanied this code. If applicable, add the following below the
9.24 # License Header, with the fields enclosed by brackets [] replaced by
9.25 # your own identifying information:
9.26 @@ -39,6 +42,6 @@
9.27
9.28 is.autoload=true
9.29 javac.compilerargs=-Xlint -Xlint:-serial
9.30 -javac.source=1.5
9.31 +javac.source=1.6
9.32 javadoc.name=InSyncAPI
9.33 javadoc.title=InSync API
10.1 --- a/visualweb.api.insync/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
10.2 +++ b/visualweb.api.insync/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
10.3 @@ -2,7 +2,10 @@
10.4 <!--
10.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
10.6
10.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
10.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
10.9 +
10.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
10.11 +Other names may be trademarks of their respective owners.
10.12
10.13
10.14 The contents of this file are subject to the terms of either the GNU
10.15 @@ -15,9 +18,9 @@
10.16 specific language governing permissions and limitations under the
10.17 License. When distributing the software, include this License Header
10.18 Notice in each file and include the License file at
10.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
10.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
10.21 particular file as subject to the "Classpath" exception as provided
10.22 -by Sun in the GPL Version 2 section of the License file that
10.23 +by Oracle in the GPL Version 2 section of the License file that
10.24 accompanied this code. If applicable, add the following below the
10.25 License Header, with the fields enclosed by brackets [] replaced by
10.26 your own identifying information:
10.27 @@ -101,7 +104,15 @@
10.28 <build-prerequisite/>
10.29 <compile-dependency/>
10.30 <run-dependency>
10.31 - <specification-version>6.8</specification-version>
10.32 + <specification-version>8.0</specification-version>
10.33 + </run-dependency>
10.34 + </dependency>
10.35 + <dependency>
10.36 + <code-name-base>org.openide.util.lookup</code-name-base>
10.37 + <build-prerequisite/>
10.38 + <compile-dependency/>
10.39 + <run-dependency>
10.40 + <specification-version>8.0</specification-version>
10.41 </run-dependency>
10.42 </dependency>
10.43 </module-dependencies>
11.1 --- a/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
11.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
11.3 @@ -1,6 +1,9 @@
11.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
11.5 #
11.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
11.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
11.8 +#
11.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
11.10 +# Other names may be trademarks of their respective owners.
11.11 #
11.12 # The contents of this file are subject to the terms of either the GNU
11.13 # General Public License Version 2 only ("GPL") or the Common
11.14 @@ -12,9 +15,9 @@
11.15 # specific language governing permissions and limitations under the
11.16 # License. When distributing the software, include this License Header
11.17 # Notice in each file and include the License file at
11.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
11.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
11.20 # particular file as subject to the "Classpath" exception as provided
11.21 -# by Sun in the GPL Version 2 section of the License file that
11.22 +# by Oracle in the GPL Version 2 section of the License file that
11.23 # accompanied this code. If applicable, add the following below the
11.24 # License Header, with the fields enclosed by brackets [] replaced by
11.25 # your own identifying information:
12.1 --- a/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/InSyncService.java Fri Jul 16 11:47:36 2010 -0400
12.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/InSyncService.java Fri Jul 16 14:21:50 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/JsfDataObjectMarker.java Fri Jul 16 11:47:36 2010 -0400
13.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/JsfDataObjectMarker.java Fri Jul 16 14:21:50 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/JsfJavaDataObjectMarker.java Fri Jul 16 11:47:36 2010 -0400
14.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/JsfJavaDataObjectMarker.java Fri Jul 16 14:21:50 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.insync/src/org/netbeans/modules/visualweb/api/insync/JsfJspDataObjectMarker.java Fri Jul 16 11:47:36 2010 -0400
15.2 +++ b/visualweb.api.insync/src/org/netbeans/modules/visualweb/api/insync/JsfJspDataObjectMarker.java Fri Jul 16 14:21:50 2010 -0400
15.3 @@ -1,7 +1,10 @@
15.4 /*
15.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
15.6 *
15.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
15.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
15.9 + *
15.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
15.11 + * Other names may be trademarks of their respective owners.
15.12 *
15.13 * The contents of this file are subject to the terms of either the GNU
15.14 * General Public License Version 2 only ("GPL") or the Common
15.15 @@ -13,9 +16,9 @@
15.16 * specific language governing permissions and limitations under the
15.17 * License. When distributing the software, include this License Header
15.18 * Notice in each file and include the License file at
15.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
15.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
15.21 * particular file as subject to the "Classpath" exception as provided
15.22 - * by Sun in the GPL Version 2 section of the License file that
15.23 + * by Oracle in the GPL Version 2 section of the License file that
15.24 * accompanied this code. If applicable, add the following below the
15.25 * License Header, with the fields enclosed by brackets [] replaced by
15.26 * your own identifying information:
16.1 --- a/visualweb.api.j2ee/build.xml Fri Jul 16 11:47:36 2010 -0400
16.2 +++ b/visualweb.api.j2ee/build.xml Fri Jul 16 14:21:50 2010 -0400
16.3 @@ -2,7 +2,10 @@
16.4 <!--
16.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
16.6
16.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
16.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
16.9 +
16.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
16.11 +Other names may be trademarks of their respective owners.
16.12
16.13
16.14 The contents of this file are subject to the terms of either the GNU
16.15 @@ -15,9 +18,9 @@
16.16 specific language governing permissions and limitations under the
16.17 License. When distributing the software, include this License Header
16.18 Notice in each file and include the License file at
16.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
16.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
16.21 particular file as subject to the "Classpath" exception as provided
16.22 -by Sun in the GPL Version 2 section of the License file that
16.23 +by Oracle in the GPL Version 2 section of the License file that
16.24 accompanied this code. If applicable, add the following below the
16.25 License Header, with the fields enclosed by brackets [] replaced by
16.26 your own identifying information:
17.1 --- a/visualweb.api.j2ee/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
17.2 +++ b/visualweb.api.j2ee/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
17.3 @@ -1,6 +1,9 @@
17.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
17.5 #
17.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
17.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
17.8 +#
17.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
17.10 +# Other names may be trademarks of their respective owners.
17.11 #
17.12 # The contents of this file are subject to the terms of either the GNU
17.13 # General Public License Version 2 only ("GPL") or the Common
17.14 @@ -12,9 +15,9 @@
17.15 # specific language governing permissions and limitations under the
17.16 # License. When distributing the software, include this License Header
17.17 # Notice in each file and include the License file at
17.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
17.20 # particular file as subject to the "Classpath" exception as provided
17.21 -# by Sun in the GPL Version 2 section of the License file that
17.22 +# by Oracle in the GPL Version 2 section of the License file that
17.23 # accompanied this code. If applicable, add the following below the
17.24 # License Header, with the fields enclosed by brackets [] replaced by
17.25 # your own identifying information:
18.1 --- a/visualweb.api.j2ee/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
18.2 +++ b/visualweb.api.j2ee/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
18.3 @@ -2,7 +2,10 @@
18.4 <!--
18.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
18.6
18.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
18.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
18.9 +
18.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
18.11 +Other names may be trademarks of their respective owners.
18.12
18.13
18.14 The contents of this file are subject to the terms of either the GNU
18.15 @@ -15,9 +18,9 @@
18.16 specific language governing permissions and limitations under the
18.17 License. When distributing the software, include this License Header
18.18 Notice in each file and include the License file at
18.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
18.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
18.21 particular file as subject to the "Classpath" exception as provided
18.22 -by Sun in the GPL Version 2 section of the License file that
18.23 +by Oracle in the GPL Version 2 section of the License file that
18.24 accompanied this code. If applicable, add the following below the
18.25 License Header, with the fields enclosed by brackets [] replaced by
18.26 your own identifying information:
19.1 --- a/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
19.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
19.3 @@ -1,6 +1,9 @@
19.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
19.5 #
19.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
19.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
19.8 +#
19.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
19.10 +# Other names may be trademarks of their respective owners.
19.11 #
19.12 # The contents of this file are subject to the terms of either the GNU
19.13 # General Public License Version 2 only ("GPL") or the Common
19.14 @@ -12,9 +15,9 @@
19.15 # specific language governing permissions and limitations under the
19.16 # License. When distributing the software, include this License Header
19.17 # Notice in each file and include the License file at
19.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
19.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
19.20 # particular file as subject to the "Classpath" exception as provided
19.21 -# by Sun in the GPL Version 2 section of the License file that
19.22 +# by Oracle in the GPL Version 2 section of the License file that
19.23 # accompanied this code. If applicable, add the following below the
19.24 # License Header, with the fields enclosed by brackets [] replaced by
19.25 # your own identifying information:
20.1 --- a/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/ProjectProperties.java Fri Jul 16 11:47:36 2010 -0400
20.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/ProjectProperties.java Fri Jul 16 14:21:50 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/RequestedEjbResource.java Fri Jul 16 11:47:36 2010 -0400
21.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedEjbResource.java Fri Jul 16 14:21:50 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/RequestedJdbcResource.java Fri Jul 16 11:47:36 2010 -0400
22.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedJdbcResource.java Fri Jul 16 14:21:50 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.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedResource.java Fri Jul 16 11:47:36 2010 -0400
23.2 +++ b/visualweb.api.j2ee/src/org/netbeans/modules/visualweb/api/j2ee/common/RequestedResource.java Fri Jul 16 14:21:50 2010 -0400
23.3 @@ -1,7 +1,10 @@
23.4 /*
23.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
23.6 *
23.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
23.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
23.9 + *
23.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
23.11 + * Other names may be trademarks of their respective owners.
23.12 *
23.13 * The contents of this file are subject to the terms of either the GNU
23.14 * General Public License Version 2 only ("GPL") or the Common
23.15 @@ -13,9 +16,9 @@
23.16 * specific language governing permissions and limitations under the
23.17 * License. When distributing the software, include this License Header
23.18 * Notice in each file and include the License file at
23.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
23.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
23.21 * particular file as subject to the "Classpath" exception as provided
23.22 - * by Sun in the GPL Version 2 section of the License file that
23.23 + * by Oracle in the GPL Version 2 section of the License file that
23.24 * accompanied this code. If applicable, add the following below the
23.25 * License Header, with the fields enclosed by brackets [] replaced by
23.26 * your own identifying information:
24.1 --- a/visualweb.api.portlet.dd/build.xml Fri Jul 16 11:47:36 2010 -0400
24.2 +++ b/visualweb.api.portlet.dd/build.xml Fri Jul 16 14:21:50 2010 -0400
24.3 @@ -2,7 +2,10 @@
24.4 <!--
24.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
24.6
24.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
24.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
24.9 +
24.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
24.11 +Other names may be trademarks of their respective owners.
24.12
24.13
24.14 The contents of this file are subject to the terms of either the GNU
24.15 @@ -15,9 +18,9 @@
24.16 specific language governing permissions and limitations under the
24.17 License. When distributing the software, include this License Header
24.18 Notice in each file and include the License file at
24.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
24.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
24.21 particular file as subject to the "Classpath" exception as provided
24.22 -by Sun in the GPL Version 2 section of the License file that
24.23 +by Oracle in the GPL Version 2 section of the License file that
24.24 accompanied this code. If applicable, add the following below the
24.25 License Header, with the fields enclosed by brackets [] replaced by
24.26 your own identifying information:
25.1 --- a/visualweb.api.portlet.dd/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
25.2 +++ b/visualweb.api.portlet.dd/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
25.3 @@ -1,6 +1,9 @@
25.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
25.5 #
25.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
25.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
25.8 +#
25.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
25.10 +# Other names may be trademarks of their respective owners.
25.11 #
25.12 # The contents of this file are subject to the terms of either the GNU
25.13 # General Public License Version 2 only ("GPL") or the Common
25.14 @@ -12,9 +15,9 @@
25.15 # specific language governing permissions and limitations under the
25.16 # License. When distributing the software, include this License Header
25.17 # Notice in each file and include the License file at
25.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
25.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
25.20 # particular file as subject to the "Classpath" exception as provided
25.21 -# by Sun in the GPL Version 2 section of the License file that
25.22 +# by Oracle in the GPL Version 2 section of the License file that
25.23 # accompanied this code. If applicable, add the following below the
25.24 # License Header, with the fields enclosed by brackets [] replaced by
25.25 # your own identifying information:
26.1 --- a/visualweb.api.portlet.dd/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
26.2 +++ b/visualweb.api.portlet.dd/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
26.3 @@ -2,7 +2,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
26.14 The contents of this file are subject to the terms of either the GNU
26.15 @@ -15,9 +18,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:
26.27 @@ -51,7 +54,15 @@
26.28 <build-prerequisite/>
26.29 <compile-dependency/>
26.30 <run-dependency>
26.31 - <specification-version>6.5.1</specification-version>
26.32 + <specification-version>8.0</specification-version>
26.33 + </run-dependency>
26.34 + </dependency>
26.35 + <dependency>
26.36 + <code-name-base>org.openide.util.lookup</code-name-base>
26.37 + <build-prerequisite/>
26.38 + <compile-dependency/>
26.39 + <run-dependency>
26.40 + <specification-version>8.0</specification-version>
26.41 </run-dependency>
26.42 </dependency>
26.43 </module-dependencies>
27.1 --- a/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CommonBean.java Fri Jul 16 11:47:36 2010 -0400
27.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CommonBean.java Fri Jul 16 14:21:50 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/CustomPortletModeType.java Fri Jul 16 11:47:36 2010 -0400
28.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomPortletModeType.java Fri Jul 16 14:21:50 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/CustomPortletModeTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
29.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomPortletModeTypeInterface.java Fri Jul 16 14:21:50 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/CustomWindowStateType.java Fri Jul 16 11:47:36 2010 -0400
30.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomWindowStateType.java Fri Jul 16 14:21:50 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/CustomWindowStateTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
31.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/CustomWindowStateTypeInterface.java Fri Jul 16 14:21:50 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/InitParamType.java Fri Jul 16 11:47:36 2010 -0400
32.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/InitParamType.java Fri Jul 16 14:21:50 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/InitParamTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
33.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/InitParamTypeInterface.java Fri Jul 16 14:21:50 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/JsfPortletDDProperties.java Fri Jul 16 11:47:36 2010 -0400
34.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/JsfPortletDDProperties.java Fri Jul 16 14:21:50 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/PortletApp.java Fri Jul 16 11:47:36 2010 -0400
35.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletApp.java Fri Jul 16 14:21:50 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/PortletAppInterface.java Fri Jul 16 11:47:36 2010 -0400
36.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletAppInterface.java Fri Jul 16 14:21:50 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/PortletCollectionType.java Fri Jul 16 11:47:36 2010 -0400
37.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletCollectionType.java Fri Jul 16 14:21:50 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/PortletCollectionTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
38.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletCollectionTypeInterface.java Fri Jul 16 14:21:50 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/PortletDDHelper.java Fri Jul 16 11:47:36 2010 -0400
39.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletDDHelper.java Fri Jul 16 14:21:50 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/PortletInfoType.java Fri Jul 16 11:47:36 2010 -0400
40.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletInfoType.java Fri Jul 16 14:21:50 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/PortletInfoTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
41.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletInfoTypeInterface.java Fri Jul 16 14:21:50 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/PortletModeType.java Fri Jul 16 11:47:36 2010 -0400
42.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletModeType.java Fri Jul 16 14:21:50 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/PortletPreferencesType.java Fri Jul 16 11:47:36 2010 -0400
43.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletPreferencesType.java Fri Jul 16 14:21:50 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/PortletPreferencesTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
44.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletPreferencesTypeInterface.java Fri Jul 16 14:21:50 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/PortletType.java Fri Jul 16 11:47:36 2010 -0400
45.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletType.java Fri Jul 16 14:21:50 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/PortletTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
46.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PortletTypeInterface.java Fri Jul 16 14:21:50 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/PreferenceType.java Fri Jul 16 11:47:36 2010 -0400
47.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PreferenceType.java Fri Jul 16 14:21:50 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/PreferenceTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
48.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/PreferenceTypeInterface.java Fri Jul 16 14:21:50 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/SecurityConstraintType.java Fri Jul 16 11:47:36 2010 -0400
49.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityConstraintType.java Fri Jul 16 14:21:50 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/SecurityConstraintTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
50.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityConstraintTypeInterface.java Fri Jul 16 14:21:50 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/SecurityRoleRefType.java Fri Jul 16 11:47:36 2010 -0400
51.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityRoleRefType.java Fri Jul 16 14:21:50 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/SecurityRoleRefTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
52.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SecurityRoleRefTypeInterface.java Fri Jul 16 14:21:50 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/SupportsType.java Fri Jul 16 11:47:36 2010 -0400
53.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SupportsType.java Fri Jul 16 14:21:50 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/SupportsTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
54.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/SupportsTypeInterface.java Fri Jul 16 14:21:50 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/UserAttributeType.java Fri Jul 16 11:47:36 2010 -0400
55.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserAttributeType.java Fri Jul 16 14:21:50 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/UserAttributeTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
56.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserAttributeTypeInterface.java Fri Jul 16 14:21:50 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/UserDataConstraintType.java Fri Jul 16 11:47:36 2010 -0400
57.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserDataConstraintType.java Fri Jul 16 14:21:50 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/UserDataConstraintTypeInterface.java Fri Jul 16 11:47:36 2010 -0400
58.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/UserDataConstraintTypeInterface.java Fri Jul 16 14:21:50 2010 -0400
58.3 @@ -1,7 +1,10 @@
58.4 /*
58.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
58.6 *
58.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
58.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
58.9 + *
58.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
58.11 + * Other names may be trademarks of their respective owners.
58.12 *
58.13 * The contents of this file are subject to the terms of either the GNU
58.14 * General Public License Version 2 only ("GPL") or the Common
58.15 @@ -13,9 +16,9 @@
58.16 * specific language governing permissions and limitations under the
58.17 * License. When distributing the software, include this License Header
58.18 * Notice in each file and include the License file at
58.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
58.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
58.21 * particular file as subject to the "Classpath" exception as provided
58.22 - * by Sun in the GPL Version 2 section of the License file that
58.23 + * by Oracle in the GPL Version 2 section of the License file that
58.24 * accompanied this code. If applicable, add the following below the
58.25 * License Header, with the fields enclosed by brackets [] replaced by
58.26 * your own identifying information:
59.1 --- a/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
59.2 +++ b/visualweb.api.portlet.dd/src/org/netbeans/modules/visualweb/api/portlet/dd/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
59.3 @@ -1,6 +1,9 @@
59.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
59.5 #
59.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
59.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
59.8 +#
59.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
59.10 +# Other names may be trademarks of their respective owners.
59.11 #
59.12 # The contents of this file are subject to the terms of either the GNU
59.13 # General Public License Version 2 only ("GPL") or the Common
59.14 @@ -12,9 +15,9 @@
59.15 # specific language governing permissions and limitations under the
59.16 # License. When distributing the software, include this License Header
59.17 # Notice in each file and include the License file at
59.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
59.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
59.20 # particular file as subject to the "Classpath" exception as provided
59.21 -# by Sun in the GPL Version 2 section of the License file that
59.22 +# by Oracle in the GPL Version 2 section of the License file that
59.23 # accompanied this code. If applicable, add the following below the
59.24 # License Header, with the fields enclosed by brackets [] replaced by
59.25 # your own identifying information:
60.1 --- a/visualweb.classloaderprovider/build.xml Fri Jul 16 11:47:36 2010 -0400
60.2 +++ b/visualweb.classloaderprovider/build.xml Fri Jul 16 14:21:50 2010 -0400
60.3 @@ -2,7 +2,10 @@
60.4 <!--
60.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
60.6
60.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
60.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
60.9 +
60.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
60.11 +Other names may be trademarks of their respective owners.
60.12
60.13
60.14 The contents of this file are subject to the terms of either the GNU
60.15 @@ -15,9 +18,9 @@
60.16 specific language governing permissions and limitations under the
60.17 License. When distributing the software, include this License Header
60.18 Notice in each file and include the License file at
60.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
60.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
60.21 particular file as subject to the "Classpath" exception as provided
60.22 -by Sun in the GPL Version 2 section of the License file that
60.23 +by Oracle in the GPL Version 2 section of the License file that
60.24 accompanied this code. If applicable, add the following below the
60.25 License Header, with the fields enclosed by brackets [] replaced by
60.26 your own identifying information:
61.1 --- a/visualweb.classloaderprovider/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
61.2 +++ b/visualweb.classloaderprovider/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
61.3 @@ -1,6 +1,9 @@
61.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
61.5 #
61.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
61.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
61.8 +#
61.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
61.10 +# Other names may be trademarks of their respective owners.
61.11 #
61.12 # The contents of this file are subject to the terms of either the GNU
61.13 # General Public License Version 2 only ("GPL") or the Common
61.14 @@ -12,9 +15,9 @@
61.15 # specific language governing permissions and limitations under the
61.16 # License. When distributing the software, include this License Header
61.17 # Notice in each file and include the License file at
61.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
61.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
61.20 # particular file as subject to the "Classpath" exception as provided
61.21 -# by Sun in the GPL Version 2 section of the License file that
61.22 +# by Oracle in the GPL Version 2 section of the License file that
61.23 # accompanied this code. If applicable, add the following below the
61.24 # License Header, with the fields enclosed by brackets [] replaced by
61.25 # your own identifying information:
62.1 --- a/visualweb.classloaderprovider/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
62.2 +++ b/visualweb.classloaderprovider/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
62.3 @@ -2,7 +2,10 @@
62.4 <!--
62.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
62.6
62.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
62.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
62.9 +
62.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
62.11 +Other names may be trademarks of their respective owners.
62.12
62.13
62.14 The contents of this file are subject to the terms of either the GNU
62.15 @@ -15,9 +18,9 @@
62.16 specific language governing permissions and limitations under the
62.17 License. When distributing the software, include this License Header
62.18 Notice in each file and include the License file at
62.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
62.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
62.21 particular file as subject to the "Classpath" exception as provided
62.22 -by Sun in the GPL Version 2 section of the License file that
62.23 +by Oracle in the GPL Version 2 section of the License file that
62.24 accompanied this code. If applicable, add the following below the
62.25 License Header, with the fields enclosed by brackets [] replaced by
62.26 your own identifying information:
63.1 --- a/visualweb.classloaderprovider/src/org/netbeans/modules/visualweb/classloaderprovider/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
63.2 +++ b/visualweb.classloaderprovider/src/org/netbeans/modules/visualweb/classloaderprovider/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
63.3 @@ -1,6 +1,9 @@
63.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
63.5 #
63.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
63.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
63.8 +#
63.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
63.10 +# Other names may be trademarks of their respective owners.
63.11 #
63.12 # The contents of this file are subject to the terms of either the GNU
63.13 # General Public License Version 2 only ("GPL") or the Common
63.14 @@ -12,9 +15,9 @@
63.15 # specific language governing permissions and limitations under the
63.16 # License. When distributing the software, include this License Header
63.17 # Notice in each file and include the License file at
63.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
63.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
63.20 # particular file as subject to the "Classpath" exception as provided
63.21 -# by Sun in the GPL Version 2 section of the License file that
63.22 +# by Oracle in the GPL Version 2 section of the License file that
63.23 # accompanied this code. If applicable, add the following below the
63.24 # License Header, with the fields enclosed by brackets [] replaced by
63.25 # your own identifying information:
64.1 --- a/visualweb.classloaderprovider/src/org/netbeans/modules/visualweb/classloaderprovider/CommonClassloaderProvider.java Fri Jul 16 11:47:36 2010 -0400
64.2 +++ b/visualweb.classloaderprovider/src/org/netbeans/modules/visualweb/classloaderprovider/CommonClassloaderProvider.java Fri Jul 16 14:21:50 2010 -0400
64.3 @@ -1,7 +1,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 * The contents of this file are subject to the terms of either the GNU
64.14 * General Public License Version 2 only ("GPL") or the Common
64.15 @@ -13,9 +16,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/build.xml Fri Jul 16 11:47:36 2010 -0400
65.2 +++ b/visualweb.compatibilitykit/build.xml Fri Jul 16 14:21:50 2010 -0400
65.3 @@ -2,7 +2,10 @@
65.4 <!--
65.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
65.6
65.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
65.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
65.9 +
65.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
65.11 +Other names may be trademarks of their respective owners.
65.12
65.13
65.14 The contents of this file are subject to the terms of either the GNU
65.15 @@ -15,9 +18,9 @@
65.16 specific language governing permissions and limitations under the
65.17 License. When distributing the software, include this License Header
65.18 Notice in each file and include the License file at
65.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
65.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
65.21 particular file as subject to the "Classpath" exception as provided
65.22 -by Sun in the GPL Version 2 section of the License file that
65.23 +by Oracle in the GPL Version 2 section of the License file that
65.24 accompanied this code. If applicable, add the following below the
65.25 License Header, with the fields enclosed by brackets [] replaced by
65.26 your own identifying information:
66.1 --- a/visualweb.compatibilitykit/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
66.2 +++ b/visualweb.compatibilitykit/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
66.3 @@ -1,6 +1,9 @@
66.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
66.5 #
66.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
66.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
66.8 +#
66.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
66.10 +# Other names may be trademarks of their respective owners.
66.11 #
66.12 # The contents of this file are subject to the terms of either the GNU
66.13 # General Public License Version 2 only ("GPL") or the Common
66.14 @@ -12,9 +15,9 @@
66.15 # specific language governing permissions and limitations under the
66.16 # License. When distributing the software, include this License Header
66.17 # Notice in each file and include the License file at
66.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
66.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
66.20 # particular file as subject to the "Classpath" exception as provided
66.21 -# by Sun in the GPL Version 2 section of the License file that
66.22 +# by Oracle in the GPL Version 2 section of the License file that
66.23 # accompanied this code. If applicable, add the following below the
66.24 # License Header, with the fields enclosed by brackets [] replaced by
66.25 # your own identifying information:
67.1 --- a/visualweb.compatibilitykit/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
67.2 +++ b/visualweb.compatibilitykit/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
67.3 @@ -2,7 +2,10 @@
67.4 <!--
67.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
67.6
67.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
67.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
67.9 +
67.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
67.11 +Other names may be trademarks of their respective owners.
67.12
67.13
67.14 The contents of this file are subject to the terms of either the GNU
67.15 @@ -15,9 +18,9 @@
67.16 specific language governing permissions and limitations under the
67.17 License. When distributing the software, include this License Header
67.18 Notice in each file and include the License file at
67.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
67.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
67.21 particular file as subject to the "Classpath" exception as provided
67.22 -by Sun in the GPL Version 2 section of the License file that
67.23 +by Oracle in the GPL Version 2 section of the License file that
67.24 accompanied this code. If applicable, add the following below the
67.25 License Header, with the fields enclosed by brackets [] replaced by
67.26 your own identifying information:
68.1 --- a/visualweb.compatibilitykit/src/org/netbeans/modules/visualweb/compatibilitykit/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
68.2 +++ b/visualweb.compatibilitykit/src/org/netbeans/modules/visualweb/compatibilitykit/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
68.3 @@ -1,6 +1,9 @@
68.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
68.5 #
68.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
68.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
68.8 +#
68.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
68.10 +# Other names may be trademarks of their respective owners.
68.11 #
68.12 # The contents of this file are subject to the terms of either the GNU
68.13 # General Public License Version 2 only ("GPL") or the Common
68.14 @@ -12,9 +15,9 @@
68.15 # specific language governing permissions and limitations under the
68.16 # License. When distributing the software, include this License Header
68.17 # Notice in each file and include the License file at
68.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
68.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
68.20 # particular file as subject to the "Classpath" exception as provided
68.21 -# by Sun in the GPL Version 2 section of the License file that
68.22 +# by Oracle in the GPL Version 2 section of the License file that
68.23 # accompanied this code. If applicable, add the following below the
68.24 # License Header, with the fields enclosed by brackets [] replaced by
68.25 # your own identifying information:
69.1 --- a/visualweb.complib.api/build.xml Fri Jul 16 11:47:36 2010 -0400
69.2 +++ b/visualweb.complib.api/build.xml Fri Jul 16 14:21:50 2010 -0400
69.3 @@ -2,7 +2,10 @@
69.4 <!--
69.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
69.6
69.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
69.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
69.9 +
69.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
69.11 +Other names may be trademarks of their respective owners.
69.12
69.13
69.14 The contents of this file are subject to the terms of either the GNU
69.15 @@ -15,9 +18,9 @@
69.16 specific language governing permissions and limitations under the
69.17 License. When distributing the software, include this License Header
69.18 Notice in each file and include the License file at
69.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
69.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
69.21 particular file as subject to the "Classpath" exception as provided
69.22 -by Sun in the GPL Version 2 section of the License file that
69.23 +by Oracle in the GPL Version 2 section of the License file that
69.24 accompanied this code. If applicable, add the following below the
69.25 License Header, with the fields enclosed by brackets [] replaced by
69.26 your own identifying information:
70.1 --- a/visualweb.complib.api/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
70.2 +++ b/visualweb.complib.api/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
70.3 @@ -1,6 +1,9 @@
70.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
70.5 #
70.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
70.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
70.8 +#
70.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
70.10 +# Other names may be trademarks of their respective owners.
70.11 #
70.12 # The contents of this file are subject to the terms of either the GNU
70.13 # General Public License Version 2 only ("GPL") or the Common
70.14 @@ -12,9 +15,9 @@
70.15 # specific language governing permissions and limitations under the
70.16 # License. When distributing the software, include this License Header
70.17 # Notice in each file and include the License file at
70.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
70.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
70.20 # particular file as subject to the "Classpath" exception as provided
70.21 -# by Sun in the GPL Version 2 section of the License file that
70.22 +# by Oracle in the GPL Version 2 section of the License file that
70.23 # accompanied this code. If applicable, add the following below the
70.24 # License Header, with the fields enclosed by brackets [] replaced by
70.25 # your own identifying information:
70.26 @@ -38,4 +41,4 @@
70.27 # made subject to such option by the copyright holder.
70.28
70.29 javac.compilerargs=-Xlint -Xlint:-serial
70.30 -javac.source=1.5
70.31 +javac.source=1.6
71.1 --- a/visualweb.complib.api/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
71.2 +++ b/visualweb.complib.api/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
71.3 @@ -2,7 +2,10 @@
71.4 <!--
71.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
71.6
71.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
71.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
71.9 +
71.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
71.11 +Other names may be trademarks of their respective owners.
71.12
71.13
71.14 The contents of this file are subject to the terms of either the GNU
71.15 @@ -15,9 +18,9 @@
71.16 specific language governing permissions and limitations under the
71.17 License. When distributing the software, include this License Header
71.18 Notice in each file and include the License file at
71.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
71.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
71.21 particular file as subject to the "Classpath" exception as provided
71.22 -by Sun in the GPL Version 2 section of the License file that
71.23 +by Oracle in the GPL Version 2 section of the License file that
71.24 accompanied this code. If applicable, add the following below the
71.25 License Header, with the fields enclosed by brackets [] replaced by
71.26 your own identifying information:
72.1 --- a/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
72.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
72.3 @@ -1,6 +1,9 @@
72.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
72.5 #
72.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
72.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
72.8 +#
72.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
72.10 +# Other names may be trademarks of their respective owners.
72.11 #
72.12 # The contents of this file are subject to the terms of either the GNU
72.13 # General Public License Version 2 only ("GPL") or the Common
72.14 @@ -12,9 +15,9 @@
72.15 # specific language governing permissions and limitations under the
72.16 # License. When distributing the software, include this License Header
72.17 # Notice in each file and include the License file at
72.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
72.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
72.20 # particular file as subject to the "Classpath" exception as provided
72.21 -# by Sun in the GPL Version 2 section of the License file that
72.22 +# by Oracle in the GPL Version 2 section of the License file that
72.23 # accompanied this code. If applicable, add the following below the
72.24 # License Header, with the fields enclosed by brackets [] replaced by
72.25 # your own identifying information:
73.1 --- a/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibEvent.java Fri Jul 16 11:47:36 2010 -0400
73.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibEvent.java Fri Jul 16 14:21:50 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/ComplibException.java Fri Jul 16 11:47:36 2010 -0400
74.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibException.java Fri Jul 16 14:21:50 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/ComplibListener.java Fri Jul 16 11:47:36 2010 -0400
75.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibListener.java Fri Jul 16 14:21:50 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.api/src/org/netbeans/modules/visualweb/complib/api/ComplibService.java Fri Jul 16 11:47:36 2010 -0400
76.2 +++ b/visualweb.complib.api/src/org/netbeans/modules/visualweb/complib/api/ComplibService.java Fri Jul 16 14:21:50 2010 -0400
76.3 @@ -1,7 +1,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 * The contents of this file are subject to the terms of either the GNU
76.14 * General Public License Version 2 only ("GPL") or the Common
76.15 @@ -13,9 +16,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/build.xml Fri Jul 16 11:47:36 2010 -0400
77.2 +++ b/visualweb.complib/build.xml Fri Jul 16 14:21:50 2010 -0400
77.3 @@ -2,7 +2,10 @@
77.4 <!--
77.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
77.6
77.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
77.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
77.9 +
77.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
77.11 +Other names may be trademarks of their respective owners.
77.12
77.13
77.14 The contents of this file are subject to the terms of either the GNU
77.15 @@ -15,9 +18,9 @@
77.16 specific language governing permissions and limitations under the
77.17 License. When distributing the software, include this License Header
77.18 Notice in each file and include the License file at
77.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
77.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
77.21 particular file as subject to the "Classpath" exception as provided
77.22 -by Sun in the GPL Version 2 section of the License file that
77.23 +by Oracle in the GPL Version 2 section of the License file that
77.24 accompanied this code. If applicable, add the following below the
77.25 License Header, with the fields enclosed by brackets [] replaced by
77.26 your own identifying information:
78.1 --- a/visualweb.complib/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
78.2 +++ b/visualweb.complib/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
78.3 @@ -1,6 +1,9 @@
78.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
78.5 #
78.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
78.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
78.8 +#
78.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
78.10 +# Other names may be trademarks of their respective owners.
78.11 #
78.12 # The contents of this file are subject to the terms of either the GNU
78.13 # General Public License Version 2 only ("GPL") or the Common
78.14 @@ -12,9 +15,9 @@
78.15 # specific language governing permissions and limitations under the
78.16 # License. When distributing the software, include this License Header
78.17 # Notice in each file and include the License file at
78.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
78.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
78.20 # particular file as subject to the "Classpath" exception as provided
78.21 -# by Sun in the GPL Version 2 section of the License file that
78.22 +# by Oracle in the GPL Version 2 section of the License file that
78.23 # accompanied this code. If applicable, add the following below the
78.24 # License Header, with the fields enclosed by brackets [] replaced by
78.25 # your own identifying information:
78.26 @@ -37,4 +40,4 @@
78.27 # Version 2 license, then the option applies only if the new code is
78.28 # made subject to such option by the copyright holder.
78.29
78.30 -javac.source=1.5
78.31 +javac.source=1.6
79.1 --- a/visualweb.complib/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
79.2 +++ b/visualweb.complib/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
79.3 @@ -2,7 +2,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
79.14 The contents of this file are subject to the terms of either the GNU
79.15 @@ -15,9 +18,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:
79.27 @@ -358,7 +361,15 @@
79.28 <build-prerequisite/>
79.29 <compile-dependency/>
79.30 <run-dependency>
79.31 - <specification-version>7.22</specification-version>
79.32 + <specification-version>8.0</specification-version>
79.33 + </run-dependency>
79.34 + </dependency>
79.35 + <dependency>
79.36 + <code-name-base>org.openide.util.lookup</code-name-base>
79.37 + <build-prerequisite/>
79.38 + <compile-dependency/>
79.39 + <run-dependency>
79.40 + <specification-version>8.0</specification-version>
79.41 </run-dependency>
79.42 </dependency>
79.43 <dependency>
80.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/BuiltInComplib.java Fri Jul 16 11:47:36 2010 -0400
80.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/BuiltInComplib.java Fri Jul 16 14:21:50 2010 -0400
80.3 @@ -1,7 +1,10 @@
80.4 /*
80.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
80.6 *
80.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
80.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
80.9 + *
80.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
80.11 + * Other names may be trademarks of their respective owners.
80.12 *
80.13 * The contents of this file are subject to the terms of either the GNU
80.14 * General Public License Version 2 only ("GPL") or the Common
80.15 @@ -13,9 +16,9 @@
80.16 * specific language governing permissions and limitations under the
80.17 * License. When distributing the software, include this License Header
80.18 * Notice in each file and include the License file at
80.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
80.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
80.21 * particular file as subject to the "Classpath" exception as provided
80.22 - * by Sun in the GPL Version 2 section of the License file that
80.23 + * by Oracle in the GPL Version 2 section of the License file that
80.24 * accompanied this code. If applicable, add the following below the
80.25 * License Header, with the fields enclosed by brackets [] replaced by
80.26 * your own identifying information:
81.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
81.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Bundle.properties Fri Jul 16 14:21:50 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/BundleBuiltIn.properties Fri Jul 16 11:47:36 2010 -0400
82.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/BundleBuiltIn.properties Fri Jul 16 14:21:50 2010 -0400
82.3 @@ -1,6 +1,9 @@
82.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
82.5 #
82.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
82.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
82.8 +#
82.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
82.10 +# Other names may be trademarks of their respective owners.
82.11 #
82.12 # The contents of this file are subject to the terms of either the GNU
82.13 # General Public License Version 2 only ("GPL") or the Common
82.14 @@ -12,9 +15,9 @@
82.15 # specific language governing permissions and limitations under the
82.16 # License. When distributing the software, include this License Header
82.17 # Notice in each file and include the License file at
82.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
82.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
82.20 # particular file as subject to the "Classpath" exception as provided
82.21 -# by Sun in the GPL Version 2 section of the License file that
82.22 +# by Oracle in the GPL Version 2 section of the License file that
82.23 # accompanied this code. If applicable, add the following below the
82.24 # License Header, with the fields enclosed by brackets [] replaced by
82.25 # your own identifying information:
83.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Complib.java Fri Jul 16 11:47:36 2010 -0400
83.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Complib.java Fri Jul 16 14:21:50 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/ComplibManifest.java Fri Jul 16 11:47:36 2010 -0400
84.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibManifest.java Fri Jul 16 14:21:50 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/ComplibModuleInstall.java Fri Jul 16 11:47:36 2010 -0400
85.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibModuleInstall.java Fri Jul 16 14:21:50 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/ComplibPackage.java Fri Jul 16 11:47:36 2010 -0400
86.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibPackage.java Fri Jul 16 14:21:50 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/ComplibPaletteItemDataObject.java Fri Jul 16 11:47:36 2010 -0400
87.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibPaletteItemDataObject.java Fri Jul 16 14:21:50 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/ComplibServiceProvider.java Fri Jul 16 11:47:36 2010 -0400
88.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ComplibServiceProvider.java Fri Jul 16 14:21:50 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/ExtensionComplib.java Fri Jul 16 11:47:36 2010 -0400
89.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ExtensionComplib.java Fri Jul 16 14:21:50 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/IdeUtil.java Fri Jul 16 11:47:36 2010 -0400
90.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/IdeUtil.java Fri Jul 16 14:21:50 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:
90.27 @@ -373,8 +376,7 @@
90.28 String doTempCopy = System.getProperty("toolbox.makeTempCopy", Boolean // NOI18N
90.29 .toString(isWindows));
90.30
90.31 - // In JDK 1.5 we can use Boolean.parseBoolean() instead
90.32 - if (!Boolean.valueOf(doTempCopy).booleanValue()) {
90.33 + if (!Boolean.parseBoolean(doTempCopy)) {
90.34 return origFile;
90.35 }
90.36
91.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/JavaHelpStorage.java Fri Jul 16 11:47:36 2010 -0400
91.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/JavaHelpStorage.java Fri Jul 16 14:21:50 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/LibraryLocalizationBundle.java Fri Jul 16 11:47:36 2010 -0400
92.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/LibraryLocalizationBundle.java Fri Jul 16 14:21:50 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/ManifestAttributeException.java Fri Jul 16 11:47:36 2010 -0400
93.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ManifestAttributeException.java Fri Jul 16 14:21:50 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/PaletteUtil.java Fri Jul 16 11:47:36 2010 -0400
94.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/PaletteUtil.java Fri Jul 16 14:21:50 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/Scope.java Fri Jul 16 11:47:36 2010 -0400
95.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Scope.java Fri Jul 16 14:21:50 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/SharedComplib.java Fri Jul 16 11:47:36 2010 -0400
96.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/SharedComplib.java Fri Jul 16 14:21:50 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/Version.java Fri Jul 16 11:47:36 2010 -0400
97.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/Version.java Fri Jul 16 14:21:50 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/XmlException.java Fri Jul 16 11:47:36 2010 -0400
98.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/XmlException.java Fri Jul 16 14:21:50 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/XmlUtil.java Fri Jul 16 11:47:36 2010 -0400
99.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/XmlUtil.java Fri Jul 16 14:21:50 2010 -0400
99.3 @@ -1,7 +1,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 * The contents of this file are subject to the terms of either the GNU
99.14 * General Public License Version 2 only ("GPL") or the Common
99.15 @@ -13,9 +16,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/layer.xml Fri Jul 16 11:47:36 2010 -0400
100.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/layer.xml Fri Jul 16 14:21:50 2010 -0400
100.3 @@ -2,7 +2,10 @@
100.4 <!--
100.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
100.6
100.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
100.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
100.9 +
100.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
100.11 +Other names may be trademarks of their respective owners.
100.12
100.13
100.14 The contents of this file are subject to the terms of either the GNU
100.15 @@ -15,9 +18,9 @@
100.16 specific language governing permissions and limitations under the
100.17 License. When distributing the software, include this License Header
100.18 Notice in each file and include the License file at
100.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
100.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
100.21 particular file as subject to the "Classpath" exception as provided
100.22 -by Sun in the GPL Version 2 section of the License file that
100.23 +by Oracle in the GPL Version 2 section of the License file that
100.24 accompanied this code. If applicable, add the following below the
100.25 License Header, with the fields enclosed by brackets [] replaced by
100.26 your own identifying information:
101.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
101.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
101.3 @@ -1,6 +1,9 @@
101.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
101.5 #
101.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
101.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
101.8 +#
101.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
101.10 +# Other names may be trademarks of their respective owners.
101.11 #
101.12 # The contents of this file are subject to the terms of either the GNU
101.13 # General Public License Version 2 only ("GPL") or the Common
101.14 @@ -12,9 +15,9 @@
101.15 # specific language governing permissions and limitations under the
101.16 # License. When distributing the software, include this License Header
101.17 # Notice in each file and include the License file at
101.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
101.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
101.20 # particular file as subject to the "Classpath" exception as provided
101.21 -# by Sun in the GPL Version 2 section of the License file that
101.22 +# by Oracle in the GPL Version 2 section of the License file that
101.23 # accompanied this code. If applicable, add the following below the
101.24 # License Header, with the fields enclosed by brackets [] replaced by
101.25 # your own identifying information:
102.1 --- a/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/CompLibManagerPanel.java Fri Jul 16 11:47:36 2010 -0400
102.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/CompLibManagerPanel.java Fri Jul 16 14:21:50 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/ComplibAdvancedOption.java Fri Jul 16 11:47:36 2010 -0400
103.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibAdvancedOption.java Fri Jul 16 14:21:50 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/ComplibChooser.java Fri Jul 16 11:47:36 2010 -0400
104.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibChooser.java Fri Jul 16 14:21:50 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/ComplibOptionsPanel.java Fri Jul 16 11:47:36 2010 -0400
105.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibOptionsPanel.java Fri Jul 16 14:21:50 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/ComplibOptionsPanelController.java Fri Jul 16 11:47:36 2010 -0400
106.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibOptionsPanelController.java Fri Jul 16 14:21:50 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/ComplibsRootNode.java Fri Jul 16 11:47:36 2010 -0400
107.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComplibsRootNode.java Fri Jul 16 14:21:50 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/ComponentLibraryManagerAction.java Fri Jul 16 11:47:36 2010 -0400
108.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComponentLibraryManagerAction.java Fri Jul 16 14:21:50 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/ComponentsPanel.java Fri Jul 16 11:47:36 2010 -0400
109.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ComponentsPanel.java Fri Jul 16 14:21:50 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/HelpSourcesDetailPanel.java Fri Jul 16 11:47:36 2010 -0400
110.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/HelpSourcesDetailPanel.java Fri Jul 16 14:21:50 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/ImportComplibPanel.java Fri Jul 16 11:47:36 2010 -0400
111.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/ImportComplibPanel.java Fri Jul 16 14:21:50 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/MainDetailPanel.java Fri Jul 16 11:47:36 2010 -0400
112.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/MainDetailPanel.java Fri Jul 16 14:21:50 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/PathDetailPanel.java Fri Jul 16 11:47:36 2010 -0400
113.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/PathDetailPanel.java Fri Jul 16 14:21:50 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/PathListModel.java Fri Jul 16 11:47:36 2010 -0400
114.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/PathListModel.java Fri Jul 16 14:21:50 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/SharedComplibAction.java Fri Jul 16 11:47:36 2010 -0400
115.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/SharedComplibAction.java Fri Jul 16 14:21:50 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/SharedComplibPanel.java Fri Jul 16 11:47:36 2010 -0400
116.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/SharedComplibPanel.java Fri Jul 16 14:21:50 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.complib/src/org/netbeans/modules/visualweb/complib/ui/TableSorter.java Fri Jul 16 11:47:36 2010 -0400
117.2 +++ b/visualweb.complib/src/org/netbeans/modules/visualweb/complib/ui/TableSorter.java Fri Jul 16 14:21:50 2010 -0400
117.3 @@ -1,7 +1,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 * The contents of this file are subject to the terms of either the GNU
117.14 * General Public License Version 2 only ("GPL") or the Common
117.15 @@ -13,9 +16,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/build.xml Fri Jul 16 11:47:36 2010 -0400
118.2 +++ b/visualweb.dataconnectivity.designtime/build.xml Fri Jul 16 14:21:50 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/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
119.2 +++ b/visualweb.dataconnectivity.designtime/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
119.3 @@ -2,7 +2,10 @@
119.4 <!--
119.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
119.6
119.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
119.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
119.9 +
119.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
119.11 +Other names may be trademarks of their respective owners.
119.12
119.13
119.14 The contents of this file are subject to the terms of either the GNU
119.15 @@ -15,9 +18,9 @@
119.16 specific language governing permissions and limitations under the
119.17 License. When distributing the software, include this License Header
119.18 Notice in each file and include the License file at
119.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
119.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
119.21 particular file as subject to the "Classpath" exception as provided
119.22 -by Sun in the GPL Version 2 section of the License file that
119.23 +by Oracle in the GPL Version 2 section of the License file that
119.24 accompanied this code. If applicable, add the following below the
119.25 License Header, with the fields enclosed by brackets [] replaced by
119.26 your own identifying information:
119.27 @@ -94,7 +97,15 @@
119.28 <build-prerequisite/>
119.29 <compile-dependency/>
119.30 <run-dependency>
119.31 - <specification-version>7.9</specification-version>
119.32 + <specification-version>8.0</specification-version>
119.33 + </run-dependency>
119.34 + </dependency>
119.35 + <dependency>
119.36 + <code-name-base>org.openide.util.lookup</code-name-base>
119.37 + <build-prerequisite/>
119.38 + <compile-dependency/>
119.39 + <run-dependency>
119.40 + <specification-version>8.0</specification-version>
119.41 </run-dependency>
119.42 </dependency>
119.43 </module-dependencies>
120.1 --- a/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
120.2 +++ b/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
120.3 @@ -1,6 +1,9 @@
120.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
120.5 #
120.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
120.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
120.8 +#
120.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
120.10 +# Other names may be trademarks of their respective owners.
120.11 #
120.12 # The contents of this file are subject to the terms of either the GNU
120.13 # General Public License Version 2 only ("GPL") or the Common
120.14 @@ -12,9 +15,9 @@
120.15 # specific language governing permissions and limitations under the
120.16 # License. When distributing the software, include this License Header
120.17 # Notice in each file and include the License file at
120.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
120.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
120.20 # particular file as subject to the "Classpath" exception as provided
120.21 -# by Sun in the GPL Version 2 section of the License file that
120.22 +# by Oracle in the GPL Version 2 section of the License file that
120.23 # accompanied this code. If applicable, add the following below the
120.24 # License Header, with the fields enclosed by brackets [] replaced by
120.25 # your own identifying information:
121.1 --- a/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/CachedRowSetXImplBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
121.2 +++ b/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/CachedRowSetXImplBeanInfo.java Fri Jul 16 14:21:50 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/CachedRowSetXImplDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
122.2 +++ b/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/CachedRowSetXImplDesignInfo.java Fri Jul 16 14:21:50 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.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/Log.java Fri Jul 16 11:47:36 2010 -0400
123.2 +++ b/visualweb.dataconnectivity.designtime/src/org/netbeans/modules/visualweb/dataconnectivity/designtime/Log.java Fri Jul 16 14:21:50 2010 -0400
123.3 @@ -1,7 +1,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 * The contents of this file are subject to the terms of either the GNU
123.14 * General Public License Version 2 only ("GPL") or the Common
123.15 @@ -13,9 +16,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/build.xml Fri Jul 16 11:47:36 2010 -0400
124.2 +++ b/visualweb.dataconnectivity/build.xml Fri Jul 16 14:21:50 2010 -0400
124.3 @@ -2,7 +2,10 @@
124.4 <!--
124.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
124.6
124.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
124.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
124.9 +
124.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
124.11 +Other names may be trademarks of their respective owners.
124.12
124.13
124.14 The contents of this file are subject to the terms of either the GNU
124.15 @@ -15,9 +18,9 @@
124.16 specific language governing permissions and limitations under the
124.17 License. When distributing the software, include this License Header
124.18 Notice in each file and include the License file at
124.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
124.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
124.21 particular file as subject to the "Classpath" exception as provided
124.22 -by Sun in the GPL Version 2 section of the License file that
124.23 +by Oracle in the GPL Version 2 section of the License file that
124.24 accompanied this code. If applicable, add the following below the
124.25 License Header, with the fields enclosed by brackets [] replaced by
124.26 your own identifying information:
125.1 --- a/visualweb.dataconnectivity/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
125.2 +++ b/visualweb.dataconnectivity/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
125.3 @@ -1,6 +1,9 @@
125.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
125.5 #
125.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
125.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
125.8 +#
125.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
125.10 +# Other names may be trademarks of their respective owners.
125.11 #
125.12 # The contents of this file are subject to the terms of either the GNU
125.13 # General Public License Version 2 only ("GPL") or the Common
125.14 @@ -12,9 +15,9 @@
125.15 # specific language governing permissions and limitations under the
125.16 # License. When distributing the software, include this License Header
125.17 # Notice in each file and include the License file at
125.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
125.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
125.20 # particular file as subject to the "Classpath" exception as provided
125.21 -# by Sun in the GPL Version 2 section of the License file that
125.22 +# by Oracle in the GPL Version 2 section of the License file that
125.23 # accompanied this code. If applicable, add the following below the
125.24 # License Header, with the fields enclosed by brackets [] replaced by
125.25 # your own identifying information:
125.26 @@ -39,7 +42,7 @@
125.27
125.28 cp.extra=build/fake-jdbc-40/build
125.29 javac.compilerargs=-Xlint:unchecked
125.30 -javac.source=1.5
125.31 +javac.source=1.6
125.32 # WORKAROUND: dataconnectivity has nonstandard manifest file name
125.33 # manifest.mf=Manifest.mf
125.34 extra.module.files=\
126.1 --- a/visualweb.dataconnectivity/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
126.2 +++ b/visualweb.dataconnectivity/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
126.3 @@ -2,7 +2,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
126.14 The contents of this file are subject to the terms of either the GNU
126.15 @@ -15,9 +18,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:
126.27 @@ -321,7 +324,15 @@
126.28 <build-prerequisite/>
126.29 <compile-dependency/>
126.30 <run-dependency>
126.31 - <specification-version>7.22</specification-version>
126.32 + <specification-version>8.0</specification-version>
126.33 + </run-dependency>
126.34 + </dependency>
126.35 + <dependency>
126.36 + <code-name-base>org.openide.util.lookup</code-name-base>
126.37 + <build-prerequisite/>
126.38 + <compile-dependency/>
126.39 + <run-dependency>
126.40 + <specification-version>8.0</specification-version>
126.41 </run-dependency>
126.42 </dependency>
126.43 <dependency>
127.1 --- a/visualweb.dataconnectivity/release/startup/samples/CreateDerbyTravelDB.java Fri Jul 16 11:47:36 2010 -0400
127.2 +++ b/visualweb.dataconnectivity/release/startup/samples/CreateDerbyTravelDB.java Fri Jul 16 14:21:50 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-2009 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-Travel-derby.sql Fri Jul 16 11:47:36 2010 -0400
128.2 +++ b/visualweb.dataconnectivity/release/startup/samples/create-Travel-derby.sql Fri Jul 16 14:21:50 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-Travel.sql Fri Jul 16 11:47:36 2010 -0400
129.2 +++ b/visualweb.dataconnectivity/release/startup/samples/create-schema-Travel.sql Fri Jul 16 14:21:50 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-schema-vir-derby.sql Fri Jul 16 11:47:36 2010 -0400
130.2 +++ b/visualweb.dataconnectivity/release/startup/samples/create-schema-vir-derby.sql Fri Jul 16 14:21:50 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/create-vir-derby.sql Fri Jul 16 11:47:36 2010 -0400
131.2 +++ b/visualweb.dataconnectivity/release/startup/samples/create-vir-derby.sql Fri Jul 16 14:21:50 2010 -0400
131.3 @@ -1,7 +1,10 @@
131.4
131.5 -- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
131.6
131.7 --- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
131.8 +-- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
131.9 +--
131.10 +-- Oracle and Java are registered trademarks of Oracle and/or its affiliates.
131.11 +-- Other names may be trademarks of their respective owners.
131.12
131.13 -- The contents of this file are subject to the terms of either the GNU
131.14 -- General Public License Version 2 only ("GPL") or the Common
131.15 @@ -13,9 +16,9 @@
131.16 -- specific language governing permissions and limitations under the
131.17 -- License. When distributing the software, include this License Header
131.18 -- Notice in each file and include the License file at
131.19 --- nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
131.20 +-- nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
131.21 -- particular file as subject to the "Classpath" exception as provided
131.22 --- by Sun in the GPL Version 2 section of the License file that
131.23 +-- by Oracle in the GPL Version 2 section of the License file that
131.24 -- accompanied this code. If applicable, add the following below the
131.25 -- License Header, with the fields enclosed by brackets [] replaced by
131.26 -- your own identifying information:
132.1 --- a/visualweb.dataconnectivity/release/startup/samples/ws_urls.properties Fri Jul 16 11:47:36 2010 -0400
132.2 +++ b/visualweb.dataconnectivity/release/startup/samples/ws_urls.properties Fri Jul 16 14:21:50 2010 -0400
132.3 @@ -1,6 +1,9 @@
132.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
132.5 #
132.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
132.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
132.8 +#
132.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
132.10 +# Other names may be trademarks of their respective owners.
132.11 #
132.12 # The contents of this file are subject to the terms of either the GNU
132.13 # General Public License Version 2 only ("GPL") or the Common
132.14 @@ -12,9 +15,9 @@
132.15 # specific language governing permissions and limitations under the
132.16 # License. When distributing the software, include this License Header
132.17 # Notice in each file and include the License file at
132.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
132.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
132.20 # particular file as subject to the "Classpath" exception as provided
132.21 -# by Sun in the GPL Version 2 section of the License file that
132.22 +# by Oracle in the GPL Version 2 section of the License file that
132.23 # accompanied this code. If applicable, add the following below the
132.24 # License Header, with the fields enclosed by brackets [] replaced by
132.25 # your own identifying information:
133.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
133.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/Bundle.properties Fri Jul 16 14:21:50 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/DataconnectivityModuleInstaller.java Fri Jul 16 11:47:36 2010 -0400
134.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/DataconnectivityModuleInstaller.java Fri Jul 16 14:21:50 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/DataconnectivitySettings.java Fri Jul 16 11:47:36 2010 -0400
135.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/DataconnectivitySettings.java Fri Jul 16 14:21:50 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/DataconnectivitySettingsBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
136.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/DataconnectivitySettingsBeanInfo.java Fri Jul 16 14:21:50 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/Log.java Fri Jul 16 11:47:36 2010 -0400
137.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/Log.java Fri Jul 16 14:21:50 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/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
138.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/Bundle.properties Fri Jul 16 14:21:50 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/RowSetSelection.java Fri Jul 16 11:47:36 2010 -0400
139.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/RowSetSelection.java Fri Jul 16 14:21:50 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/RowSetSelectionQuery.java Fri Jul 16 11:47:36 2010 -0400
140.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/RowSetSelectionQuery.java Fri Jul 16 14:21:50 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/SqlCommandCustomizer.java Fri Jul 16 11:47:36 2010 -0400
141.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/SqlCommandCustomizer.java Fri Jul 16 14:21:50 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/customizers/VisualSQLEditorMetaDataImpl.java Fri Jul 16 11:47:36 2010 -0400
142.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/customizers/VisualSQLEditorMetaDataImpl.java Fri Jul 16 14:21:50 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/BrokenDataSourceSupport.java Fri Jul 16 11:47:36 2010 -0400
143.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/BrokenDataSourceSupport.java Fri Jul 16 14:21:50 2010 -0400
143.3 @@ -1,7 +1,10 @@
143.4 /*
143.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
143.6 *
143.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
143.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
143.9 + *
143.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
143.11 + * Other names may be trademarks of their respective owners.
143.12 *
143.13 * The contents of this file are subject to the terms of either the GNU
143.14 * General Public License Version 2 only ("GPL") or the Common
143.15 @@ -13,9 +16,9 @@
143.16 * specific language governing permissions and limitations under the
143.17 * License. When distributing the software, include this License Header
143.18 * Notice in each file and include the License file at
143.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
143.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
143.21 * particular file as subject to the "Classpath" exception as provided
143.22 - * by Sun in the GPL Version 2 section of the License file that
143.23 + * by Oracle in the GPL Version 2 section of the License file that
143.24 * accompanied this code. If applicable, add the following below the
143.25 * License Header, with the fields enclosed by brackets [] replaced by
143.26 * your own identifying information:
144.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
144.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
144.3 @@ -1,6 +1,9 @@
144.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
144.5 #
144.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
144.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
144.8 +#
144.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
144.10 +# Other names may be trademarks of their respective owners.
144.11 #
144.12 # The contents of this file are subject to the terms of either the GNU
144.13 # General Public License Version 2 only ("GPL") or the Common
144.14 @@ -12,9 +15,9 @@
144.15 # specific language governing permissions and limitations under the
144.16 # License. When distributing the software, include this License Header
144.17 # Notice in each file and include the License file at
144.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
144.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
144.20 # particular file as subject to the "Classpath" exception as provided
144.21 -# by Sun in the GPL Version 2 section of the License file that
144.22 +# by Oracle in the GPL Version 2 section of the License file that
144.23 # accompanied this code. If applicable, add the following below the
144.24 # License Header, with the fields enclosed by brackets [] replaced by
144.25 # your own identifying information:
145.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/CurrentProject.java Fri Jul 16 11:47:36 2010 -0400
145.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/CurrentProject.java Fri Jul 16 14:21:50 2010 -0400
145.3 @@ -2,7 +2,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 @@ -14,9 +17,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/datasource/DataSourceResolver.java Fri Jul 16 11:47:36 2010 -0400
146.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/DataSourceResolver.java Fri Jul 16 14:21:50 2010 -0400
146.3 @@ -1,7 +1,10 @@
146.4 /*
146.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
146.6 *
146.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
146.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
146.9 + *
146.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
146.11 + * Other names may be trademarks of their respective owners.
146.12 *
146.13 * The contents of this file are subject to the terms of either the GNU
146.14 * General Public License Version 2 only ("GPL") or the Common
146.15 @@ -13,9 +16,9 @@
146.16 * specific language governing permissions and limitations under the
146.17 * License. When distributing the software, include this License Header
146.18 * Notice in each file and include the License file at
146.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
146.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
146.21 * particular file as subject to the "Classpath" exception as provided
146.22 - * by Sun in the GPL Version 2 section of the License file that
146.23 + * by Oracle in the GPL Version 2 section of the License file that
146.24 * accompanied this code. If applicable, add the following below the
146.25 * License Header, with the fields enclosed by brackets [] replaced by
146.26 * your own identifying information:
147.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
147.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
147.3 @@ -1,6 +1,9 @@
147.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
147.5 #
147.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
147.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
147.8 +#
147.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
147.10 +# Other names may be trademarks of their respective owners.
147.11 #
147.12 # The contents of this file are subject to the terms of either the GNU
147.13 # General Public License Version 2 only ("GPL") or the Common
147.14 @@ -12,9 +15,9 @@
147.15 # specific language governing permissions and limitations under the
147.16 # License. When distributing the software, include this License Header
147.17 # Notice in each file and include the License file at
147.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
147.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
147.20 # particular file as subject to the "Classpath" exception as provided
147.21 -# by Sun in the GPL Version 2 section of the License file that
147.22 +# by Oracle in the GPL Version 2 section of the License file that
147.23 # accompanied this code. If applicable, add the following below the
147.24 # License Header, with the fields enclosed by brackets [] replaced by
147.25 # your own identifying information:
148.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/DataSourcePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
148.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/DataSourcePropertyEditor.java Fri Jul 16 14:21:50 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/ProjectDataSourceNode.java Fri Jul 16 11:47:36 2010 -0400
149.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/ProjectDataSourceNode.java Fri Jul 16 14:21:50 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/ProjectDataSourceNodeChildren.java Fri Jul 16 11:47:36 2010 -0400
150.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/ProjectDataSourceNodeChildren.java Fri Jul 16 14:21:50 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/explorer/RowSetBeanCreateInfoSet.java Fri Jul 16 11:47:36 2010 -0400
151.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/RowSetBeanCreateInfoSet.java Fri Jul 16 14:21:50 2010 -0400
151.3 @@ -1,7 +1,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 * The contents of this file are subject to the terms of either the GNU
151.14 * General Public License Version 2 only ("GPL") or the Common
151.15 @@ -13,9 +16,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/mf-layer.xml Fri Jul 16 11:47:36 2010 -0400
152.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/mf-layer.xml Fri Jul 16 14:21:50 2010 -0400
152.3 @@ -2,7 +2,10 @@
152.4 <!--
152.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
152.6
152.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
152.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
152.9 +
152.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
152.11 +Other names may be trademarks of their respective owners.
152.12
152.13
152.14 The contents of this file are subject to the terms of either the GNU
152.15 @@ -15,9 +18,9 @@
152.16 specific language governing permissions and limitations under the
152.17 License. When distributing the software, include this License Header
152.18 Notice in each file and include the License file at
152.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
152.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
152.21 particular file as subject to the "Classpath" exception as provided
152.22 -by Sun in the GPL Version 2 section of the License file that
152.23 +by Oracle in the GPL Version 2 section of the License file that
152.24 accompanied this code. If applicable, add the following below the
152.25 License Header, with the fields enclosed by brackets [] replaced by
152.26 your own identifying information:
153.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
153.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
153.3 @@ -1,6 +1,9 @@
153.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
153.5 #
153.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
153.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
153.8 +#
153.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
153.10 +# Other names may be trademarks of their respective owners.
153.11 #
153.12 # The contents of this file are subject to the terms of either the GNU
153.13 # General Public License Version 2 only ("GPL") or the Common
153.14 @@ -12,9 +15,9 @@
153.15 # specific language governing permissions and limitations under the
153.16 # License. When distributing the software, include this License Header
153.17 # Notice in each file and include the License file at
153.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
153.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
153.20 # particular file as subject to the "Classpath" exception as provided
153.21 -# by Sun in the GPL Version 2 section of the License file that
153.22 +# by Oracle in the GPL Version 2 section of the License file that
153.23 # accompanied this code. If applicable, add the following below the
153.24 # License Header, with the fields enclosed by brackets [] replaced by
153.25 # your own identifying information:
154.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfo.java Fri Jul 16 11:47:36 2010 -0400
154.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfo.java Fri Jul 16 14:21:50 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/DataSourceInfoEvent.java Fri Jul 16 11:47:36 2010 -0400
155.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfoEvent.java Fri Jul 16 14:21:50 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/DataSourceInfoListener.java Fri Jul 16 11:47:36 2010 -0400
156.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DataSourceInfoListener.java Fri Jul 16 14:21:50 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/DatasourceConnectionListener.java Fri Jul 16 11:47:36 2010 -0400
157.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DatasourceConnectionListener.java Fri Jul 16 14:21:50 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/DatasourceTransferManager.java Fri Jul 16 11:47:36 2010 -0400
158.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/DatasourceTransferManager.java Fri Jul 16 14:21:50 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/OpenProjectDetector.java Fri Jul 16 11:47:36 2010 -0400
159.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/OpenProjectDetector.java Fri Jul 16 14:21:50 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/ProjectChangeEvent.java Fri Jul 16 11:47:36 2010 -0400
160.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/ProjectChangeEvent.java Fri Jul 16 14:21:50 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/ProjectChangeListener.java Fri Jul 16 11:47:36 2010 -0400
161.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/ProjectChangeListener.java Fri Jul 16 14:21:50 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/model/ProjectDataSourceManager.java Fri Jul 16 11:47:36 2010 -0400
162.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/model/ProjectDataSourceManager.java Fri Jul 16 14:21:50 2010 -0400
162.3 @@ -1,7 +1,10 @@
162.4 /*
162.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
162.6 *
162.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
162.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
162.9 + *
162.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
162.11 + * Other names may be trademarks of their respective owners.
162.12 *
162.13 * The contents of this file are subject to the terms of either the GNU
162.14 * General Public License Version 2 only ("GPL") or the Common
162.15 @@ -13,9 +16,9 @@
162.16 * specific language governing permissions and limitations under the
162.17 * License. When distributing the software, include this License Header
162.18 * Notice in each file and include the License file at
162.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
162.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
162.21 * particular file as subject to the "Classpath" exception as provided
162.22 - * by Sun in the GPL Version 2 section of the License file that
162.23 + * by Oracle in the GPL Version 2 section of the License file that
162.24 * accompanied this code. If applicable, add the following below the
162.25 * License Header, with the fields enclosed by brackets [] replaced by
162.26 * your own identifying information:
163.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
163.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
163.3 @@ -1,6 +1,9 @@
163.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
163.5 #
163.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
163.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
163.8 +#
163.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
163.10 +# Other names may be trademarks of their respective owners.
163.11 #
163.12 # The contents of this file are subject to the terms of either the GNU
163.13 # General Public License Version 2 only ("GPL") or the Common
163.14 @@ -12,9 +15,9 @@
163.15 # specific language governing permissions and limitations under the
163.16 # License. When distributing the software, include this License Header
163.17 # Notice in each file and include the License file at
163.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
163.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
163.20 # particular file as subject to the "Classpath" exception as provided
163.21 -# by Sun in the GPL Version 2 section of the License file that
163.22 +# by Oracle in the GPL Version 2 section of the License file that
163.23 # accompanied this code. If applicable, add the following below the
163.24 # License Header, with the fields enclosed by brackets [] replaced by
163.25 # your own identifying information:
164.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ContextPersistance.java Fri Jul 16 11:47:36 2010 -0400
164.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ContextPersistance.java Fri Jul 16 14:21:50 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/DatabaseSettingsImporter.java Fri Jul 16 11:47:36 2010 -0400
165.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java Fri Jul 16 14:21:50 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/DerbyWaiter.java Fri Jul 16 11:47:36 2010 -0400
166.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DerbyWaiter.java Fri Jul 16 14:21:50 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/DesignTimeContext.java Fri Jul 16 11:47:36 2010 -0400
167.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeContext.java Fri Jul 16 14:21:50 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/DesignTimeInitialContextFactory.java Fri Jul 16 11:47:36 2010 -0400
168.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeInitialContextFactory.java Fri Jul 16 14:21:50 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/DesignTimeNameParser.java Fri Jul 16 11:47:36 2010 -0400
169.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeNameParser.java Fri Jul 16 14:21:50 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/DesignTimeNamingEnumeration.java Fri Jul 16 11:47:36 2010 -0400
170.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DesignTimeNamingEnumeration.java Fri Jul 16 14:21:50 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/Log.java Fri Jul 16 11:47:36 2010 -0400
171.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/Log.java Fri Jul 16 14:21:50 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/LogBase.java Fri Jul 16 11:47:36 2010 -0400
172.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/LogBase.java Fri Jul 16 14:21:50 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/ObjectChangeEvent.java Fri Jul 16 11:47:36 2010 -0400
173.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ObjectChangeEvent.java Fri Jul 16 14:21:50 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/naming/ObjectChangeListener.java Fri Jul 16 11:47:36 2010 -0400
174.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/ObjectChangeListener.java Fri Jul 16 14:21:50 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/ProjectDataSourceChangeEvent.java Fri Jul 16 11:47:36 2010 -0400
175.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceChangeEvent.java Fri Jul 16 14:21:50 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/ProjectDataSourceListener.java Fri Jul 16 11:47:36 2010 -0400
176.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceListener.java Fri Jul 16 14:21:50 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/ProjectDataSourceServiceImpl.java Fri Jul 16 11:47:36 2010 -0400
177.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceServiceImpl.java Fri Jul 16 14:21:50 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/ProjectDataSourceTracker.java Fri Jul 16 11:47:36 2010 -0400
178.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourceTracker.java Fri Jul 16 14:21:50 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/ProjectDataSourcesChangeEvent.java Fri Jul 16 11:47:36 2010 -0400
179.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourcesChangeEvent.java Fri Jul 16 14:21:50 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/ProjectDataSourcesListener.java Fri Jul 16 11:47:36 2010 -0400
180.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectDataSourcesListener.java Fri Jul 16 14:21:50 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/ProjectOpenedEvent.java Fri Jul 16 11:47:36 2010 -0400
181.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectOpenedEvent.java Fri Jul 16 14:21:50 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/project/datasource/ProjectOpenedListener.java Fri Jul 16 11:47:36 2010 -0400
182.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/project/datasource/ProjectOpenedListener.java Fri Jul 16 14:21:50 2010 -0400
182.3 @@ -1,7 +1,10 @@
182.4 /*
182.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
182.6 *
182.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
182.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
182.9 + *
182.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
182.11 + * Other names may be trademarks of their respective owners.
182.12 *
182.13 * The contents of this file are subject to the terms of either the GNU
182.14 * General Public License Version 2 only ("GPL") or the Common
182.15 @@ -13,9 +16,9 @@
182.16 * specific language governing permissions and limitations under the
182.17 * License. When distributing the software, include this License Header
182.18 * Notice in each file and include the License file at
182.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
182.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
182.21 * particular file as subject to the "Classpath" exception as provided
182.22 - * by Sun in the GPL Version 2 section of the License file that
182.23 + * by Oracle in the GPL Version 2 section of the License file that
182.24 * accompanied this code. If applicable, add the following below the
182.25 * License Header, with the fields enclosed by brackets [] replaced by
182.26 * your own identifying information:
183.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
183.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
183.3 @@ -1,6 +1,9 @@
183.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
183.5 #
183.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
183.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
183.8 +#
183.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
183.10 +# Other names may be trademarks of their respective owners.
183.11 #
183.12 # The contents of this file are subject to the terms of either the GNU
183.13 # General Public License Version 2 only ("GPL") or the Common
183.14 @@ -12,9 +15,9 @@
183.15 # specific language governing permissions and limitations under the
183.16 # License. When distributing the software, include this License Header
183.17 # Notice in each file and include the License file at
183.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
183.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
183.20 # particular file as subject to the "Classpath" exception as provided
183.21 -# by Sun in the GPL Version 2 section of the License file that
183.22 +# by Oracle in the GPL Version 2 section of the License file that
183.23 # accompanied this code. If applicable, add the following below the
183.24 # License Header, with the fields enclosed by brackets [] replaced by
183.25 # your own identifying information:
184.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ColumnMetaData.java Fri Jul 16 11:47:36 2010 -0400
184.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ColumnMetaData.java Fri Jul 16 14:21:50 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/ColumnMetaDataHelper.java Fri Jul 16 11:47:36 2010 -0400
185.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ColumnMetaDataHelper.java Fri Jul 16 14:21:50 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/DataSourceExport.java Fri Jul 16 11:47:36 2010 -0400
186.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DataSourceExport.java Fri Jul 16 14:21:50 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/DataSourceImport.java Fri Jul 16 11:47:36 2010 -0400
187.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DataSourceImport.java Fri Jul 16 14:21:50 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/DatabaseMetaDataHelper.java Fri Jul 16 11:47:36 2010 -0400
188.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DatabaseMetaDataHelper.java Fri Jul 16 14:21:50 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/DesignTimeConnection.java Fri Jul 16 11:47:36 2010 -0400
189.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeConnection.java Fri Jul 16 14:21:50 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/DesignTimeDataSource.java Fri Jul 16 11:47:36 2010 -0400
190.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSource.java Fri Jul 16 14:21:50 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/DesignTimeDataSourceAlias.java Fri Jul 16 11:47:36 2010 -0400
191.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceAlias.java Fri Jul 16 14:21:50 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/DesignTimeDataSourceHelper.java Fri Jul 16 11:47:36 2010 -0400
192.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java Fri Jul 16 14:21:50 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/Log.java Fri Jul 16 11:47:36 2010 -0400
193.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/Log.java Fri Jul 16 14:21:50 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/ProcedureColumnMetaData.java Fri Jul 16 11:47:36 2010 -0400
194.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ProcedureColumnMetaData.java Fri Jul 16 14:21:50 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/ProcedureMetaData.java Fri Jul 16 11:47:36 2010 -0400
195.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/ProcedureMetaData.java Fri Jul 16 14:21:50 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/sql/TableMetaData.java Fri Jul 16 11:47:36 2010 -0400
196.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/TableMetaData.java Fri Jul 16 14:21:50 2010 -0400
196.3 @@ -1,7 +1,10 @@
196.4 /*
196.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
196.6 *
196.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
196.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
196.9 + *
196.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
196.11 + * Other names may be trademarks of their respective owners.
196.12 *
196.13 * The contents of this file are subject to the terms of either the GNU
196.14 * General Public License Version 2 only ("GPL") or the Common
196.15 @@ -13,9 +16,9 @@
196.16 * specific language governing permissions and limitations under the
196.17 * License. When distributing the software, include this License Header
196.18 * Notice in each file and include the License file at
196.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
196.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
196.21 * particular file as subject to the "Classpath" exception as provided
196.22 - * by Sun in the GPL Version 2 section of the License file that
196.23 + * by Oracle in the GPL Version 2 section of the License file that
196.24 * accompanied this code. If applicable, add the following below the
196.25 * License Header, with the fields enclosed by brackets [] replaced by
196.26 * your own identifying information:
197.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
197.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
197.3 @@ -1,6 +1,9 @@
197.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
197.5 #
197.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
197.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
197.8 +#
197.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
197.10 +# Other names may be trademarks of their respective owners.
197.11 #
197.12 # The contents of this file are subject to the terms of either the GNU
197.13 # General Public License Version 2 only ("GPL") or the Common
197.14 @@ -12,9 +15,9 @@
197.15 # specific language governing permissions and limitations under the
197.16 # License. When distributing the software, include this License Header
197.17 # Notice in each file and include the License file at
197.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
197.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
197.20 # particular file as subject to the "Classpath" exception as provided
197.21 -# by Sun in the GPL Version 2 section of the License file that
197.22 +# by Oracle in the GPL Version 2 section of the License file that
197.23 # accompanied this code. If applicable, add the following below the
197.24 # License Header, with the fields enclosed by brackets [] replaced by
197.25 # your own identifying information:
198.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/DataSourceNamePanel.java Fri Jul 16 11:47:36 2010 -0400
198.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/DataSourceNamePanel.java Fri Jul 16 14:21:50 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/DatasourceUISettings.java Fri Jul 16 11:47:36 2010 -0400
199.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/DatasourceUISettings.java Fri Jul 16 14:21:50 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/ui/MissingConnectionsAlertPanel.java Fri Jul 16 11:47:36 2010 -0400
200.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/ui/MissingConnectionsAlertPanel.java Fri Jul 16 14:21:50 2010 -0400
200.3 @@ -1,7 +1,10 @@
200.4 /*
200.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
200.6 *
200.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
200.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
200.9 + *
200.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
200.11 + * Other names may be trademarks of their respective owners.
200.12 *
200.13 * The contents of this file are subject to the terms of either the GNU
200.14 * General Public License Version 2 only ("GPL") or the Common
200.15 @@ -13,9 +16,9 @@
200.16 * specific language governing permissions and limitations under the
200.17 * License. When distributing the software, include this License Header
200.18 * Notice in each file and include the License file at
200.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
200.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
200.21 * particular file as subject to the "Classpath" exception as provided
200.22 - * by Sun in the GPL Version 2 section of the License file that
200.23 + * by Oracle in the GPL Version 2 section of the License file that
200.24 * accompanied this code. If applicable, add the following below the
200.25 * License Header, with the fields enclosed by brackets [] replaced by
200.26 * your own identifying information:
201.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
201.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
201.3 @@ -1,6 +1,9 @@
201.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
201.5 #
201.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
201.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
201.8 +#
201.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
201.10 +# Other names may be trademarks of their respective owners.
201.11 #
201.12 # The contents of this file are subject to the terms of either the GNU
201.13 # General Public License Version 2 only ("GPL") or the Common
201.14 @@ -12,9 +15,9 @@
201.15 # specific language governing permissions and limitations under the
201.16 # License. When distributing the software, include this License Header
201.17 # Notice in each file and include the License file at
201.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
201.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
201.20 # particular file as subject to the "Classpath" exception as provided
201.21 -# by Sun in the GPL Version 2 section of the License file that
201.22 +# by Oracle in the GPL Version 2 section of the License file that
201.23 # accompanied this code. If applicable, add the following below the
201.24 # License Header, with the fields enclosed by brackets [] replaced by
201.25 # your own identifying information:
202.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/DriverListUtil.java Fri Jul 16 11:47:36 2010 -0400
202.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/DriverListUtil.java Fri Jul 16 14:21:50 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/ImportDataSource.java Fri Jul 16 11:47:36 2010 -0400
203.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/ImportDataSource.java Fri Jul 16 14:21:50 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/src/org/netbeans/modules/visualweb/dataconnectivity/utils/SampleDatabaseCreator.java Fri Jul 16 11:47:36 2010 -0400
204.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/SampleDatabaseCreator.java Fri Jul 16 14:21:50 2010 -0400
204.3 @@ -1,7 +1,10 @@
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 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
204.9 + *
204.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
204.11 + * Other names may be trademarks of their respective owners.
204.12 *
204.13 * The contents of this file are subject to the terms of either the GNU
204.14 * General Public License Version 2 only ("GPL") or the Common
204.15 @@ -13,9 +16,9 @@
204.16 * specific language governing permissions and limitations under the
204.17 * License. When distributing the software, include this License Header
204.18 * Notice in each file and include the License file at
204.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
204.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
204.21 * particular file as subject to the "Classpath" exception as provided
204.22 - * by Sun in the GPL Version 2 section of the License file that
204.23 + * by Oracle in the GPL Version 2 section of the License file that
204.24 * accompanied this code. If applicable, add the following below the
204.25 * License Header, with the fields enclosed by brackets [] replaced by
204.26 * your own identifying information:
205.1 --- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/DatasourceBeanCreateInfoSetTest.java Fri Jul 16 11:47:36 2010 -0400
205.2 +++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/DatasourceBeanCreateInfoSetTest.java Fri Jul 16 14:21:50 2010 -0400
205.3 @@ -1,8 +1,11 @@
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 - *
205.9 + *
205.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
205.11 + *
205.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
205.13 + * Other names may be trademarks of their respective owners.
205.14 + *
205.15 * The contents of this file are subject to the terms of either the GNU
205.16 * General Public License Version 2 only ("GPL") or the Common
205.17 * Development and Distribution License("CDDL") (collectively, the
205.18 @@ -13,9 +16,9 @@
205.19 * specific language governing permissions and limitations under the
205.20 * License. When distributing the software, include this License Header
205.21 * Notice in each file and include the License file at
205.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
205.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
205.24 * particular file as subject to the "Classpath" exception as provided
205.25 - * by Sun in the GPL Version 2 section of the License file that
205.26 + * by Oracle in the GPL Version 2 section of the License file that
205.27 * accompanied this code. If applicable, add the following below the
205.28 * License Header, with the fields enclosed by brackets [] replaced by
205.29 * your own identifying information:
206.1 --- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/MockOpenProjectsTrampoline.java Fri Jul 16 11:47:36 2010 -0400
206.2 +++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/MockOpenProjectsTrampoline.java Fri Jul 16 14:21:50 2010 -0400
206.3 @@ -1,7 +1,10 @@
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 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
206.9 + *
206.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
206.11 + * Other names may be trademarks of their respective owners.
206.12 *
206.13 * The contents of this file are subject to the terms of either the GNU
206.14 * General Public License Version 2 only ("GPL") or the Common
206.15 @@ -13,9 +16,9 @@
206.16 * specific language governing permissions and limitations under the
206.17 * License. When distributing the software, include this License Header
206.18 * Notice in each file and include the License file at
206.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
206.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
206.21 * particular file as subject to the "Classpath" exception as provided
206.22 - * by Sun in the GPL Version 2 section of the License file that
206.23 + * by Oracle in the GPL Version 2 section of the License file that
206.24 * accompanied this code. If applicable, add the following below the
206.25 * License Header, with the fields enclosed by brackets [] replaced by
206.26 * your own identifying information:
207.1 --- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java Fri Jul 16 11:47:36 2010 -0400
207.2 +++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java Fri Jul 16 14:21:50 2010 -0400
207.3 @@ -1,8 +1,11 @@
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 - *
207.9 + *
207.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
207.11 + *
207.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
207.13 + * Other names may be trademarks of their respective owners.
207.14 + *
207.15 * The contents of this file are subject to the terms of either the GNU
207.16 * General Public License Version 2 only ("GPL") or the Common
207.17 * Development and Distribution License("CDDL") (collectively, the
207.18 @@ -13,9 +16,9 @@
207.19 * specific language governing permissions and limitations under the
207.20 * License. When distributing the software, include this License Header
207.21 * Notice in each file and include the License file at
207.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
207.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
207.24 * particular file as subject to the "Classpath" exception as provided
207.25 - * by Sun in the GPL Version 2 section of the License file that
207.26 + * by Oracle in the GPL Version 2 section of the License file that
207.27 * accompanied this code. If applicable, add the following below the
207.28 * License Header, with the fields enclosed by brackets [] replaced by
207.29 * your own identifying information:
208.1 --- a/visualweb.dataprovider.designtime/build.xml Fri Jul 16 11:47:36 2010 -0400
208.2 +++ b/visualweb.dataprovider.designtime/build.xml Fri Jul 16 14:21:50 2010 -0400
208.3 @@ -2,7 +2,10 @@
208.4 <!--
208.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
208.6
208.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
208.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
208.9 +
208.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
208.11 +Other names may be trademarks of their respective owners.
208.12
208.13
208.14 The contents of this file are subject to the terms of either the GNU
208.15 @@ -15,9 +18,9 @@
208.16 specific language governing permissions and limitations under the
208.17 License. When distributing the software, include this License Header
208.18 Notice in each file and include the License file at
208.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
208.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
208.21 particular file as subject to the "Classpath" exception as provided
208.22 -by Sun in the GPL Version 2 section of the License file that
208.23 +by Oracle in the GPL Version 2 section of the License file that
208.24 accompanied this code. If applicable, add the following below the
208.25 License Header, with the fields enclosed by brackets [] replaced by
208.26 your own identifying information:
209.1 --- a/visualweb.dataprovider.designtime/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
209.2 +++ b/visualweb.dataprovider.designtime/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
209.3 @@ -1,6 +1,9 @@
209.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
209.5 #
209.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
209.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
209.8 +#
209.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
209.10 +# Other names may be trademarks of their respective owners.
209.11 #
209.12 # The contents of this file are subject to the terms of either the GNU
209.13 # General Public License Version 2 only ("GPL") or the Common
209.14 @@ -12,9 +15,9 @@
209.15 # specific language governing permissions and limitations under the
209.16 # License. When distributing the software, include this License Header
209.17 # Notice in each file and include the License file at
209.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
209.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
209.20 # particular file as subject to the "Classpath" exception as provided
209.21 -# by Sun in the GPL Version 2 section of the License file that
209.22 +# by Oracle in the GPL Version 2 section of the License file that
209.23 # accompanied this code. If applicable, add the following below the
209.24 # License Header, with the fields enclosed by brackets [] replaced by
209.25 # your own identifying information:
210.1 --- a/visualweb.dataprovider.designtime/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
210.2 +++ b/visualweb.dataprovider.designtime/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
210.3 @@ -2,7 +2,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
210.14 The contents of this file are subject to the terms of either the GNU
210.15 @@ -15,9 +18,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:
210.27 @@ -118,7 +121,15 @@
210.28 <build-prerequisite/>
210.29 <compile-dependency/>
210.30 <run-dependency>
210.31 - <specification-version>6.8</specification-version>
210.32 + <specification-version>8.0</specification-version>
210.33 + </run-dependency>
210.34 + </dependency>
210.35 + <dependency>
210.36 + <code-name-base>org.openide.util.lookup</code-name-base>
210.37 + <build-prerequisite/>
210.38 + <compile-dependency/>
210.39 + <run-dependency>
210.40 + <specification-version>8.0</specification-version>
210.41 </run-dependency>
210.42 </dependency>
210.43 </module-dependencies>
211.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/AbstractDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
211.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/AbstractDesignInfo.java Fri Jul 16 14:21:50 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/BeanInfoSupport.java Fri Jul 16 11:47:36 2010 -0400
212.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/BeanInfoSupport.java Fri Jul 16 14:21:50 2010 -0400
212.3 @@ -1,7 +1,10 @@
212.4 /*
212.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
212.6 *
212.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
212.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
212.9 + *
212.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
212.11 + * Other names may be trademarks of their respective owners.
212.12 *
212.13 * The contents of this file are subject to the terms of either the GNU
212.14 * General Public License Version 2 only ("GPL") or the Common
212.15 @@ -13,9 +16,9 @@
212.16 * specific language governing permissions and limitations under the
212.17 * License. When distributing the software, include this License Header
212.18 * Notice in each file and include the License file at
212.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
212.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
212.21 * particular file as subject to the "Classpath" exception as provided
212.22 - * by Sun in the GPL Version 2 section of the License file that
212.23 + * by Oracle in the GPL Version 2 section of the License file that
212.24 * accompanied this code. If applicable, add the following below the
212.25 * License Header, with the fields enclosed by brackets [] replaced by
212.26 * your own identifying information:
213.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
213.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
213.3 @@ -1,6 +1,9 @@
213.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
213.5 #
213.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
213.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
213.8 +#
213.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
213.10 +# Other names may be trademarks of their respective owners.
213.11 #
213.12 # The contents of this file are subject to the terms of either the GNU
213.13 # General Public License Version 2 only ("GPL") or the Common
213.14 @@ -12,9 +15,9 @@
213.15 # specific language governing permissions and limitations under the
213.16 # License. When distributing the software, include this License Header
213.17 # Notice in each file and include the License file at
213.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
213.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
213.20 # particular file as subject to the "Classpath" exception as provided
213.21 -# by Sun in the GPL Version 2 section of the License file that
213.22 +# by Oracle in the GPL Version 2 section of the License file that
213.23 # accompanied this code. If applicable, add the following below the
213.24 # License Header, with the fields enclosed by brackets [] replaced by
213.25 # your own identifying information:
214.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/Install.java Fri Jul 16 11:47:36 2010 -0400
214.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/Install.java Fri Jul 16 14:21:50 2010 -0400
214.3 @@ -1,7 +1,10 @@
214.4 /*
214.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
214.6 *
214.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
214.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
214.9 + *
214.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
214.11 + * Other names may be trademarks of their respective owners.
214.12 *
214.13 * The contents of this file are subject to the terms of either the GNU
214.14 * General Public License Version 2 only ("GPL") or the Common
214.15 @@ -13,9 +16,9 @@
214.16 * specific language governing permissions and limitations under the
214.17 * License. When distributing the software, include this License Header
214.18 * Notice in each file and include the License file at
214.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
214.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
214.21 * particular file as subject to the "Classpath" exception as provided
214.22 - * by Sun in the GPL Version 2 section of the License file that
214.23 + * by Oracle in the GPL Version 2 section of the License file that
214.24 * accompanied this code. If applicable, add the following below the
214.25 * License Header, with the fields enclosed by brackets [] replaced by
214.26 * your own identifying information:
215.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
215.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
215.3 @@ -1,6 +1,9 @@
215.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
215.5 #
215.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
215.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
215.8 +#
215.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
215.10 +# Other names may be trademarks of their respective owners.
215.11 #
215.12 # The contents of this file are subject to the terms of either the GNU
215.13 # General Public License Version 2 only ("GPL") or the Common
215.14 @@ -12,9 +15,9 @@
215.15 # specific language governing permissions and limitations under the
215.16 # License. When distributing the software, include this License Header
215.17 # Notice in each file and include the License file at
215.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
215.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
215.20 # particular file as subject to the "Classpath" exception as provided
215.21 -# by Sun in the GPL Version 2 section of the License file that
215.22 +# by Oracle in the GPL Version 2 section of the License file that
215.23 # accompanied this code. If applicable, add the following below the
215.24 # License Header, with the fields enclosed by brackets [] replaced by
215.25 # your own identifying information:
216.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseDeleteRow.xml Fri Jul 16 11:47:36 2010 -0400
216.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseDeleteRow.xml Fri Jul 16 14:21:50 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/DatabaseFirst.xml Fri Jul 16 11:47:36 2010 -0400
217.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseFirst.xml Fri Jul 16 14:21:50 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/DatabaseInsertRow.xml Fri Jul 16 11:47:36 2010 -0400
218.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseInsertRow.xml Fri Jul 16 14:21:50 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/DatabaseLast.xml Fri Jul 16 11:47:36 2010 -0400
219.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseLast.xml Fri Jul 16 14:21:50 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/DatabaseNext.xml Fri Jul 16 11:47:36 2010 -0400
220.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseNext.xml Fri Jul 16 14:21:50 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/DatabasePrevious.xml Fri Jul 16 11:47:36 2010 -0400
221.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabasePrevious.xml Fri Jul 16 14:21:50 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/DatabaseUpdate.xml Fri Jul 16 11:47:36 2010 -0400
222.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/DatabaseUpdate.xml Fri Jul 16 14:21:50 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/PrimaryKeyMethod.xml Fri Jul 16 11:47:36 2010 -0400
223.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/PrimaryKeyMethod.xml Fri Jul 16 14:21:50 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/codeclips/SetValueFromDB.xml Fri Jul 16 11:47:36 2010 -0400
224.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/codeclips/SetValueFromDB.xml Fri Jul 16 14:21:50 2010 -0400
224.3 @@ -2,7 +2,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
224.14 The contents of this file are subject to the terms of either the GNU
224.15 @@ -15,9 +18,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/BasicTableDataFilterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
225.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataFilterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
225.3 @@ -1,7 +1,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 @@ -13,9 +16,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/BasicTableDataFilterBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
226.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataFilterBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
226.3 @@ -2,7 +2,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 @@ -14,9 +17,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/BasicTableDataSorterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
227.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataSorterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
227.3 @@ -1,7 +1,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 @@ -13,9 +16,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/BasicTableDataSorterBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
228.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTableDataSorterBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
228.3 @@ -2,7 +2,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 @@ -14,9 +17,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/BasicTransactionalDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
229.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
229.3 @@ -1,7 +1,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 @@ -13,9 +16,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/BasicTransactionalDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
230.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
230.3 @@ -2,7 +2,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 @@ -14,9 +17,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/BasicTransactionalTableDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
231.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalTableDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
231.3 @@ -1,7 +1,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 @@ -13,9 +16,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/BasicTransactionalTableDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
232.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/BasicTransactionalTableDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
232.3 @@ -2,7 +2,10 @@
232.4 /*
232.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
232.6 *
232.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
232.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
232.9 + *
232.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
232.11 + * Other names may be trademarks of their respective owners.
232.12 *
232.13 * The contents of this file are subject to the terms of either the GNU
232.14 * General Public License Version 2 only ("GPL") or the Common
232.15 @@ -14,9 +17,9 @@
232.16 * specific language governing permissions and limitations under the
232.17 * License. When distributing the software, include this License Header
232.18 * Notice in each file and include the License file at
232.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
232.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
232.21 * particular file as subject to the "Classpath" exception as provided
232.22 - * by Sun in the GPL Version 2 section of the License file that
232.23 + * by Oracle in the GPL Version 2 section of the License file that
232.24 * accompanied this code. If applicable, add the following below the
232.25 * License Header, with the fields enclosed by brackets [] replaced by
232.26 * your own identifying information:
233.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/Bundle-JSF.properties Fri Jul 16 11:47:36 2010 -0400
233.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/Bundle-JSF.properties Fri Jul 16 14:21:50 2010 -0400
233.3 @@ -1,6 +1,9 @@
233.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
233.5 #
233.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
233.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
233.8 +#
233.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
233.10 +# Other names may be trademarks of their respective owners.
233.11 #
233.12 # The contents of this file are subject to the terms of either the GNU
233.13 # General Public License Version 2 only ("GPL") or the Common
233.14 @@ -12,9 +15,9 @@
233.15 # specific language governing permissions and limitations under the
233.16 # License. When distributing the software, include this License Header
233.17 # Notice in each file and include the License file at
233.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
233.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
233.20 # particular file as subject to the "Classpath" exception as provided
233.21 -# by Sun in the GPL Version 2 section of the License file that
233.22 +# by Oracle in the GPL Version 2 section of the License file that
233.23 # accompanied this code. If applicable, add the following below the
233.24 # License Header, with the fields enclosed by brackets [] replaced by
233.25 # your own identifying information:
234.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CachedRowSetDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
234.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CachedRowSetDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
234.3 @@ -1,7 +1,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 @@ -13,9 +16,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/CachedRowSetDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
235.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CachedRowSetDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
235.3 @@ -2,7 +2,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 @@ -14,9 +17,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/CompareFilterCriteriaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
236.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CompareFilterCriteriaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
236.3 @@ -1,7 +1,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 @@ -13,9 +16,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/CompareFilterCriteriaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
237.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/CompareFilterCriteriaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
237.3 @@ -2,7 +2,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 @@ -14,9 +17,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/FieldIdSortCriteriaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
238.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldIdSortCriteriaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
238.3 @@ -1,7 +1,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 @@ -13,9 +16,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/FieldIdSortCriteriaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
239.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldIdSortCriteriaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
239.3 @@ -2,7 +2,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 @@ -14,9 +17,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/FieldKeySortCriteriaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
240.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldKeySortCriteriaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
240.3 @@ -1,7 +1,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 @@ -13,9 +16,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/FieldKeySortCriteriaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
241.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FieldKeySortCriteriaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
241.3 @@ -2,7 +2,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 @@ -14,9 +17,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/FilteredTableDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
242.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FilteredTableDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
242.3 @@ -1,7 +1,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 @@ -13,9 +16,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/FilteredTableDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
243.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/FilteredTableDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
243.3 @@ -2,7 +2,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 @@ -14,9 +17,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/ListDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
244.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ListDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
244.3 @@ -1,7 +1,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 @@ -13,9 +16,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/ListDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
245.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ListDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
245.3 @@ -2,7 +2,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 @@ -14,9 +17,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/MapDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
246.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MapDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
246.3 @@ -1,7 +1,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 @@ -13,9 +16,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/MapDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
247.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MapDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
247.3 @@ -2,7 +2,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 @@ -14,9 +17,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/MethodResultDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
248.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
248.3 @@ -1,7 +1,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 @@ -13,9 +16,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/MethodResultDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
249.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
249.3 @@ -2,7 +2,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 @@ -14,9 +17,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/MethodResultTableDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
250.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultTableDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
250.3 @@ -1,7 +1,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 @@ -13,9 +16,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/MethodResultTableDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
251.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/MethodResultTableDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
251.3 @@ -2,7 +2,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 @@ -14,9 +17,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/NestedFilterCriteriaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
252.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/NestedFilterCriteriaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
252.3 @@ -1,7 +1,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 @@ -13,9 +16,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/NestedFilterCriteriaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
253.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/NestedFilterCriteriaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
253.3 @@ -2,7 +2,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 @@ -14,9 +17,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/ObjectArrayDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
254.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectArrayDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
254.3 @@ -1,7 +1,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 @@ -13,9 +16,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/ObjectArrayDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
255.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectArrayDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
255.3 @@ -2,7 +2,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 @@ -14,9 +17,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/ObjectDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
256.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
256.3 @@ -1,7 +1,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 @@ -13,9 +16,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/ObjectDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
257.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
257.3 @@ -2,7 +2,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 @@ -14,9 +17,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/ObjectListDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
258.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectListDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
258.3 @@ -1,7 +1,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 @@ -13,9 +16,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/ObjectListDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
259.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/ObjectListDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
259.3 @@ -2,7 +2,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 @@ -14,9 +17,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/RegexFilterCriteriaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
260.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/RegexFilterCriteriaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
260.3 @@ -1,7 +1,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 @@ -13,9 +16,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/RegexFilterCriteriaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
261.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/RegexFilterCriteriaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
261.3 @@ -2,7 +2,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 @@ -14,9 +17,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/TableRowDataProviderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
262.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/TableRowDataProviderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
262.3 @@ -1,7 +1,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 @@ -13,9 +16,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/impl/TableRowDataProviderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
263.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/impl/TableRowDataProviderBeanInfoBase.java Fri Jul 16 14:21:50 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 * The contents of this file are subject to the terms of either the GNU
263.14 * General Public License Version 2 only ("GPL") or the Common
263.15 @@ -14,9 +17,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/layer.xml Fri Jul 16 11:47:36 2010 -0400
264.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/layer.xml Fri Jul 16 14:21:50 2010 -0400
264.3 @@ -2,7 +2,10 @@
264.4 <!--
264.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
264.6
264.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
264.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
264.9 +
264.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
264.11 +Other names may be trademarks of their respective owners.
264.12
264.13
264.14 The contents of this file are subject to the terms of either the GNU
264.15 @@ -15,9 +18,9 @@
264.16 specific language governing permissions and limitations under the
264.17 License. When distributing the software, include this License Header
264.18 Notice in each file and include the License file at
264.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
264.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
264.21 particular file as subject to the "Classpath" exception as provided
264.22 -by Sun in the GPL Version 2 section of the License file that
264.23 +by Oracle in the GPL Version 2 section of the License file that
264.24 accompanied this code. If applicable, add the following below the
264.25 License Header, with the fields enclosed by brackets [] replaced by
264.26 your own identifying information:
265.1 --- a/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
265.2 +++ b/visualweb.dataprovider.designtime/src/org/netbeans/modules/visualweb/dataprovider/designtime/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
265.3 @@ -1,6 +1,9 @@
265.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
265.5 #
265.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
265.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
265.8 +#
265.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
265.10 +# Other names may be trademarks of their respective owners.
265.11 #
265.12 # The contents of this file are subject to the terms of either the GNU
265.13 # General Public License Version 2 only ("GPL") or the Common
265.14 @@ -12,9 +15,9 @@
265.15 # specific language governing permissions and limitations under the
265.16 # License. When distributing the software, include this License Header
265.17 # Notice in each file and include the License file at
265.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
265.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
265.20 # particular file as subject to the "Classpath" exception as provided
265.21 -# by Sun in the GPL Version 2 section of the License file that
265.22 +# by Oracle in the GPL Version 2 section of the License file that
265.23 # accompanied this code. If applicable, add the following below the
265.24 # License Header, with the fields enclosed by brackets [] replaced by
265.25 # your own identifying information:
266.1 --- a/visualweb.dataprovider/build.xml Fri Jul 16 11:47:36 2010 -0400
266.2 +++ b/visualweb.dataprovider/build.xml Fri Jul 16 14:21:50 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:
267.1 --- a/visualweb.dataprovider/library/build.xml Fri Jul 16 11:47:36 2010 -0400
267.2 +++ b/visualweb.dataprovider/library/build.xml Fri Jul 16 14:21:50 2010 -0400
267.3 @@ -2,7 +2,10 @@
267.4 <!--
267.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
267.6
267.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
267.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
267.9 +
267.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
267.11 +Other names may be trademarks of their respective owners.
267.12
267.13
267.14 The contents of this file are subject to the terms of either the GNU
267.15 @@ -15,9 +18,9 @@
267.16 specific language governing permissions and limitations under the
267.17 License. When distributing the software, include this License Header
267.18 Notice in each file and include the License file at
267.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
267.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
267.21 particular file as subject to the "Classpath" exception as provided
267.22 -by Sun in the GPL Version 2 section of the License file that
267.23 +by Oracle in the GPL Version 2 section of the License file that
267.24 accompanied this code. If applicable, add the following below the
267.25 License Header, with the fields enclosed by brackets [] replaced by
267.26 your own identifying information:
268.1 --- a/visualweb.dataprovider/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
268.2 +++ b/visualweb.dataprovider/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
268.3 @@ -1,6 +1,9 @@
268.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
268.5 #
268.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
268.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
268.8 +#
268.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
268.10 +# Other names may be trademarks of their respective owners.
268.11 #
268.12 # The contents of this file are subject to the terms of either the GNU
268.13 # General Public License Version 2 only ("GPL") or the Common
268.14 @@ -12,9 +15,9 @@
268.15 # specific language governing permissions and limitations under the
268.16 # License. When distributing the software, include this License Header
268.17 # Notice in each file and include the License file at
268.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
268.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
268.20 # particular file as subject to the "Classpath" exception as provided
268.21 -# by Sun in the GPL Version 2 section of the License file that
268.22 +# by Oracle in the GPL Version 2 section of the License file that
268.23 # accompanied this code. If applicable, add the following below the
268.24 # License Header, with the fields enclosed by brackets [] replaced by
268.25 # your own identifying information:
269.1 --- a/visualweb.dataprovider/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
269.2 +++ b/visualweb.dataprovider/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
269.3 @@ -2,7 +2,10 @@
269.4 <!--
269.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
269.6
269.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
269.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
269.9 +
269.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
269.11 +Other names may be trademarks of their respective owners.
269.12
269.13
269.14 The contents of this file are subject to the terms of either the GNU
269.15 @@ -15,9 +18,9 @@
269.16 specific language governing permissions and limitations under the
269.17 License. When distributing the software, include this License Header
269.18 Notice in each file and include the License file at
269.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
269.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
269.21 particular file as subject to the "Classpath" exception as provided
269.22 -by Sun in the GPL Version 2 section of the License file that
269.23 +by Oracle in the GPL Version 2 section of the License file that
269.24 accompanied this code. If applicable, add the following below the
269.25 License Header, with the fields enclosed by brackets [] replaced by
269.26 your own identifying information:
270.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/DataAdapter.java Fri Jul 16 11:47:36 2010 -0400
270.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/DataAdapter.java Fri Jul 16 14:21:50 2010 -0400
270.3 @@ -1,7 +1,10 @@
270.4 /*
270.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
270.6 *
270.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
270.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
270.9 + *
270.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
270.11 + * Other names may be trademarks of their respective owners.
270.12 *
270.13 * The contents of this file are subject to the terms of either the GNU
270.14 * General Public License Version 2 only ("GPL") or the Common
270.15 @@ -13,9 +16,9 @@
270.16 * specific language governing permissions and limitations under the
270.17 * License. When distributing the software, include this License Header
270.18 * Notice in each file and include the License file at
270.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
270.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
270.21 * particular file as subject to the "Classpath" exception as provided
270.22 - * by Sun in the GPL Version 2 section of the License file that
270.23 + * by Oracle in the GPL Version 2 section of the License file that
270.24 * accompanied this code. If applicable, add the following below the
270.25 * License Header, with the fields enclosed by brackets [] replaced by
270.26 * your own identifying information:
271.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/DataListener.java Fri Jul 16 11:47:36 2010 -0400
271.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/DataListener.java Fri Jul 16 14:21:50 2010 -0400
271.3 @@ -1,7 +1,10 @@
271.4 /*
271.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
271.6 *
271.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
271.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
271.9 + *
271.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
271.11 + * Other names may be trademarks of their respective owners.
271.12 *
271.13 * The contents of this file are subject to the terms of either the GNU
271.14 * General Public License Version 2 only ("GPL") or the Common
271.15 @@ -13,9 +16,9 @@
271.16 * specific language governing permissions and limitations under the
271.17 * License. When distributing the software, include this License Header
271.18 * Notice in each file and include the License file at
271.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
271.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
271.21 * particular file as subject to the "Classpath" exception as provided
271.22 - * by Sun in the GPL Version 2 section of the License file that
271.23 + * by Oracle in the GPL Version 2 section of the License file that
271.24 * accompanied this code. If applicable, add the following below the
271.25 * License Header, with the fields enclosed by brackets [] replaced by
271.26 * your own identifying information:
272.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/DataProvider.java Fri Jul 16 11:47:36 2010 -0400
272.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/DataProvider.java Fri Jul 16 14:21:50 2010 -0400
272.3 @@ -1,7 +1,10 @@
272.4 /*
272.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
272.6 *
272.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
272.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
272.9 + *
272.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
272.11 + * Other names may be trademarks of their respective owners.
272.12 *
272.13 * The contents of this file are subject to the terms of either the GNU
272.14 * General Public License Version 2 only ("GPL") or the Common
272.15 @@ -13,9 +16,9 @@
272.16 * specific language governing permissions and limitations under the
272.17 * License. When distributing the software, include this License Header
272.18 * Notice in each file and include the License file at
272.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
272.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
272.21 * particular file as subject to the "Classpath" exception as provided
272.22 - * by Sun in the GPL Version 2 section of the License file that
272.23 + * by Oracle in the GPL Version 2 section of the License file that
272.24 * accompanied this code. If applicable, add the following below the
272.25 * License Header, with the fields enclosed by brackets [] replaced by
272.26 * your own identifying information:
273.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/DataProviderException.java Fri Jul 16 11:47:36 2010 -0400
273.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/DataProviderException.java Fri Jul 16 14:21:50 2010 -0400
273.3 @@ -1,7 +1,10 @@
273.4 /*
273.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
273.6 *
273.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
273.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
273.9 + *
273.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
273.11 + * Other names may be trademarks of their respective owners.
273.12 *
273.13 * The contents of this file are subject to the terms of either the GNU
273.14 * General Public License Version 2 only ("GPL") or the Common
273.15 @@ -13,9 +16,9 @@
273.16 * specific language governing permissions and limitations under the
273.17 * License. When distributing the software, include this License Header
273.18 * Notice in each file and include the License file at
273.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
273.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
273.21 * particular file as subject to the "Classpath" exception as provided
273.22 - * by Sun in the GPL Version 2 section of the License file that
273.23 + * by Oracle in the GPL Version 2 section of the License file that
273.24 * accompanied this code. If applicable, add the following below the
273.25 * License Header, with the fields enclosed by brackets [] replaced by
273.26 * your own identifying information:
274.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/FieldKey.java Fri Jul 16 11:47:36 2010 -0400
274.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/FieldKey.java Fri Jul 16 14:21:50 2010 -0400
274.3 @@ -1,7 +1,10 @@
274.4 /*
274.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
274.6 *
274.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
274.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
274.9 + *
274.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
274.11 + * Other names may be trademarks of their respective owners.
274.12 *
274.13 * The contents of this file are subject to the terms of either the GNU
274.14 * General Public License Version 2 only ("GPL") or the Common
274.15 @@ -13,9 +16,9 @@
274.16 * specific language governing permissions and limitations under the
274.17 * License. When distributing the software, include this License Header
274.18 * Notice in each file and include the License file at
274.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
274.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
274.21 * particular file as subject to the "Classpath" exception as provided
274.22 - * by Sun in the GPL Version 2 section of the License file that
274.23 + * by Oracle in the GPL Version 2 section of the License file that
274.24 * accompanied this code. If applicable, add the following below the
274.25 * License Header, with the fields enclosed by brackets [] replaced by
274.26 * your own identifying information:
275.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/FilterCriteria.java Fri Jul 16 11:47:36 2010 -0400
275.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/FilterCriteria.java Fri Jul 16 14:21:50 2010 -0400
275.3 @@ -1,7 +1,10 @@
275.4 /*
275.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
275.6 *
275.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
275.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
275.9 + *
275.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
275.11 + * Other names may be trademarks of their respective owners.
275.12 *
275.13 * The contents of this file are subject to the terms of either the GNU
275.14 * General Public License Version 2 only ("GPL") or the Common
275.15 @@ -13,9 +16,9 @@
275.16 * specific language governing permissions and limitations under the
275.17 * License. When distributing the software, include this License Header
275.18 * Notice in each file and include the License file at
275.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
275.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
275.21 * particular file as subject to the "Classpath" exception as provided
275.22 - * by Sun in the GPL Version 2 section of the License file that
275.23 + * by Oracle in the GPL Version 2 section of the License file that
275.24 * accompanied this code. If applicable, add the following below the
275.25 * License Header, with the fields enclosed by brackets [] replaced by
275.26 * your own identifying information:
276.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/RefreshableDataAdapter.java Fri Jul 16 11:47:36 2010 -0400
276.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/RefreshableDataAdapter.java Fri Jul 16 14:21:50 2010 -0400
276.3 @@ -1,7 +1,10 @@
276.4 /*
276.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
276.6 *
276.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
276.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
276.9 + *
276.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
276.11 + * Other names may be trademarks of their respective owners.
276.12 *
276.13 * The contents of this file are subject to the terms of either the GNU
276.14 * General Public License Version 2 only ("GPL") or the Common
276.15 @@ -13,9 +16,9 @@
276.16 * specific language governing permissions and limitations under the
276.17 * License. When distributing the software, include this License Header
276.18 * Notice in each file and include the License file at
276.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
276.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
276.21 * particular file as subject to the "Classpath" exception as provided
276.22 - * by Sun in the GPL Version 2 section of the License file that
276.23 + * by Oracle in the GPL Version 2 section of the License file that
276.24 * accompanied this code. If applicable, add the following below the
276.25 * License Header, with the fields enclosed by brackets [] replaced by
276.26 * your own identifying information:
277.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/RefreshableDataListener.java Fri Jul 16 11:47:36 2010 -0400
277.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/RefreshableDataListener.java Fri Jul 16 14:21:50 2010 -0400
277.3 @@ -1,7 +1,10 @@
277.4 /*
277.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
277.6 *
277.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
277.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
277.9 + *
277.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
277.11 + * Other names may be trademarks of their respective owners.
277.12 *
277.13 * The contents of this file are subject to the terms of either the GNU
277.14 * General Public License Version 2 only ("GPL") or the Common
277.15 @@ -13,9 +16,9 @@
277.16 * specific language governing permissions and limitations under the
277.17 * License. When distributing the software, include this License Header
277.18 * Notice in each file and include the License file at
277.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
277.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
277.21 * particular file as subject to the "Classpath" exception as provided
277.22 - * by Sun in the GPL Version 2 section of the License file that
277.23 + * by Oracle in the GPL Version 2 section of the License file that
277.24 * accompanied this code. If applicable, add the following below the
277.25 * License Header, with the fields enclosed by brackets [] replaced by
277.26 * your own identifying information:
278.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/RefreshableDataProvider.java Fri Jul 16 11:47:36 2010 -0400
278.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/RefreshableDataProvider.java Fri Jul 16 14:21:50 2010 -0400
278.3 @@ -1,7 +1,10 @@
278.4 /*
278.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
278.6 *
278.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
278.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
278.9 + *
278.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
278.11 + * Other names may be trademarks of their respective owners.
278.12 *
278.13 * The contents of this file are subject to the terms of either the GNU
278.14 * General Public License Version 2 only ("GPL") or the Common
278.15 @@ -13,9 +16,9 @@
278.16 * specific language governing permissions and limitations under the
278.17 * License. When distributing the software, include this License Header
278.18 * Notice in each file and include the License file at
278.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
278.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
278.21 * particular file as subject to the "Classpath" exception as provided
278.22 - * by Sun in the GPL Version 2 section of the License file that
278.23 + * by Oracle in the GPL Version 2 section of the License file that
278.24 * accompanied this code. If applicable, add the following below the
278.25 * License Header, with the fields enclosed by brackets [] replaced by
278.26 * your own identifying information:
279.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/RowKey.java Fri Jul 16 11:47:36 2010 -0400
279.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/RowKey.java Fri Jul 16 14:21:50 2010 -0400
279.3 @@ -1,7 +1,10 @@
279.4 /*
279.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
279.6 *
279.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
279.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
279.9 + *
279.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
279.11 + * Other names may be trademarks of their respective owners.
279.12 *
279.13 * The contents of this file are subject to the terms of either the GNU
279.14 * General Public License Version 2 only ("GPL") or the Common
279.15 @@ -13,9 +16,9 @@
279.16 * specific language governing permissions and limitations under the
279.17 * License. When distributing the software, include this License Header
279.18 * Notice in each file and include the License file at
279.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
279.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
279.21 * particular file as subject to the "Classpath" exception as provided
279.22 - * by Sun in the GPL Version 2 section of the License file that
279.23 + * by Oracle in the GPL Version 2 section of the License file that
279.24 * accompanied this code. If applicable, add the following below the
279.25 * License Header, with the fields enclosed by brackets [] replaced by
279.26 * your own identifying information:
280.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/SortCriteria.java Fri Jul 16 11:47:36 2010 -0400
280.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/SortCriteria.java Fri Jul 16 14:21:50 2010 -0400
280.3 @@ -1,7 +1,10 @@
280.4 /*
280.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
280.6 *
280.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
280.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
280.9 + *
280.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
280.11 + * Other names may be trademarks of their respective owners.
280.12 *
280.13 * The contents of this file are subject to the terms of either the GNU
280.14 * General Public License Version 2 only ("GPL") or the Common
280.15 @@ -13,9 +16,9 @@
280.16 * specific language governing permissions and limitations under the
280.17 * License. When distributing the software, include this License Header
280.18 * Notice in each file and include the License file at
280.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
280.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
280.21 * particular file as subject to the "Classpath" exception as provided
280.22 - * by Sun in the GPL Version 2 section of the License file that
280.23 + * by Oracle in the GPL Version 2 section of the License file that
280.24 * accompanied this code. If applicable, add the following below the
280.25 * License Header, with the fields enclosed by brackets [] replaced by
280.26 * your own identifying information:
281.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TableCursorAdapter.java Fri Jul 16 11:47:36 2010 -0400
281.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TableCursorAdapter.java Fri Jul 16 14:21:50 2010 -0400
281.3 @@ -1,7 +1,10 @@
281.4 /*
281.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
281.6 *
281.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
281.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
281.9 + *
281.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
281.11 + * Other names may be trademarks of their respective owners.
281.12 *
281.13 * The contents of this file are subject to the terms of either the GNU
281.14 * General Public License Version 2 only ("GPL") or the Common
281.15 @@ -13,9 +16,9 @@
281.16 * specific language governing permissions and limitations under the
281.17 * License. When distributing the software, include this License Header
281.18 * Notice in each file and include the License file at
281.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
281.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
281.21 * particular file as subject to the "Classpath" exception as provided
281.22 - * by Sun in the GPL Version 2 section of the License file that
281.23 + * by Oracle in the GPL Version 2 section of the License file that
281.24 * accompanied this code. If applicable, add the following below the
281.25 * License Header, with the fields enclosed by brackets [] replaced by
281.26 * your own identifying information:
282.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TableCursorListener.java Fri Jul 16 11:47:36 2010 -0400
282.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TableCursorListener.java Fri Jul 16 14:21:50 2010 -0400
282.3 @@ -1,7 +1,10 @@
282.4 /*
282.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
282.6 *
282.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
282.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
282.9 + *
282.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
282.11 + * Other names may be trademarks of their respective owners.
282.12 *
282.13 * The contents of this file are subject to the terms of either the GNU
282.14 * General Public License Version 2 only ("GPL") or the Common
282.15 @@ -13,9 +16,9 @@
282.16 * specific language governing permissions and limitations under the
282.17 * License. When distributing the software, include this License Header
282.18 * Notice in each file and include the License file at
282.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
282.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
282.21 * particular file as subject to the "Classpath" exception as provided
282.22 - * by Sun in the GPL Version 2 section of the License file that
282.23 + * by Oracle in the GPL Version 2 section of the License file that
282.24 * accompanied this code. If applicable, add the following below the
282.25 * License Header, with the fields enclosed by brackets [] replaced by
282.26 * your own identifying information:
283.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TableCursorVetoException.java Fri Jul 16 11:47:36 2010 -0400
283.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TableCursorVetoException.java Fri Jul 16 14:21:50 2010 -0400
283.3 @@ -1,7 +1,10 @@
283.4 /*
283.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
283.6 *
283.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
283.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
283.9 + *
283.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
283.11 + * Other names may be trademarks of their respective owners.
283.12 *
283.13 * The contents of this file are subject to the terms of either the GNU
283.14 * General Public License Version 2 only ("GPL") or the Common
283.15 @@ -13,9 +16,9 @@
283.16 * specific language governing permissions and limitations under the
283.17 * License. When distributing the software, include this License Header
283.18 * Notice in each file and include the License file at
283.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
283.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
283.21 * particular file as subject to the "Classpath" exception as provided
283.22 - * by Sun in the GPL Version 2 section of the License file that
283.23 + * by Oracle in the GPL Version 2 section of the License file that
283.24 * accompanied this code. If applicable, add the following below the
283.25 * License Header, with the fields enclosed by brackets [] replaced by
283.26 * your own identifying information:
284.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataAdapter.java Fri Jul 16 11:47:36 2010 -0400
284.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataAdapter.java Fri Jul 16 14:21:50 2010 -0400
284.3 @@ -1,7 +1,10 @@
284.4 /*
284.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
284.6 *
284.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
284.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
284.9 + *
284.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
284.11 + * Other names may be trademarks of their respective owners.
284.12 *
284.13 * The contents of this file are subject to the terms of either the GNU
284.14 * General Public License Version 2 only ("GPL") or the Common
284.15 @@ -13,9 +16,9 @@
284.16 * specific language governing permissions and limitations under the
284.17 * License. When distributing the software, include this License Header
284.18 * Notice in each file and include the License file at
284.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
284.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
284.21 * particular file as subject to the "Classpath" exception as provided
284.22 - * by Sun in the GPL Version 2 section of the License file that
284.23 + * by Oracle in the GPL Version 2 section of the License file that
284.24 * accompanied this code. If applicable, add the following below the
284.25 * License Header, with the fields enclosed by brackets [] replaced by
284.26 * your own identifying information:
285.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataFilter.java Fri Jul 16 11:47:36 2010 -0400
285.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataFilter.java Fri Jul 16 14:21:50 2010 -0400
285.3 @@ -1,7 +1,10 @@
285.4 /*
285.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
285.6 *
285.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
285.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
285.9 + *
285.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
285.11 + * Other names may be trademarks of their respective owners.
285.12 *
285.13 * The contents of this file are subject to the terms of either the GNU
285.14 * General Public License Version 2 only ("GPL") or the Common
285.15 @@ -13,9 +16,9 @@
285.16 * specific language governing permissions and limitations under the
285.17 * License. When distributing the software, include this License Header
285.18 * Notice in each file and include the License file at
285.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
285.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
285.21 * particular file as subject to the "Classpath" exception as provided
285.22 - * by Sun in the GPL Version 2 section of the License file that
285.23 + * by Oracle in the GPL Version 2 section of the License file that
285.24 * accompanied this code. If applicable, add the following below the
285.25 * License Header, with the fields enclosed by brackets [] replaced by
285.26 * your own identifying information:
286.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataListener.java Fri Jul 16 11:47:36 2010 -0400
286.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataListener.java Fri Jul 16 14:21:50 2010 -0400
286.3 @@ -1,7 +1,10 @@
286.4 /*
286.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
286.6 *
286.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
286.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
286.9 + *
286.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
286.11 + * Other names may be trademarks of their respective owners.
286.12 *
286.13 * The contents of this file are subject to the terms of either the GNU
286.14 * General Public License Version 2 only ("GPL") or the Common
286.15 @@ -13,9 +16,9 @@
286.16 * specific language governing permissions and limitations under the
286.17 * License. When distributing the software, include this License Header
286.18 * Notice in each file and include the License file at
286.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
286.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
286.21 * particular file as subject to the "Classpath" exception as provided
286.22 - * by Sun in the GPL Version 2 section of the License file that
286.23 + * by Oracle in the GPL Version 2 section of the License file that
286.24 * accompanied this code. If applicable, add the following below the
286.25 * License Header, with the fields enclosed by brackets [] replaced by
286.26 * your own identifying information:
287.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataProvider.java Fri Jul 16 11:47:36 2010 -0400
287.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataProvider.java Fri Jul 16 14:21:50 2010 -0400
287.3 @@ -1,7 +1,10 @@
287.4 /*
287.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
287.6 *
287.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
287.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
287.9 + *
287.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
287.11 + * Other names may be trademarks of their respective owners.
287.12 *
287.13 * The contents of this file are subject to the terms of either the GNU
287.14 * General Public License Version 2 only ("GPL") or the Common
287.15 @@ -13,9 +16,9 @@
287.16 * specific language governing permissions and limitations under the
287.17 * License. When distributing the software, include this License Header
287.18 * Notice in each file and include the License file at
287.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
287.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
287.21 * particular file as subject to the "Classpath" exception as provided
287.22 - * by Sun in the GPL Version 2 section of the License file that
287.23 + * by Oracle in the GPL Version 2 section of the License file that
287.24 * accompanied this code. If applicable, add the following below the
287.25 * License Header, with the fields enclosed by brackets [] replaced by
287.26 * your own identifying information:
288.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataSorter.java Fri Jul 16 11:47:36 2010 -0400
288.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TableDataSorter.java Fri Jul 16 14:21:50 2010 -0400
288.3 @@ -1,7 +1,10 @@
288.4 /*
288.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
288.6 *
288.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
288.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
288.9 + *
288.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
288.11 + * Other names may be trademarks of their respective owners.
288.12 *
288.13 * The contents of this file are subject to the terms of either the GNU
288.14 * General Public License Version 2 only ("GPL") or the Common
288.15 @@ -13,9 +16,9 @@
288.16 * specific language governing permissions and limitations under the
288.17 * License. When distributing the software, include this License Header
288.18 * Notice in each file and include the License file at
288.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
288.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
288.21 * particular file as subject to the "Classpath" exception as provided
288.22 - * by Sun in the GPL Version 2 section of the License file that
288.23 + * by Oracle in the GPL Version 2 section of the License file that
288.24 * accompanied this code. If applicable, add the following below the
288.25 * License Header, with the fields enclosed by brackets [] replaced by
288.26 * your own identifying information:
289.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TransactionalDataAdapter.java Fri Jul 16 11:47:36 2010 -0400
289.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TransactionalDataAdapter.java Fri Jul 16 14:21:50 2010 -0400
289.3 @@ -1,7 +1,10 @@
289.4 /*
289.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
289.6 *
289.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
289.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
289.9 + *
289.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
289.11 + * Other names may be trademarks of their respective owners.
289.12 *
289.13 * The contents of this file are subject to the terms of either the GNU
289.14 * General Public License Version 2 only ("GPL") or the Common
289.15 @@ -13,9 +16,9 @@
289.16 * specific language governing permissions and limitations under the
289.17 * License. When distributing the software, include this License Header
289.18 * Notice in each file and include the License file at
289.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
289.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
289.21 * particular file as subject to the "Classpath" exception as provided
289.22 - * by Sun in the GPL Version 2 section of the License file that
289.23 + * by Oracle in the GPL Version 2 section of the License file that
289.24 * accompanied this code. If applicable, add the following below the
289.25 * License Header, with the fields enclosed by brackets [] replaced by
289.26 * your own identifying information:
290.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TransactionalDataListener.java Fri Jul 16 11:47:36 2010 -0400
290.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TransactionalDataListener.java Fri Jul 16 14:21:50 2010 -0400
290.3 @@ -1,7 +1,10 @@
290.4 /*
290.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
290.6 *
290.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
290.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
290.9 + *
290.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
290.11 + * Other names may be trademarks of their respective owners.
290.12 *
290.13 * The contents of this file are subject to the terms of either the GNU
290.14 * General Public License Version 2 only ("GPL") or the Common
290.15 @@ -13,9 +16,9 @@
290.16 * specific language governing permissions and limitations under the
290.17 * License. When distributing the software, include this License Header
290.18 * Notice in each file and include the License file at
290.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
290.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
290.21 * particular file as subject to the "Classpath" exception as provided
290.22 - * by Sun in the GPL Version 2 section of the License file that
290.23 + * by Oracle in the GPL Version 2 section of the License file that
290.24 * accompanied this code. If applicable, add the following below the
290.25 * License Header, with the fields enclosed by brackets [] replaced by
290.26 * your own identifying information:
291.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/TransactionalDataProvider.java Fri Jul 16 11:47:36 2010 -0400
291.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/TransactionalDataProvider.java Fri Jul 16 14:21:50 2010 -0400
291.3 @@ -1,7 +1,10 @@
291.4 /*
291.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
291.6 *
291.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
291.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
291.9 + *
291.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
291.11 + * Other names may be trademarks of their respective owners.
291.12 *
291.13 * The contents of this file are subject to the terms of either the GNU
291.14 * General Public License Version 2 only ("GPL") or the Common
291.15 @@ -13,9 +16,9 @@
291.16 * specific language governing permissions and limitations under the
291.17 * License. When distributing the software, include this License Header
291.18 * Notice in each file and include the License file at
291.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
291.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
291.21 * particular file as subject to the "Classpath" exception as provided
291.22 - * by Sun in the GPL Version 2 section of the License file that
291.23 + * by Oracle in the GPL Version 2 section of the License file that
291.24 * accompanied this code. If applicable, add the following below the
291.25 * License Header, with the fields enclosed by brackets [] replaced by
291.26 * your own identifying information:
292.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/AbstractDataProvider.java Fri Jul 16 11:47:36 2010 -0400
292.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/AbstractDataProvider.java Fri Jul 16 14:21:50 2010 -0400
292.3 @@ -1,7 +1,10 @@
292.4 /*
292.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
292.6 *
292.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
292.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
292.9 + *
292.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
292.11 + * Other names may be trademarks of their respective owners.
292.12 *
292.13 * The contents of this file are subject to the terms of either the GNU
292.14 * General Public License Version 2 only ("GPL") or the Common
292.15 @@ -13,9 +16,9 @@
292.16 * specific language governing permissions and limitations under the
292.17 * License. When distributing the software, include this License Header
292.18 * Notice in each file and include the License file at
292.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
292.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
292.21 * particular file as subject to the "Classpath" exception as provided
292.22 - * by Sun in the GPL Version 2 section of the License file that
292.23 + * by Oracle in the GPL Version 2 section of the License file that
292.24 * accompanied this code. If applicable, add the following below the
292.25 * License Header, with the fields enclosed by brackets [] replaced by
292.26 * your own identifying information:
293.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/AbstractTableDataProvider.java Fri Jul 16 11:47:36 2010 -0400
293.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/AbstractTableDataProvider.java Fri Jul 16 14:21:50 2010 -0400
293.3 @@ -1,7 +1,10 @@
293.4 /*
293.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
293.6 *
293.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
293.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
293.9 + *
293.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
293.11 + * Other names may be trademarks of their respective owners.
293.12 *
293.13 * The contents of this file are subject to the terms of either the GNU
293.14 * General Public License Version 2 only ("GPL") or the Common
293.15 @@ -13,9 +16,9 @@
293.16 * specific language governing permissions and limitations under the
293.17 * License. When distributing the software, include this License Header
293.18 * Notice in each file and include the License file at
293.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
293.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
293.21 * particular file as subject to the "Classpath" exception as provided
293.22 - * by Sun in the GPL Version 2 section of the License file that
293.23 + * by Oracle in the GPL Version 2 section of the License file that
293.24 * accompanied this code. If applicable, add the following below the
293.25 * License Header, with the fields enclosed by brackets [] replaced by
293.26 * your own identifying information:
294.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/BasicTableDataFilter.java Fri Jul 16 11:47:36 2010 -0400
294.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/BasicTableDataFilter.java Fri Jul 16 14:21:50 2010 -0400
294.3 @@ -1,7 +1,10 @@
294.4 /*
294.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
294.6 *
294.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
294.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
294.9 + *
294.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
294.11 + * Other names may be trademarks of their respective owners.
294.12 *
294.13 * The contents of this file are subject to the terms of either the GNU
294.14 * General Public License Version 2 only ("GPL") or the Common
294.15 @@ -13,9 +16,9 @@
294.16 * specific language governing permissions and limitations under the
294.17 * License. When distributing the software, include this License Header
294.18 * Notice in each file and include the License file at
294.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
294.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
294.21 * particular file as subject to the "Classpath" exception as provided
294.22 - * by Sun in the GPL Version 2 section of the License file that
294.23 + * by Oracle in the GPL Version 2 section of the License file that
294.24 * accompanied this code. If applicable, add the following below the
294.25 * License Header, with the fields enclosed by brackets [] replaced by
294.26 * your own identifying information:
295.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/BasicTableDataSorter.java Fri Jul 16 11:47:36 2010 -0400
295.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/BasicTableDataSorter.java Fri Jul 16 14:21:50 2010 -0400
295.3 @@ -1,7 +1,10 @@
295.4 /*
295.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
295.6 *
295.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
295.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
295.9 + *
295.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
295.11 + * Other names may be trademarks of their respective owners.
295.12 *
295.13 * The contents of this file are subject to the terms of either the GNU
295.14 * General Public License Version 2 only ("GPL") or the Common
295.15 @@ -13,9 +16,9 @@
295.16 * specific language governing permissions and limitations under the
295.17 * License. When distributing the software, include this License Header
295.18 * Notice in each file and include the License file at
295.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
295.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
295.21 * particular file as subject to the "Classpath" exception as provided
295.22 - * by Sun in the GPL Version 2 section of the License file that
295.23 + * by Oracle in the GPL Version 2 section of the License file that
295.24 * accompanied this code. If applicable, add the following below the
295.25 * License Header, with the fields enclosed by brackets [] replaced by
295.26 * your own identifying information:
296.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/BasicTransactionalDataProvider.java Fri Jul 16 11:47:36 2010 -0400
296.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/BasicTransactionalDataProvider.java Fri Jul 16 14:21:50 2010 -0400
296.3 @@ -1,7 +1,10 @@
296.4 /*
296.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
296.6 *
296.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
296.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
296.9 + *
296.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
296.11 + * Other names may be trademarks of their respective owners.
296.12 *
296.13 * The contents of this file are subject to the terms of either the GNU
296.14 * General Public License Version 2 only ("GPL") or the Common
296.15 @@ -13,9 +16,9 @@
296.16 * specific language governing permissions and limitations under the
296.17 * License. When distributing the software, include this License Header
296.18 * Notice in each file and include the License file at
296.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
296.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
296.21 * particular file as subject to the "Classpath" exception as provided
296.22 - * by Sun in the GPL Version 2 section of the License file that
296.23 + * by Oracle in the GPL Version 2 section of the License file that
296.24 * accompanied this code. If applicable, add the following below the
296.25 * License Header, with the fields enclosed by brackets [] replaced by
296.26 * your own identifying information:
297.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/BasicTransactionalTableDataProvider.java Fri Jul 16 11:47:36 2010 -0400
297.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/BasicTransactionalTableDataProvider.java Fri Jul 16 14:21:50 2010 -0400
297.3 @@ -1,7 +1,10 @@
297.4 /*
297.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
297.6 *
297.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
297.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
297.9 + *
297.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
297.11 + * Other names may be trademarks of their respective owners.
297.12 *
297.13 * The contents of this file are subject to the terms of either the GNU
297.14 * General Public License Version 2 only ("GPL") or the Common
297.15 @@ -13,9 +16,9 @@
297.16 * specific language governing permissions and limitations under the
297.17 * License. When distributing the software, include this License Header
297.18 * Notice in each file and include the License file at
297.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
297.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
297.21 * particular file as subject to the "Classpath" exception as provided
297.22 - * by Sun in the GPL Version 2 section of the License file that
297.23 + * by Oracle in the GPL Version 2 section of the License file that
297.24 * accompanied this code. If applicable, add the following below the
297.25 * License Header, with the fields enclosed by brackets [] replaced by
297.26 * your own identifying information:
298.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
298.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
298.3 @@ -1,6 +1,9 @@
298.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
298.5 #
298.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
298.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
298.8 +#
298.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
298.10 +# Other names may be trademarks of their respective owners.
298.11 #
298.12 # The contents of this file are subject to the terms of either the GNU
298.13 # General Public License Version 2 only ("GPL") or the Common
298.14 @@ -12,9 +15,9 @@
298.15 # specific language governing permissions and limitations under the
298.16 # License. When distributing the software, include this License Header
298.17 # Notice in each file and include the License file at
298.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
298.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
298.20 # particular file as subject to the "Classpath" exception as provided
298.21 -# by Sun in the GPL Version 2 section of the License file that
298.22 +# by Oracle in the GPL Version 2 section of the License file that
298.23 # accompanied this code. If applicable, add the following below the
298.24 # License Header, with the fields enclosed by brackets [] replaced by
298.25 # your own identifying information:
299.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/CachedRowSetDataProvider.java Fri Jul 16 11:47:36 2010 -0400
299.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/CachedRowSetDataProvider.java Fri Jul 16 14:21:50 2010 -0400
299.3 @@ -1,7 +1,10 @@
299.4 /*
299.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
299.6 *
299.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
299.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
299.9 + *
299.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
299.11 + * Other names may be trademarks of their respective owners.
299.12 *
299.13 * The contents of this file are subject to the terms of either the GNU
299.14 * General Public License Version 2 only ("GPL") or the Common
299.15 @@ -13,9 +16,9 @@
299.16 * specific language governing permissions and limitations under the
299.17 * License. When distributing the software, include this License Header
299.18 * Notice in each file and include the License file at
299.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
299.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
299.21 * particular file as subject to the "Classpath" exception as provided
299.22 - * by Sun in the GPL Version 2 section of the License file that
299.23 + * by Oracle in the GPL Version 2 section of the License file that
299.24 * accompanied this code. If applicable, add the following below the
299.25 * License Header, with the fields enclosed by brackets [] replaced by
299.26 * your own identifying information:
300.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/CompareFilterCriteria.java Fri Jul 16 11:47:36 2010 -0400
300.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/CompareFilterCriteria.java Fri Jul 16 14:21:50 2010 -0400
300.3 @@ -1,7 +1,10 @@
300.4 /*
300.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
300.6 *
300.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
300.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
300.9 + *
300.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
300.11 + * Other names may be trademarks of their respective owners.
300.12 *
300.13 * The contents of this file are subject to the terms of either the GNU
300.14 * General Public License Version 2 only ("GPL") or the Common
300.15 @@ -13,9 +16,9 @@
300.16 * specific language governing permissions and limitations under the
300.17 * License. When distributing the software, include this License Header
300.18 * Notice in each file and include the License file at
300.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
300.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
300.21 * particular file as subject to the "Classpath" exception as provided
300.22 - * by Sun in the GPL Version 2 section of the License file that
300.23 + * by Oracle in the GPL Version 2 section of the License file that
300.24 * accompanied this code. If applicable, add the following below the
300.25 * License Header, with the fields enclosed by brackets [] replaced by
300.26 * your own identifying information:
301.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/FieldIdSortCriteria.java Fri Jul 16 11:47:36 2010 -0400
301.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/FieldIdSortCriteria.java Fri Jul 16 14:21:50 2010 -0400
301.3 @@ -1,7 +1,10 @@
301.4 /*
301.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
301.6 *
301.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
301.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
301.9 + *
301.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
301.11 + * Other names may be trademarks of their respective owners.
301.12 *
301.13 * The contents of this file are subject to the terms of either the GNU
301.14 * General Public License Version 2 only ("GPL") or the Common
301.15 @@ -13,9 +16,9 @@
301.16 * specific language governing permissions and limitations under the
301.17 * License. When distributing the software, include this License Header
301.18 * Notice in each file and include the License file at
301.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
301.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
301.21 * particular file as subject to the "Classpath" exception as provided
301.22 - * by Sun in the GPL Version 2 section of the License file that
301.23 + * by Oracle in the GPL Version 2 section of the License file that
301.24 * accompanied this code. If applicable, add the following below the
301.25 * License Header, with the fields enclosed by brackets [] replaced by
301.26 * your own identifying information:
302.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/FieldKeySortCriteria.java Fri Jul 16 11:47:36 2010 -0400
302.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/FieldKeySortCriteria.java Fri Jul 16 14:21:50 2010 -0400
302.3 @@ -1,7 +1,10 @@
302.4 /*
302.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
302.6 *
302.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
302.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
302.9 + *
302.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
302.11 + * Other names may be trademarks of their respective owners.
302.12 *
302.13 * The contents of this file are subject to the terms of either the GNU
302.14 * General Public License Version 2 only ("GPL") or the Common
302.15 @@ -13,9 +16,9 @@
302.16 * specific language governing permissions and limitations under the
302.17 * License. When distributing the software, include this License Header
302.18 * Notice in each file and include the License file at
302.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
302.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
302.21 * particular file as subject to the "Classpath" exception as provided
302.22 - * by Sun in the GPL Version 2 section of the License file that
302.23 + * by Oracle in the GPL Version 2 section of the License file that
302.24 * accompanied this code. If applicable, add the following below the
302.25 * License Header, with the fields enclosed by brackets [] replaced by
302.26 * your own identifying information:
303.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/FilteredTableDataProvider.java Fri Jul 16 11:47:36 2010 -0400
303.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/FilteredTableDataProvider.java Fri Jul 16 14:21:50 2010 -0400
303.3 @@ -1,7 +1,10 @@
303.4 /*
303.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
303.6 *
303.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
303.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
303.9 + *
303.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
303.11 + * Other names may be trademarks of their respective owners.
303.12 *
303.13 * The contents of this file are subject to the terms of either the GNU
303.14 * General Public License Version 2 only ("GPL") or the Common
303.15 @@ -13,9 +16,9 @@
303.16 * specific language governing permissions and limitations under the
303.17 * License. When distributing the software, include this License Header
303.18 * Notice in each file and include the License file at
303.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
303.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
303.21 * particular file as subject to the "Classpath" exception as provided
303.22 - * by Sun in the GPL Version 2 section of the License file that
303.23 + * by Oracle in the GPL Version 2 section of the License file that
303.24 * accompanied this code. If applicable, add the following below the
303.25 * License Header, with the fields enclosed by brackets [] replaced by
303.26 * your own identifying information:
304.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/IndexRowKey.java Fri Jul 16 11:47:36 2010 -0400
304.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/IndexRowKey.java Fri Jul 16 14:21:50 2010 -0400
304.3 @@ -1,7 +1,10 @@
304.4 /*
304.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
304.6 *
304.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
304.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
304.9 + *
304.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
304.11 + * Other names may be trademarks of their respective owners.
304.12 *
304.13 * The contents of this file are subject to the terms of either the GNU
304.14 * General Public License Version 2 only ("GPL") or the Common
304.15 @@ -13,9 +16,9 @@
304.16 * specific language governing permissions and limitations under the
304.17 * License. When distributing the software, include this License Header
304.18 * Notice in each file and include the License file at
304.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
304.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
304.21 * particular file as subject to the "Classpath" exception as provided
304.22 - * by Sun in the GPL Version 2 section of the License file that
304.23 + * by Oracle in the GPL Version 2 section of the License file that
304.24 * accompanied this code. If applicable, add the following below the
304.25 * License Header, with the fields enclosed by brackets [] replaced by
304.26 * your own identifying information:
305.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ListDataProvider.java Fri Jul 16 11:47:36 2010 -0400
305.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ListDataProvider.java Fri Jul 16 14:21:50 2010 -0400
305.3 @@ -1,7 +1,10 @@
305.4 /*
305.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
305.6 *
305.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
305.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
305.9 + *
305.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
305.11 + * Other names may be trademarks of their respective owners.
305.12 *
305.13 * The contents of this file are subject to the terms of either the GNU
305.14 * General Public License Version 2 only ("GPL") or the Common
305.15 @@ -13,9 +16,9 @@
305.16 * specific language governing permissions and limitations under the
305.17 * License. When distributing the software, include this License Header
305.18 * Notice in each file and include the License file at
305.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
305.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
305.21 * particular file as subject to the "Classpath" exception as provided
305.22 - * by Sun in the GPL Version 2 section of the License file that
305.23 + * by Oracle in the GPL Version 2 section of the License file that
305.24 * accompanied this code. If applicable, add the following below the
305.25 * License Header, with the fields enclosed by brackets [] replaced by
305.26 * your own identifying information:
306.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MapDataProvider.java Fri Jul 16 11:47:36 2010 -0400
306.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MapDataProvider.java Fri Jul 16 14:21:50 2010 -0400
306.3 @@ -1,7 +1,10 @@
306.4 /*
306.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
306.6 *
306.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
306.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
306.9 + *
306.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
306.11 + * Other names may be trademarks of their respective owners.
306.12 *
306.13 * The contents of this file are subject to the terms of either the GNU
306.14 * General Public License Version 2 only ("GPL") or the Common
306.15 @@ -13,9 +16,9 @@
306.16 * specific language governing permissions and limitations under the
306.17 * License. When distributing the software, include this License Header
306.18 * Notice in each file and include the License file at
306.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
306.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
306.21 * particular file as subject to the "Classpath" exception as provided
306.22 - * by Sun in the GPL Version 2 section of the License file that
306.23 + * by Oracle in the GPL Version 2 section of the License file that
306.24 * accompanied this code. If applicable, add the following below the
306.25 * License Header, with the fields enclosed by brackets [] replaced by
306.26 * your own identifying information:
307.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MapListDataProvider.java Fri Jul 16 11:47:36 2010 -0400
307.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MapListDataProvider.java Fri Jul 16 14:21:50 2010 -0400
307.3 @@ -1,7 +1,10 @@
307.4 /*
307.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
307.6 *
307.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
307.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
307.9 + *
307.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
307.11 + * Other names may be trademarks of their respective owners.
307.12 *
307.13 * The contents of this file are subject to the terms of either the GNU
307.14 * General Public License Version 2 only ("GPL") or the Common
307.15 @@ -13,9 +16,9 @@
307.16 * specific language governing permissions and limitations under the
307.17 * License. When distributing the software, include this License Header
307.18 * Notice in each file and include the License file at
307.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
307.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
307.21 * particular file as subject to the "Classpath" exception as provided
307.22 - * by Sun in the GPL Version 2 section of the License file that
307.23 + * by Oracle in the GPL Version 2 section of the License file that
307.24 * accompanied this code. If applicable, add the following below the
307.25 * License Header, with the fields enclosed by brackets [] replaced by
307.26 * your own identifying information:
308.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MetaDataDeserializer.java Fri Jul 16 11:47:36 2010 -0400
308.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MetaDataDeserializer.java Fri Jul 16 14:21:50 2010 -0400
308.3 @@ -1,7 +1,10 @@
308.4 /*
308.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
308.6 *
308.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
308.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
308.9 + *
308.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
308.11 + * Other names may be trademarks of their respective owners.
308.12 *
308.13 * The contents of this file are subject to the terms of either the GNU
308.14 * General Public License Version 2 only ("GPL") or the Common
308.15 @@ -13,9 +16,9 @@
308.16 * specific language governing permissions and limitations under the
308.17 * License. When distributing the software, include this License Header
308.18 * Notice in each file and include the License file at
308.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
308.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
308.21 * particular file as subject to the "Classpath" exception as provided
308.22 - * by Sun in the GPL Version 2 section of the License file that
308.23 + * by Oracle in the GPL Version 2 section of the License file that
308.24 * accompanied this code. If applicable, add the following below the
308.25 * License Header, with the fields enclosed by brackets [] replaced by
308.26 * your own identifying information:
309.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MetaDataSerializer.java Fri Jul 16 11:47:36 2010 -0400
309.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MetaDataSerializer.java Fri Jul 16 14:21:50 2010 -0400
309.3 @@ -1,7 +1,10 @@
309.4 /*
309.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
309.6 *
309.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
309.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
309.9 + *
309.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
309.11 + * Other names may be trademarks of their respective owners.
309.12 *
309.13 * The contents of this file are subject to the terms of either the GNU
309.14 * General Public License Version 2 only ("GPL") or the Common
309.15 @@ -13,9 +16,9 @@
309.16 * specific language governing permissions and limitations under the
309.17 * License. When distributing the software, include this License Header
309.18 * Notice in each file and include the License file at
309.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
309.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
309.21 * particular file as subject to the "Classpath" exception as provided
309.22 - * by Sun in the GPL Version 2 section of the License file that
309.23 + * by Oracle in the GPL Version 2 section of the License file that
309.24 * accompanied this code. If applicable, add the following below the
309.25 * License Header, with the fields enclosed by brackets [] replaced by
309.26 * your own identifying information:
310.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MethodResultDataProvider.java Fri Jul 16 11:47:36 2010 -0400
310.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MethodResultDataProvider.java Fri Jul 16 14:21:50 2010 -0400
310.3 @@ -1,7 +1,10 @@
310.4 /*
310.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
310.6 *
310.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
310.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
310.9 + *
310.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
310.11 + * Other names may be trademarks of their respective owners.
310.12 *
310.13 * The contents of this file are subject to the terms of either the GNU
310.14 * General Public License Version 2 only ("GPL") or the Common
310.15 @@ -13,9 +16,9 @@
310.16 * specific language governing permissions and limitations under the
310.17 * License. When distributing the software, include this License Header
310.18 * Notice in each file and include the License file at
310.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
310.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
310.21 * particular file as subject to the "Classpath" exception as provided
310.22 - * by Sun in the GPL Version 2 section of the License file that
310.23 + * by Oracle in the GPL Version 2 section of the License file that
310.24 * accompanied this code. If applicable, add the following below the
310.25 * License Header, with the fields enclosed by brackets [] replaced by
310.26 * your own identifying information:
311.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MethodResultTableDataProvider.java Fri Jul 16 11:47:36 2010 -0400
311.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/MethodResultTableDataProvider.java Fri Jul 16 14:21:50 2010 -0400
311.3 @@ -1,7 +1,10 @@
311.4 /*
311.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
311.6 *
311.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
311.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
311.9 + *
311.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
311.11 + * Other names may be trademarks of their respective owners.
311.12 *
311.13 * The contents of this file are subject to the terms of either the GNU
311.14 * General Public License Version 2 only ("GPL") or the Common
311.15 @@ -13,9 +16,9 @@
311.16 * specific language governing permissions and limitations under the
311.17 * License. When distributing the software, include this License Header
311.18 * Notice in each file and include the License file at
311.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
311.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
311.21 * particular file as subject to the "Classpath" exception as provided
311.22 - * by Sun in the GPL Version 2 section of the License file that
311.23 + * by Oracle in the GPL Version 2 section of the License file that
311.24 * accompanied this code. If applicable, add the following below the
311.25 * License Header, with the fields enclosed by brackets [] replaced by
311.26 * your own identifying information:
312.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/NestedFilterCriteria.java Fri Jul 16 11:47:36 2010 -0400
312.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/NestedFilterCriteria.java Fri Jul 16 14:21:50 2010 -0400
312.3 @@ -1,7 +1,10 @@
312.4 /*
312.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
312.6 *
312.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
312.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
312.9 + *
312.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
312.11 + * Other names may be trademarks of their respective owners.
312.12 *
312.13 * The contents of this file are subject to the terms of either the GNU
312.14 * General Public License Version 2 only ("GPL") or the Common
312.15 @@ -13,9 +16,9 @@
312.16 * specific language governing permissions and limitations under the
312.17 * License. When distributing the software, include this License Header
312.18 * Notice in each file and include the License file at
312.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
312.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
312.21 * particular file as subject to the "Classpath" exception as provided
312.22 - * by Sun in the GPL Version 2 section of the License file that
312.23 + * by Oracle in the GPL Version 2 section of the License file that
312.24 * accompanied this code. If applicable, add the following below the
312.25 * License Header, with the fields enclosed by brackets [] replaced by
312.26 * your own identifying information:
313.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectArrayDataProvider.java Fri Jul 16 11:47:36 2010 -0400
313.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectArrayDataProvider.java Fri Jul 16 14:21:50 2010 -0400
313.3 @@ -1,7 +1,10 @@
313.4 /*
313.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
313.6 *
313.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
313.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
313.9 + *
313.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
313.11 + * Other names may be trademarks of their respective owners.
313.12 *
313.13 * The contents of this file are subject to the terms of either the GNU
313.14 * General Public License Version 2 only ("GPL") or the Common
313.15 @@ -13,9 +16,9 @@
313.16 * specific language governing permissions and limitations under the
313.17 * License. When distributing the software, include this License Header
313.18 * Notice in each file and include the License file at
313.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
313.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
313.21 * particular file as subject to the "Classpath" exception as provided
313.22 - * by Sun in the GPL Version 2 section of the License file that
313.23 + * by Oracle in the GPL Version 2 section of the License file that
313.24 * accompanied this code. If applicable, add the following below the
313.25 * License Header, with the fields enclosed by brackets [] replaced by
313.26 * your own identifying information:
314.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectArrayRowKey.java Fri Jul 16 11:47:36 2010 -0400
314.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectArrayRowKey.java Fri Jul 16 14:21:50 2010 -0400
314.3 @@ -1,7 +1,10 @@
314.4 /*
314.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
314.6 *
314.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
314.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
314.9 + *
314.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
314.11 + * Other names may be trademarks of their respective owners.
314.12 *
314.13 * The contents of this file are subject to the terms of either the GNU
314.14 * General Public License Version 2 only ("GPL") or the Common
314.15 @@ -13,9 +16,9 @@
314.16 * specific language governing permissions and limitations under the
314.17 * License. When distributing the software, include this License Header
314.18 * Notice in each file and include the License file at
314.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
314.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
314.21 * particular file as subject to the "Classpath" exception as provided
314.22 - * by Sun in the GPL Version 2 section of the License file that
314.23 + * by Oracle in the GPL Version 2 section of the License file that
314.24 * accompanied this code. If applicable, add the following below the
314.25 * License Header, with the fields enclosed by brackets [] replaced by
314.26 * your own identifying information:
315.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectDataProvider.java Fri Jul 16 11:47:36 2010 -0400
315.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectDataProvider.java Fri Jul 16 14:21:50 2010 -0400
315.3 @@ -1,7 +1,10 @@
315.4 /*
315.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
315.6 *
315.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
315.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
315.9 + *
315.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
315.11 + * Other names may be trademarks of their respective owners.
315.12 *
315.13 * The contents of this file are subject to the terms of either the GNU
315.14 * General Public License Version 2 only ("GPL") or the Common
315.15 @@ -13,9 +16,9 @@
315.16 * specific language governing permissions and limitations under the
315.17 * License. When distributing the software, include this License Header
315.18 * Notice in each file and include the License file at
315.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
315.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
315.21 * particular file as subject to the "Classpath" exception as provided
315.22 - * by Sun in the GPL Version 2 section of the License file that
315.23 + * by Oracle in the GPL Version 2 section of the License file that
315.24 * accompanied this code. If applicable, add the following below the
315.25 * License Header, with the fields enclosed by brackets [] replaced by
315.26 * your own identifying information:
316.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectFieldKeySupport.java Fri Jul 16 11:47:36 2010 -0400
316.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectFieldKeySupport.java Fri Jul 16 14:21:50 2010 -0400
316.3 @@ -1,7 +1,10 @@
316.4 /*
316.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
316.6 *
316.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
316.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
316.9 + *
316.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
316.11 + * Other names may be trademarks of their respective owners.
316.12 *
316.13 * The contents of this file are subject to the terms of either the GNU
316.14 * General Public License Version 2 only ("GPL") or the Common
316.15 @@ -13,9 +16,9 @@
316.16 * specific language governing permissions and limitations under the
316.17 * License. When distributing the software, include this License Header
316.18 * Notice in each file and include the License file at
316.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
316.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
316.21 * particular file as subject to the "Classpath" exception as provided
316.22 - * by Sun in the GPL Version 2 section of the License file that
316.23 + * by Oracle in the GPL Version 2 section of the License file that
316.24 * accompanied this code. If applicable, add the following below the
316.25 * License Header, with the fields enclosed by brackets [] replaced by
316.26 * your own identifying information:
317.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectListDataProvider.java Fri Jul 16 11:47:36 2010 -0400
317.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectListDataProvider.java Fri Jul 16 14:21:50 2010 -0400
317.3 @@ -1,7 +1,10 @@
317.4 /*
317.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
317.6 *
317.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
317.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
317.9 + *
317.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
317.11 + * Other names may be trademarks of their respective owners.
317.12 *
317.13 * The contents of this file are subject to the terms of either the GNU
317.14 * General Public License Version 2 only ("GPL") or the Common
317.15 @@ -13,9 +16,9 @@
317.16 * specific language governing permissions and limitations under the
317.17 * License. When distributing the software, include this License Header
317.18 * Notice in each file and include the License file at
317.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
317.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
317.21 * particular file as subject to the "Classpath" exception as provided
317.22 - * by Sun in the GPL Version 2 section of the License file that
317.23 + * by Oracle in the GPL Version 2 section of the License file that
317.24 * accompanied this code. If applicable, add the following below the
317.25 * License Header, with the fields enclosed by brackets [] replaced by
317.26 * your own identifying information:
318.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectRowKey.java Fri Jul 16 11:47:36 2010 -0400
318.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/ObjectRowKey.java Fri Jul 16 14:21:50 2010 -0400
318.3 @@ -1,7 +1,10 @@
318.4 /*
318.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
318.6 *
318.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
318.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
318.9 + *
318.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
318.11 + * Other names may be trademarks of their respective owners.
318.12 *
318.13 * The contents of this file are subject to the terms of either the GNU
318.14 * General Public License Version 2 only ("GPL") or the Common
318.15 @@ -13,9 +16,9 @@
318.16 * specific language governing permissions and limitations under the
318.17 * License. When distributing the software, include this License Header
318.18 * Notice in each file and include the License file at
318.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
318.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
318.21 * particular file as subject to the "Classpath" exception as provided
318.22 - * by Sun in the GPL Version 2 section of the License file that
318.23 + * by Oracle in the GPL Version 2 section of the License file that
318.24 * accompanied this code. If applicable, add the following below the
318.25 * License Header, with the fields enclosed by brackets [] replaced by
318.26 * your own identifying information:
319.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/RegexFilterCriteria.java Fri Jul 16 11:47:36 2010 -0400
319.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/RegexFilterCriteria.java Fri Jul 16 14:21:50 2010 -0400
319.3 @@ -1,7 +1,10 @@
319.4 /*
319.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
319.6 *
319.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
319.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
319.9 + *
319.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
319.11 + * Other names may be trademarks of their respective owners.
319.12 *
319.13 * The contents of this file are subject to the terms of either the GNU
319.14 * General Public License Version 2 only ("GPL") or the Common
319.15 @@ -13,9 +16,9 @@
319.16 * specific language governing permissions and limitations under the
319.17 * License. When distributing the software, include this License Header
319.18 * Notice in each file and include the License file at
319.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
319.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
319.21 * particular file as subject to the "Classpath" exception as provided
319.22 - * by Sun in the GPL Version 2 section of the License file that
319.23 + * by Oracle in the GPL Version 2 section of the License file that
319.24 * accompanied this code. If applicable, add the following below the
319.25 * License Header, with the fields enclosed by brackets [] replaced by
319.26 * your own identifying information:
320.1 --- a/visualweb.dataprovider/library/src/com/sun/data/provider/impl/TableRowDataProvider.java Fri Jul 16 11:47:36 2010 -0400
320.2 +++ b/visualweb.dataprovider/library/src/com/sun/data/provider/impl/TableRowDataProvider.java Fri Jul 16 14:21:50 2010 -0400
320.3 @@ -1,7 +1,10 @@
320.4 /*
320.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
320.6 *
320.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
320.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
320.9 + *
320.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
320.11 + * Other names may be trademarks of their respective owners.
320.12 *
320.13 * The contents of this file are subject to the terms of either the GNU
320.14 * General Public License Version 2 only ("GPL") or the Common
320.15 @@ -13,9 +16,9 @@
320.16 * specific language governing permissions and limitations under the
320.17 * License. When distributing the software, include this License Header
320.18 * Notice in each file and include the License file at
320.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
320.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
320.21 * particular file as subject to the "Classpath" exception as provided
320.22 - * by Sun in the GPL Version 2 section of the License file that
320.23 + * by Oracle in the GPL Version 2 section of the License file that
320.24 * accompanied this code. If applicable, add the following below the
320.25 * License Header, with the fields enclosed by brackets [] replaced by
320.26 * your own identifying information:
321.1 --- a/visualweb.dataprovider/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
321.2 +++ b/visualweb.dataprovider/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
321.3 @@ -1,6 +1,9 @@
321.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
321.5 #
321.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
321.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
321.8 +#
321.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
321.10 +# Other names may be trademarks of their respective owners.
321.11 #
321.12 # The contents of this file are subject to the terms of either the GNU
321.13 # General Public License Version 2 only ("GPL") or the Common
321.14 @@ -12,9 +15,9 @@
321.15 # specific language governing permissions and limitations under the
321.16 # License. When distributing the software, include this License Header
321.17 # Notice in each file and include the License file at
321.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
321.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
321.20 # particular file as subject to the "Classpath" exception as provided
321.21 -# by Sun in the GPL Version 2 section of the License file that
321.22 +# by Oracle in the GPL Version 2 section of the License file that
321.23 # accompanied this code. If applicable, add the following below the
321.24 # License Header, with the fields enclosed by brackets [] replaced by
321.25 # your own identifying information:
321.26 @@ -40,7 +43,7 @@
321.27 is.autoload=true
321.28 extra.module.files=modules/ext/dataprovider.jar,docs/dataprovider-doc.zip,docs/dataprovider-src.zip
321.29 javac.compilerargs=-Xlint -Xlint:-serial
321.30 -javac.source=1.5
321.31 +javac.source=1.6
321.32 test.qa-functional.cp.extra=${nb_all}/visualweb.kit/gravy/builds/gravy.jar:\
321.33 ${visualweb.dataprovider.dir}/modules/ext/tidy-mod.jar:\
321.34 ${nb_all}/testtools/external/httpunit.jar
322.1 --- a/visualweb.dataprovider/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
322.2 +++ b/visualweb.dataprovider/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
322.3 @@ -2,7 +2,10 @@
322.4 <!--
322.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
322.6
322.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
322.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
322.9 +
322.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
322.11 +Other names may be trademarks of their respective owners.
322.12
322.13
322.14 The contents of this file are subject to the terms of either the GNU
322.15 @@ -15,9 +18,9 @@
322.16 specific language governing permissions and limitations under the
322.17 License. When distributing the software, include this License Header
322.18 Notice in each file and include the License file at
322.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
322.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
322.21 particular file as subject to the "Classpath" exception as provided
322.22 -by Sun in the GPL Version 2 section of the License file that
322.23 +by Oracle in the GPL Version 2 section of the License file that
322.24 accompanied this code. If applicable, add the following below the
322.25 License Header, with the fields enclosed by brackets [] replaced by
322.26 your own identifying information:
323.1 --- a/visualweb.dataprovider/src/org/netbeans/modules/visualweb/dataprovider/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
323.2 +++ b/visualweb.dataprovider/src/org/netbeans/modules/visualweb/dataprovider/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
323.3 @@ -1,6 +1,9 @@
323.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
323.5 #
323.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
323.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
323.8 +#
323.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
323.10 +# Other names may be trademarks of their respective owners.
323.11 #
323.12 # The contents of this file are subject to the terms of either the GNU
323.13 # General Public License Version 2 only ("GPL") or the Common
323.14 @@ -12,9 +15,9 @@
323.15 # specific language governing permissions and limitations under the
323.16 # License. When distributing the software, include this License Header
323.17 # Notice in each file and include the License file at
323.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
323.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
323.20 # particular file as subject to the "Classpath" exception as provided
323.21 -# by Sun in the GPL Version 2 section of the License file that
323.22 +# by Oracle in the GPL Version 2 section of the License file that
323.23 # accompanied this code. If applicable, add the following below the
323.24 # License Header, with the fields enclosed by brackets [] replaced by
323.25 # your own identifying information:
324.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/CachedRowSetDataProvider_AcceptanceTests.java Fri Jul 16 11:47:36 2010 -0400
324.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/CachedRowSetDataProvider_AcceptanceTests.java Fri Jul 16 14:21:50 2010 -0400
324.3 @@ -1,7 +1,10 @@
324.4 /*
324.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
324.6
324.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
324.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
324.9 +
324.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
324.11 +Other names may be trademarks of their respective owners.
324.12
324.13
324.14 The contents of this file are subject to the terms of either the GNU
324.15 @@ -14,9 +17,9 @@
324.16 specific language governing permissions and limitations under the
324.17 License. When distributing the software, include this License Header
324.18 Notice in each file and include the License file at
324.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
324.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
324.21 particular file as subject to the "Classpath" exception as provided
324.22 -by Sun in the GPL Version 2 section of the License file that
324.23 +by Oracle in the GPL Version 2 section of the License file that
324.24 accompanied this code. If applicable, add the following below the
324.25 License Header, with the fields enclosed by brackets [] replaced by
324.26 your own identifying information:
325.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/PersonDropDownList.java Fri Jul 16 11:47:36 2010 -0400
325.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/PersonDropDownList.java Fri Jul 16 14:21:50 2010 -0400
325.3 @@ -1,7 +1,10 @@
325.4 /*
325.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
325.6
325.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
325.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
325.9 +
325.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
325.11 +Other names may be trademarks of their respective owners.
325.12
325.13
325.14 The contents of this file are subject to the terms of either the GNU
325.15 @@ -14,9 +17,9 @@
325.16 specific language governing permissions and limitations under the
325.17 License. When distributing the software, include this License Header
325.18 Notice in each file and include the License file at
325.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
325.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
325.21 particular file as subject to the "Classpath" exception as provided
325.22 -by Sun in the GPL Version 2 section of the License file that
325.23 +by Oracle in the GPL Version 2 section of the License file that
325.24 accompanied this code. If applicable, add the following below the
325.25 License Header, with the fields enclosed by brackets [] replaced by
325.26 your own identifying information:
326.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/RunProject.java Fri Jul 16 11:47:36 2010 -0400
326.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/RunProject.java Fri Jul 16 14:21:50 2010 -0400
326.3 @@ -1,7 +1,10 @@
326.4 /*
326.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
326.6
326.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
326.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
326.9 +
326.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
326.11 +Other names may be trademarks of their respective owners.
326.12
326.13
326.14 The contents of this file are subject to the terms of either the GNU
326.15 @@ -14,9 +17,9 @@
326.16 specific language governing permissions and limitations under the
326.17 License. When distributing the software, include this License Header
326.18 Notice in each file and include the License file at
326.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
326.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
326.21 particular file as subject to the "Classpath" exception as provided
326.22 -by Sun in the GPL Version 2 section of the License file that
326.23 +by Oracle in the GPL Version 2 section of the License file that
326.24 accompanied this code. If applicable, add the following below the
326.25 License Header, with the fields enclosed by brackets [] replaced by
326.26 your own identifying information:
327.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/TextFieldPageBeanDataProvider.java Fri Jul 16 11:47:36 2010 -0400
327.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/TextFieldPageBeanDataProvider.java Fri Jul 16 14:21:50 2010 -0400
327.3 @@ -1,7 +1,10 @@
327.4 /*
327.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
327.6
327.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
327.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
327.9 +
327.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
327.11 +Other names may be trademarks of their respective owners.
327.12
327.13
327.14 The contents of this file are subject to the terms of either the GNU
327.15 @@ -14,9 +17,9 @@
327.16 specific language governing permissions and limitations under the
327.17 License. When distributing the software, include this License Header
327.18 Notice in each file and include the License file at
327.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
327.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
327.21 particular file as subject to the "Classpath" exception as provided
327.22 -by Sun in the GPL Version 2 section of the License file that
327.23 +by Oracle in the GPL Version 2 section of the License file that
327.24 accompanied this code. If applicable, add the following below the
327.25 License Header, with the fields enclosed by brackets [] replaced by
327.26 your own identifying information:
328.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/TextFieldSessionBeanDataProvider.java Fri Jul 16 11:47:36 2010 -0400
328.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/TextFieldSessionBeanDataProvider.java Fri Jul 16 14:21:50 2010 -0400
328.3 @@ -1,7 +1,10 @@
328.4 /*
328.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
328.6
328.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
328.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
328.9 +
328.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
328.11 +Other names may be trademarks of their respective owners.
328.12
328.13
328.14 The contents of this file are subject to the terms of either the GNU
328.15 @@ -14,9 +17,9 @@
328.16 specific language governing permissions and limitations under the
328.17 License. When distributing the software, include this License Header
328.18 Notice in each file and include the License file at
328.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
328.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
328.21 particular file as subject to the "Classpath" exception as provided
328.22 -by Sun in the GPL Version 2 section of the License file that
328.23 +by Oracle in the GPL Version 2 section of the License file that
328.24 accompanied this code. If applicable, add the following below the
328.25 License Header, with the fields enclosed by brackets [] replaced by
328.26 your own identifying information:
329.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/TripTable.java Fri Jul 16 11:47:36 2010 -0400
329.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/TripTable.java Fri Jul 16 14:21:50 2010 -0400
329.3 @@ -1,7 +1,10 @@
329.4 /*
329.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
329.6
329.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
329.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
329.9 +
329.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
329.11 +Other names may be trademarks of their respective owners.
329.12
329.13
329.14 The contents of this file are subject to the terms of either the GNU
329.15 @@ -14,9 +17,9 @@
329.16 specific language governing permissions and limitations under the
329.17 License. When distributing the software, include this License Header
329.18 Notice in each file and include the License file at
329.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
329.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
329.21 particular file as subject to the "Classpath" exception as provided
329.22 -by Sun in the GPL Version 2 section of the License file that
329.23 +by Oracle in the GPL Version 2 section of the License file that
329.24 accompanied this code. If applicable, add the following below the
329.25 License Header, with the fields enclosed by brackets [] replaced by
329.26 your own identifying information:
330.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/VirtualFormConfigurator.java Fri Jul 16 11:47:36 2010 -0400
330.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/cachedrowsetdataprovider/VirtualFormConfigurator.java Fri Jul 16 14:21:50 2010 -0400
330.3 @@ -1,7 +1,10 @@
330.4 /*
330.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
330.6
330.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
330.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
330.9 +
330.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
330.11 +Other names may be trademarks of their respective owners.
330.12
330.13
330.14 The contents of this file are subject to the terms of either the GNU
330.15 @@ -14,9 +17,9 @@
330.16 specific language governing permissions and limitations under the
330.17 License. When distributing the software, include this License Header
330.18 Notice in each file and include the License file at
330.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
330.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
330.21 particular file as subject to the "Classpath" exception as provided
330.22 -by Sun in the GPL Version 2 section of the License file that
330.23 +by Oracle in the GPL Version 2 section of the License file that
330.24 accompanied this code. If applicable, add the following below the
330.25 License Header, with the fields enclosed by brackets [] replaced by
330.26 your own identifying information:
331.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/AppServerTests.java Fri Jul 16 11:47:36 2010 -0400
331.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/AppServerTests.java Fri Jul 16 14:21:50 2010 -0400
331.3 @@ -1,7 +1,10 @@
331.4 /*
331.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
331.6
331.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
331.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
331.9 +
331.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
331.11 +Other names may be trademarks of their respective owners.
331.12
331.13
331.14 The contents of this file are subject to the terms of either the GNU
331.15 @@ -14,9 +17,9 @@
331.16 specific language governing permissions and limitations under the
331.17 License. When distributing the software, include this License Header
331.18 Notice in each file and include the License file at
331.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
331.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
331.21 particular file as subject to the "Classpath" exception as provided
331.22 -by Sun in the GPL Version 2 section of the License file that
331.23 +by Oracle in the GPL Version 2 section of the License file that
331.24 accompanied this code. If applicable, add the following below the
331.25 License Header, with the fields enclosed by brackets [] replaced by
331.26 your own identifying information:
332.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/BaseTests.java Fri Jul 16 11:47:36 2010 -0400
332.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/BaseTests.java Fri Jul 16 14:21:50 2010 -0400
332.3 @@ -1,7 +1,10 @@
332.4 /*
332.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
332.6
332.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
332.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
332.9 +
332.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
332.11 +Other names may be trademarks of their respective owners.
332.12
332.13
332.14 The contents of this file are subject to the terms of either the GNU
332.15 @@ -14,9 +17,9 @@
332.16 specific language governing permissions and limitations under the
332.17 License. When distributing the software, include this License Header
332.18 Notice in each file and include the License file at
332.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
332.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
332.21 particular file as subject to the "Classpath" exception as provided
332.22 -by Sun in the GPL Version 2 section of the License file that
332.23 +by Oracle in the GPL Version 2 section of the License file that
332.24 accompanied this code. If applicable, add the following below the
332.25 License Header, with the fields enclosed by brackets [] replaced by
332.26 your own identifying information:
333.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/Constants.java Fri Jul 16 11:47:36 2010 -0400
333.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/Constants.java Fri Jul 16 14:21:50 2010 -0400
333.3 @@ -1,7 +1,10 @@
333.4 /*
333.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
333.6
333.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
333.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
333.9 +
333.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
333.11 +Other names may be trademarks of their respective owners.
333.12
333.13
333.14 The contents of this file are subject to the terms of either the GNU
333.15 @@ -14,9 +17,9 @@
333.16 specific language governing permissions and limitations under the
333.17 License. When distributing the software, include this License Header
333.18 Notice in each file and include the License file at
333.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
333.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
333.21 particular file as subject to the "Classpath" exception as provided
333.22 -by Sun in the GPL Version 2 section of the License file that
333.23 +by Oracle in the GPL Version 2 section of the License file that
333.24 accompanied this code. If applicable, add the following below the
333.25 License Header, with the fields enclosed by brackets [] replaced by
333.26 your own identifying information:
334.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/DatabaseTests.java Fri Jul 16 11:47:36 2010 -0400
334.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/DatabaseTests.java Fri Jul 16 14:21:50 2010 -0400
334.3 @@ -1,7 +1,10 @@
334.4 /*
334.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
334.6
334.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
334.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
334.9 +
334.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
334.11 +Other names may be trademarks of their respective owners.
334.12
334.13
334.14 The contents of this file are subject to the terms of either the GNU
334.15 @@ -14,9 +17,9 @@
334.16 specific language governing permissions and limitations under the
334.17 License. When distributing the software, include this License Header
334.18 Notice in each file and include the License file at
334.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
334.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
334.21 particular file as subject to the "Classpath" exception as provided
334.22 -by Sun in the GPL Version 2 section of the License file that
334.23 +by Oracle in the GPL Version 2 section of the License file that
334.24 accompanied this code. If applicable, add the following below the
334.25 License Header, with the fields enclosed by brackets [] replaced by
334.26 your own identifying information:
335.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/JSFComponent.java Fri Jul 16 11:47:36 2010 -0400
335.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/JSFComponent.java Fri Jul 16 14:21:50 2010 -0400
335.3 @@ -1,7 +1,10 @@
335.4 /*
335.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
335.6
335.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
335.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
335.9 +
335.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
335.11 +Other names may be trademarks of their respective owners.
335.12
335.13
335.14 The contents of this file are subject to the terms of either the GNU
335.15 @@ -14,9 +17,9 @@
335.16 specific language governing permissions and limitations under the
335.17 License. When distributing the software, include this License Header
335.18 Notice in each file and include the License file at
335.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
335.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
335.21 particular file as subject to the "Classpath" exception as provided
335.22 -by Sun in the GPL Version 2 section of the License file that
335.23 +by Oracle in the GPL Version 2 section of the License file that
335.24 accompanied this code. If applicable, add the following below the
335.25 License Header, with the fields enclosed by brackets [] replaced by
335.26 your own identifying information:
336.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/ProjectTests.java Fri Jul 16 11:47:36 2010 -0400
336.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/ProjectTests.java Fri Jul 16 14:21:50 2010 -0400
336.3 @@ -1,7 +1,10 @@
336.4 /*
336.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
336.6
336.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
336.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
336.9 +
336.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
336.11 +Other names may be trademarks of their respective owners.
336.12
336.13
336.14 The contents of this file are subject to the terms of either the GNU
336.15 @@ -14,9 +17,9 @@
336.16 specific language governing permissions and limitations under the
336.17 License. When distributing the software, include this License Header
336.18 Notice in each file and include the License file at
336.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
336.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
336.21 particular file as subject to the "Classpath" exception as provided
336.22 -by Sun in the GPL Version 2 section of the License file that
336.23 +by Oracle in the GPL Version 2 section of the License file that
336.24 accompanied this code. If applicable, add the following below the
336.25 License Header, with the fields enclosed by brackets [] replaced by
336.26 your own identifying information:
337.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/TestPropertiesHandler.java Fri Jul 16 11:47:36 2010 -0400
337.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/TestPropertiesHandler.java Fri Jul 16 14:21:50 2010 -0400
337.3 @@ -1,7 +1,10 @@
337.4 /*
337.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
337.6
337.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
337.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
337.9 +
337.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
337.11 +Other names may be trademarks of their respective owners.
337.12
337.13
337.14 The contents of this file are subject to the terms of either the GNU
337.15 @@ -14,9 +17,9 @@
337.16 specific language governing permissions and limitations under the
337.17 License. When distributing the software, include this License Header
337.18 Notice in each file and include the License file at
337.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
337.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
337.21 particular file as subject to the "Classpath" exception as provided
337.22 -by Sun in the GPL Version 2 section of the License file that
337.23 +by Oracle in the GPL Version 2 section of the License file that
337.24 accompanied this code. If applicable, add the following below the
337.25 License Header, with the fields enclosed by brackets [] replaced by
337.26 your own identifying information:
338.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/Utils.java Fri Jul 16 11:47:36 2010 -0400
338.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/Utils.java Fri Jul 16 14:21:50 2010 -0400
338.3 @@ -1,7 +1,10 @@
338.4 /*
338.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
338.6
338.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
338.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
338.9 +
338.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
338.11 +Other names may be trademarks of their respective owners.
338.12
338.13
338.14 The contents of this file are subject to the terms of either the GNU
338.15 @@ -14,9 +17,9 @@
338.16 specific language governing permissions and limitations under the
338.17 License. When distributing the software, include this License Header
338.18 Notice in each file and include the License file at
338.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
338.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
338.21 particular file as subject to the "Classpath" exception as provided
338.22 -by Sun in the GPL Version 2 section of the License file that
338.23 +by Oracle in the GPL Version 2 section of the License file that
338.24 accompanied this code. If applicable, add the following below the
338.25 License Header, with the fields enclosed by brackets [] replaced by
338.26 your own identifying information:
339.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/WebUtils.java Fri Jul 16 11:47:36 2010 -0400
339.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/common/WebUtils.java Fri Jul 16 14:21:50 2010 -0400
339.3 @@ -1,7 +1,10 @@
339.4 /*
339.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
339.6
339.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
339.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
339.9 +
339.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
339.11 +Other names may be trademarks of their respective owners.
339.12
339.13
339.14 The contents of this file are subject to the terms of either the GNU
339.15 @@ -14,9 +17,9 @@
339.16 specific language governing permissions and limitations under the
339.17 License. When distributing the software, include this License Header
339.18 Notice in each file and include the License file at
339.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
339.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
339.21 particular file as subject to the "Classpath" exception as provided
339.22 -by Sun in the GPL Version 2 section of the License file that
339.23 +by Oracle in the GPL Version 2 section of the License file that
339.24 accompanied this code. If applicable, add the following below the
339.25 License Header, with the fields enclosed by brackets [] replaced by
339.26 your own identifying information:
340.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/visualsqleditor/AcceptanceTests.java Fri Jul 16 11:47:36 2010 -0400
340.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/visualsqleditor/AcceptanceTests.java Fri Jul 16 14:21:50 2010 -0400
340.3 @@ -1,7 +1,10 @@
340.4 /*
340.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
340.6
340.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
340.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
340.9 +
340.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
340.11 +Other names may be trademarks of their respective owners.
340.12
340.13
340.14 The contents of this file are subject to the terms of either the GNU
340.15 @@ -14,9 +17,9 @@
340.16 specific language governing permissions and limitations under the
340.17 License. When distributing the software, include this License Header
340.18 Notice in each file and include the License file at
340.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
340.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
340.21 particular file as subject to the "Classpath" exception as provided
340.22 -by Sun in the GPL Version 2 section of the License file that
340.23 +by Oracle in the GPL Version 2 section of the License file that
340.24 accompanied this code. If applicable, add the following below the
340.25 License Header, with the fields enclosed by brackets [] replaced by
340.26 your own identifying information:
341.1 --- a/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/visualsqleditor/VisualSqlEditor_AcceptanceTests.java Fri Jul 16 11:47:36 2010 -0400
341.2 +++ b/visualweb.dataprovider/test/qa-functional/src/org/netbeans/test/dataprovider/visualsqleditor/VisualSqlEditor_AcceptanceTests.java Fri Jul 16 14:21:50 2010 -0400
341.3 @@ -1,7 +1,10 @@
341.4 /*
341.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
341.6
341.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
341.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
341.9 +
341.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
341.11 +Other names may be trademarks of their respective owners.
341.12
341.13
341.14 The contents of this file are subject to the terms of either the GNU
341.15 @@ -14,9 +17,9 @@
341.16 specific language governing permissions and limitations under the
341.17 License. When distributing the software, include this License Header
341.18 Notice in each file and include the License file at
341.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
341.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
341.21 particular file as subject to the "Classpath" exception as provided
341.22 -by Sun in the GPL Version 2 section of the License file that
341.23 +by Oracle in the GPL Version 2 section of the License file that
341.24 accompanied this code. If applicable, add the following below the
341.25 License Header, with the fields enclosed by brackets [] replaced by
341.26 your own identifying information:
342.1 --- a/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/AbstractDataProviderTest.java Fri Jul 16 11:47:36 2010 -0400
342.2 +++ b/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/AbstractDataProviderTest.java Fri Jul 16 14:21:50 2010 -0400
342.3 @@ -1,6 +1,9 @@
342.4 /*
342.5 * {START_JAVA_COPYRIGHT_NOTICE
342.6 -* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
342.7 +* Copyright 2010 Oracle and/or its affiliates. All rights reserved.
342.8 +
342.9 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
342.10 +Other names may be trademarks of their respective owners.
342.11 * Use is subject to license terms.
342.12 * END_COPYRIGHT_NOTICE}
342.13 */
342.14 @@ -19,7 +22,7 @@
342.15
342.16 public class AbstractDataProviderTest extends NbTestCase {
342.17 ArrayList dataTypes = new ArrayList();
342.18 -
342.19 +
342.20 public AbstractDataProviderTest(String name) {
342.21 super(name);
342.22 }
343.1 --- a/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/BasicTableDataFilterTest.java Fri Jul 16 11:47:36 2010 -0400
343.2 +++ b/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/BasicTableDataFilterTest.java Fri Jul 16 14:21:50 2010 -0400
343.3 @@ -1,8 +1,11 @@
343.4 /*
343.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
343.6 - *
343.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
343.8 - *
343.9 + *
343.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
343.11 + *
343.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
343.13 + * Other names may be trademarks of their respective owners.
343.14 + *
343.15 * The contents of this file are subject to the terms of either the GNU
343.16 * General Public License Version 2 only ("GPL") or the Common
343.17 * Development and Distribution License("CDDL") (collectively, the
343.18 @@ -13,9 +16,9 @@
343.19 * specific language governing permissions and limitations under the
343.20 * License. When distributing the software, include this License Header
343.21 * Notice in each file and include the License file at
343.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
343.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
343.24 * particular file as subject to the "Classpath" exception as provided
343.25 - * by Sun in the GPL Version 2 section of the License file that
343.26 + * by Oracle in the GPL Version 2 section of the License file that
343.27 * accompanied this code. If applicable, add the following below the
343.28 * License Header, with the fields enclosed by brackets [] replaced by
343.29 * your own identifying information:
344.1 --- a/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/BasicTableDataSorterTest.java Fri Jul 16 11:47:36 2010 -0400
344.2 +++ b/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/BasicTableDataSorterTest.java Fri Jul 16 14:21:50 2010 -0400
344.3 @@ -1,6 +1,9 @@
344.4 /*
344.5 * {START_JAVA_COPYRIGHT_NOTICE
344.6 - * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
344.7 + * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
344.8 +
344.9 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
344.10 +Other names may be trademarks of their respective owners.
344.11 * Use is subject to license terms.
344.12 * END_COPYRIGHT_NOTICE}
344.13 */
345.1 --- a/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/NbTestCase.java Fri Jul 16 11:47:36 2010 -0400
345.2 +++ b/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/NbTestCase.java Fri Jul 16 14:21:50 2010 -0400
345.3 @@ -1,8 +1,11 @@
345.4 /*
345.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
345.6 - *
345.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
345.8 - *
345.9 + *
345.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
345.11 + *
345.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
345.13 + * Other names may be trademarks of their respective owners.
345.14 + *
345.15 * The contents of this file are subject to the terms of either the GNU
345.16 * General Public License Version 2 only ("GPL") or the Common
345.17 * Development and Distribution License("CDDL") (collectively, the
345.18 @@ -13,9 +16,9 @@
345.19 * specific language governing permissions and limitations under the
345.20 * License. When distributing the software, include this License Header
345.21 * Notice in each file and include the License file at
345.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
345.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
345.24 * particular file as subject to the "Classpath" exception as provided
345.25 - * by Sun in the GPL Version 2 section of the License file that
345.26 + * by Oracle in the GPL Version 2 section of the License file that
345.27 * accompanied this code. If applicable, add the following below the
345.28 * License Header, with the fields enclosed by brackets [] replaced by
345.29 * your own identifying information:
346.1 --- a/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/ObjectArrayDataProviderTest.java Fri Jul 16 11:47:36 2010 -0400
346.2 +++ b/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/ObjectArrayDataProviderTest.java Fri Jul 16 14:21:50 2010 -0400
346.3 @@ -2,9 +2,12 @@
346.4
346.5 /*
346.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
346.7 - *
346.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
346.9 - *
346.10 + *
346.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
346.12 + *
346.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
346.14 + * Other names may be trademarks of their respective owners.
346.15 + *
346.16 * The contents of this file are subject to the terms of either the GNU
346.17 * General Public License Version 2 only ("GPL") or the Common
346.18 * Development and Distribution License("CDDL") (collectively, the
346.19 @@ -15,9 +18,9 @@
346.20 * specific language governing permissions and limitations under the
346.21 * License. When distributing the software, include this License Header
346.22 * Notice in each file and include the License file at
346.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
346.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
346.25 * particular file as subject to the "Classpath" exception as provided
346.26 - * by Sun in the GPL Version 2 section of the License file that
346.27 + * by Oracle in the GPL Version 2 section of the License file that
346.28 * accompanied this code. If applicable, add the following below the
346.29 * License Header, with the fields enclosed by brackets [] replaced by
346.30 * your own identifying information:
347.1 --- a/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/ObjectDataProviderTest.java Fri Jul 16 11:47:36 2010 -0400
347.2 +++ b/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/ObjectDataProviderTest.java Fri Jul 16 14:21:50 2010 -0400
347.3 @@ -1,8 +1,11 @@
347.4 /*
347.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
347.6 - *
347.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
347.8 - *
347.9 + *
347.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
347.11 + *
347.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
347.13 + * Other names may be trademarks of their respective owners.
347.14 + *
347.15 * The contents of this file are subject to the terms of either the GNU
347.16 * General Public License Version 2 only ("GPL") or the Common
347.17 * Development and Distribution License("CDDL") (collectively, the
347.18 @@ -13,9 +16,9 @@
347.19 * specific language governing permissions and limitations under the
347.20 * License. When distributing the software, include this License Header
347.21 * Notice in each file and include the License file at
347.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
347.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
347.24 * particular file as subject to the "Classpath" exception as provided
347.25 - * by Sun in the GPL Version 2 section of the License file that
347.26 + * by Oracle in the GPL Version 2 section of the License file that
347.27 * accompanied this code. If applicable, add the following below the
347.28 * License Header, with the fields enclosed by brackets [] replaced by
347.29 * your own identifying information:
348.1 --- a/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/ObjectListDataProviderTest.java Fri Jul 16 11:47:36 2010 -0400
348.2 +++ b/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/ObjectListDataProviderTest.java Fri Jul 16 14:21:50 2010 -0400
348.3 @@ -2,9 +2,12 @@
348.4
348.5 /*
348.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
348.7 - *
348.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
348.9 - *
348.10 + *
348.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
348.12 + *
348.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
348.14 + * Other names may be trademarks of their respective owners.
348.15 + *
348.16 * The contents of this file are subject to the terms of either the GNU
348.17 * General Public License Version 2 only ("GPL") or the Common
348.18 * Development and Distribution License("CDDL") (collectively, the
348.19 @@ -15,9 +18,9 @@
348.20 * specific language governing permissions and limitations under the
348.21 * License. When distributing the software, include this License Header
348.22 * Notice in each file and include the License file at
348.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
348.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
348.25 * particular file as subject to the "Classpath" exception as provided
348.26 - * by Sun in the GPL Version 2 section of the License file that
348.27 + * by Oracle in the GPL Version 2 section of the License file that
348.28 * accompanied this code. If applicable, add the following below the
348.29 * License Header, with the fields enclosed by brackets [] replaced by
348.30 * your own identifying information:
349.1 --- a/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/TestBean.java Fri Jul 16 11:47:36 2010 -0400
349.2 +++ b/visualweb.dataprovider/test/unit/src/org/netbeans/modules/visualweb/dataprovider/TestBean.java Fri Jul 16 14:21:50 2010 -0400
349.3 @@ -1,8 +1,11 @@
349.4 /*
349.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
349.6 - *
349.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
349.8 - *
349.9 + *
349.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
349.11 + *
349.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
349.13 + * Other names may be trademarks of their respective owners.
349.14 + *
349.15 * The contents of this file are subject to the terms of either the GNU
349.16 * General Public License Version 2 only ("GPL") or the Common
349.17 * Development and Distribution License("CDDL") (collectively, the
349.18 @@ -13,9 +16,9 @@
349.19 * specific language governing permissions and limitations under the
349.20 * License. When distributing the software, include this License Header
349.21 * Notice in each file and include the License file at
349.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
349.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
349.24 * particular file as subject to the "Classpath" exception as provided
349.25 - * by Sun in the GPL Version 2 section of the License file that
349.26 + * by Oracle in the GPL Version 2 section of the License file that
349.27 * accompanied this code. If applicable, add the following below the
349.28 * License Header, with the fields enclosed by brackets [] replaced by
349.29 * your own identifying information:
350.1 --- a/visualweb.designer.cssengine/build.xml Fri Jul 16 11:47:36 2010 -0400
350.2 +++ b/visualweb.designer.cssengine/build.xml Fri Jul 16 14:21:50 2010 -0400
350.3 @@ -2,7 +2,10 @@
350.4 <!--
350.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
350.6
350.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
350.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
350.9 +
350.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
350.11 +Other names may be trademarks of their respective owners.
350.12
350.13
350.14 The contents of this file are subject to the terms of either the GNU
350.15 @@ -15,9 +18,9 @@
350.16 specific language governing permissions and limitations under the
350.17 License. When distributing the software, include this License Header
350.18 Notice in each file and include the License file at
350.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
350.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
350.21 particular file as subject to the "Classpath" exception as provided
350.22 -by Sun in the GPL Version 2 section of the License file that
350.23 +by Oracle in the GPL Version 2 section of the License file that
350.24 accompanied this code. If applicable, add the following below the
350.25 License Header, with the fields enclosed by brackets [] replaced by
350.26 your own identifying information:
351.1 --- a/visualweb.designer.cssengine/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
351.2 +++ b/visualweb.designer.cssengine/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
351.3 @@ -1,6 +1,9 @@
351.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
351.5 #
351.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
351.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
351.8 +#
351.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
351.10 +# Other names may be trademarks of their respective owners.
351.11 #
351.12 # The contents of this file are subject to the terms of either the GNU
351.13 # General Public License Version 2 only ("GPL") or the Common
351.14 @@ -12,9 +15,9 @@
351.15 # specific language governing permissions and limitations under the
351.16 # License. When distributing the software, include this License Header
351.17 # Notice in each file and include the License file at
351.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
351.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
351.20 # particular file as subject to the "Classpath" exception as provided
351.21 -# by Sun in the GPL Version 2 section of the License file that
351.22 +# by Oracle in the GPL Version 2 section of the License file that
351.23 # accompanied this code. If applicable, add the following below the
351.24 # License Header, with the fields enclosed by brackets [] replaced by
351.25 # your own identifying information:
351.26 @@ -38,4 +41,4 @@
351.27 # made subject to such option by the copyright holder.
351.28
351.29 javac.compilerargs=-Xlint:unchecked
351.30 -javac.source=1.5
351.31 +javac.source=1.6
352.1 --- a/visualweb.designer.cssengine/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
352.2 +++ b/visualweb.designer.cssengine/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
352.3 @@ -2,7 +2,10 @@
352.4 <!--
352.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
352.6
352.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
352.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
352.9 +
352.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
352.11 +Other names may be trademarks of their respective owners.
352.12
352.13
352.14 The contents of this file are subject to the terms of either the GNU
352.15 @@ -15,9 +18,9 @@
352.16 specific language governing permissions and limitations under the
352.17 License. When distributing the software, include this License Header
352.18 Notice in each file and include the License file at
352.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
352.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
352.21 particular file as subject to the "Classpath" exception as provided
352.22 -by Sun in the GPL Version 2 section of the License file that
352.23 +by Oracle in the GPL Version 2 section of the License file that
352.24 accompanied this code. If applicable, add the following below the
352.25 License Header, with the fields enclosed by brackets [] replaced by
352.26 your own identifying information:
352.27 @@ -108,7 +111,15 @@
352.28 <build-prerequisite/>
352.29 <compile-dependency/>
352.30 <run-dependency>
352.31 - <specification-version>6.8.1</specification-version>
352.32 + <specification-version>8.0</specification-version>
352.33 + </run-dependency>
352.34 + </dependency>
352.35 + <dependency>
352.36 + <code-name-base>org.openide.util.lookup</code-name-base>
352.37 + <build-prerequisite/>
352.38 + <compile-dependency/>
352.39 + <run-dependency>
352.40 + <specification-version>8.0</specification-version>
352.41 </run-dependency>
352.42 </dependency>
352.43 </module-dependencies>
353.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssComputedValue.java Fri Jul 16 11:47:36 2010 -0400
353.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssComputedValue.java Fri Jul 16 14:21:50 2010 -0400
353.3 @@ -1,7 +1,10 @@
353.4 /*
353.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
353.6 *
353.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
353.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
353.9 + *
353.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
353.11 + * Other names may be trademarks of their respective owners.
353.12 *
353.13 * The contents of this file are subject to the terms of either the GNU
353.14 * General Public License Version 2 only ("GPL") or the Common
353.15 @@ -13,9 +16,9 @@
353.16 * specific language governing permissions and limitations under the
353.17 * License. When distributing the software, include this License Header
353.18 * Notice in each file and include the License file at
353.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
353.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
353.21 * particular file as subject to the "Classpath" exception as provided
353.22 - * by Sun in the GPL Version 2 section of the License file that
353.23 + * by Oracle in the GPL Version 2 section of the License file that
353.24 * accompanied this code. If applicable, add the following below the
353.25 * License Header, with the fields enclosed by brackets [] replaced by
353.26 * your own identifying information:
354.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssEngineService.java Fri Jul 16 11:47:36 2010 -0400
354.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssEngineService.java Fri Jul 16 14:21:50 2010 -0400
354.3 @@ -1,7 +1,10 @@
354.4 /*
354.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
354.6 *
354.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
354.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
354.9 + *
354.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
354.11 + * Other names may be trademarks of their respective owners.
354.12 *
354.13 * The contents of this file are subject to the terms of either the GNU
354.14 * General Public License Version 2 only ("GPL") or the Common
354.15 @@ -13,9 +16,9 @@
354.16 * specific language governing permissions and limitations under the
354.17 * License. When distributing the software, include this License Header
354.18 * Notice in each file and include the License file at
354.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
354.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
354.21 * particular file as subject to the "Classpath" exception as provided
354.22 - * by Sun in the GPL Version 2 section of the License file that
354.23 + * by Oracle in the GPL Version 2 section of the License file that
354.24 * accompanied this code. If applicable, add the following below the
354.25 * License Header, with the fields enclosed by brackets [] replaced by
354.26 * your own identifying information:
355.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssListValue.java Fri Jul 16 11:47:36 2010 -0400
355.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssListValue.java Fri Jul 16 14:21:50 2010 -0400
355.3 @@ -1,7 +1,10 @@
355.4 /*
355.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
355.6 *
355.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
355.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
355.9 + *
355.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
355.11 + * Other names may be trademarks of their respective owners.
355.12 *
355.13 * The contents of this file are subject to the terms of either the GNU
355.14 * General Public License Version 2 only ("GPL") or the Common
355.15 @@ -13,9 +16,9 @@
355.16 * specific language governing permissions and limitations under the
355.17 * License. When distributing the software, include this License Header
355.18 * Notice in each file and include the License file at
355.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
355.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
355.21 * particular file as subject to the "Classpath" exception as provided
355.22 - * by Sun in the GPL Version 2 section of the License file that
355.23 + * by Oracle in the GPL Version 2 section of the License file that
355.24 * accompanied this code. If applicable, add the following below the
355.25 * License Header, with the fields enclosed by brackets [] replaced by
355.26 * your own identifying information:
356.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssProvider.java Fri Jul 16 11:47:36 2010 -0400
356.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssProvider.java Fri Jul 16 14:21:50 2010 -0400
356.3 @@ -1,7 +1,10 @@
356.4 /*
356.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
356.6 *
356.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
356.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
356.9 + *
356.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
356.11 + * Other names may be trademarks of their respective owners.
356.12 *
356.13 * The contents of this file are subject to the terms of either the GNU
356.14 * General Public License Version 2 only ("GPL") or the Common
356.15 @@ -13,9 +16,9 @@
356.16 * specific language governing permissions and limitations under the
356.17 * License. When distributing the software, include this License Header
356.18 * Notice in each file and include the License file at
356.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
356.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
356.21 * particular file as subject to the "Classpath" exception as provided
356.22 - * by Sun in the GPL Version 2 section of the License file that
356.23 + * by Oracle in the GPL Version 2 section of the License file that
356.24 * accompanied this code. If applicable, add the following below the
356.25 * License Header, with the fields enclosed by brackets [] replaced by
356.26 * your own identifying information:
357.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssValue.java Fri Jul 16 11:47:36 2010 -0400
357.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssValue.java Fri Jul 16 14:21:50 2010 -0400
357.3 @@ -1,7 +1,10 @@
357.4 /*
357.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
357.6 *
357.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
357.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
357.9 + *
357.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
357.11 + * Other names may be trademarks of their respective owners.
357.12 *
357.13 * The contents of this file are subject to the terms of either the GNU
357.14 * General Public License Version 2 only ("GPL") or the Common
357.15 @@ -13,9 +16,9 @@
357.16 * specific language governing permissions and limitations under the
357.17 * License. When distributing the software, include this License Header
357.18 * Notice in each file and include the License file at
357.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
357.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
357.21 * particular file as subject to the "Classpath" exception as provided
357.22 - * by Sun in the GPL Version 2 section of the License file that
357.23 + * by Oracle in the GPL Version 2 section of the License file that
357.24 * accompanied this code. If applicable, add the following below the
357.25 * License Header, with the fields enclosed by brackets [] replaced by
357.26 * your own identifying information:
358.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssValueService.java Fri Jul 16 11:47:36 2010 -0400
358.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/CssValueService.java Fri Jul 16 14:21:50 2010 -0400
358.3 @@ -1,7 +1,10 @@
358.4 /*
358.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
358.6 *
358.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
358.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
358.9 + *
358.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
358.11 + * Other names may be trademarks of their respective owners.
358.12 *
358.13 * The contents of this file are subject to the terms of either the GNU
358.14 * General Public License Version 2 only ("GPL") or the Common
358.15 @@ -13,9 +16,9 @@
358.16 * specific language governing permissions and limitations under the
358.17 * License. When distributing the software, include this License Header
358.18 * Notice in each file and include the License file at
358.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
358.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
358.21 * particular file as subject to the "Classpath" exception as provided
358.22 - * by Sun in the GPL Version 2 section of the License file that
358.23 + * by Oracle in the GPL Version 2 section of the License file that
358.24 * accompanied this code. If applicable, add the following below the
358.25 * License Header, with the fields enclosed by brackets [] replaced by
358.26 * your own identifying information:
359.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/ResourceData.java Fri Jul 16 11:47:36 2010 -0400
359.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/ResourceData.java Fri Jul 16 14:21:50 2010 -0400
359.3 @@ -1,7 +1,10 @@
359.4 /*
359.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
359.6 *
359.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
359.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
359.9 + *
359.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
359.11 + * Other names may be trademarks of their respective owners.
359.12 *
359.13 * The contents of this file are subject to the terms of either the GNU
359.14 * General Public License Version 2 only ("GPL") or the Common
359.15 @@ -13,9 +16,9 @@
359.16 * specific language governing permissions and limitations under the
359.17 * License. When distributing the software, include this License Header
359.18 * Notice in each file and include the License file at
359.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
359.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
359.21 * particular file as subject to the "Classpath" exception as provided
359.22 - * by Sun in the GPL Version 2 section of the License file that
359.23 + * by Oracle in the GPL Version 2 section of the License file that
359.24 * accompanied this code. If applicable, add the following below the
359.25 * License Header, with the fields enclosed by brackets [] replaced by
359.26 * your own identifying information:
360.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/StyleData.java Fri Jul 16 11:47:36 2010 -0400
360.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/StyleData.java Fri Jul 16 14:21:50 2010 -0400
360.3 @@ -1,7 +1,10 @@
360.4 /*
360.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
360.6 *
360.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
360.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
360.9 + *
360.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
360.11 + * Other names may be trademarks of their respective owners.
360.12 *
360.13 * The contents of this file are subject to the terms of either the GNU
360.14 * General Public License Version 2 only ("GPL") or the Common
360.15 @@ -13,9 +16,9 @@
360.16 * specific language governing permissions and limitations under the
360.17 * License. When distributing the software, include this License Header
360.18 * Notice in each file and include the License file at
360.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
360.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
360.21 * particular file as subject to the "Classpath" exception as provided
360.22 - * by Sun in the GPL Version 2 section of the License file that
360.23 + * by Oracle in the GPL Version 2 section of the License file that
360.24 * accompanied this code. If applicable, add the following below the
360.25 * License Header, with the fields enclosed by brackets [] replaced by
360.26 * your own identifying information:
361.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/StyleRefreshable.java Fri Jul 16 11:47:36 2010 -0400
361.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/StyleRefreshable.java Fri Jul 16 14:21:50 2010 -0400
361.3 @@ -1,7 +1,10 @@
361.4 /*
361.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
361.6 *
361.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
361.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
361.9 + *
361.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
361.11 + * Other names may be trademarks of their respective owners.
361.12 *
361.13 * The contents of this file are subject to the terms of either the GNU
361.14 * General Public License Version 2 only ("GPL") or the Common
361.15 @@ -13,9 +16,9 @@
361.16 * specific language governing permissions and limitations under the
361.17 * License. When distributing the software, include this License Header
361.18 * Notice in each file and include the License file at
361.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
361.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
361.21 * particular file as subject to the "Classpath" exception as provided
361.22 - * by Sun in the GPL Version 2 section of the License file that
361.23 + * by Oracle in the GPL Version 2 section of the License file that
361.24 * accompanied this code. If applicable, add the following below the
361.25 * License Header, with the fields enclosed by brackets [] replaced by
361.26 * your own identifying information:
362.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/XhtmlCss.java Fri Jul 16 11:47:36 2010 -0400
362.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/api/designer/cssengine/XhtmlCss.java Fri Jul 16 14:21:50 2010 -0400
362.3 @@ -1,7 +1,10 @@
362.4 /*
362.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
362.6 *
362.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
362.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
362.9 + *
362.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
362.11 + * Other names may be trademarks of their respective owners.
362.12 *
362.13 * The contents of this file are subject to the terms of either the GNU
362.14 * General Public License Version 2 only ("GPL") or the Common
362.15 @@ -13,9 +16,9 @@
362.16 * specific language governing permissions and limitations under the
362.17 * License. When distributing the software, include this License Header
362.18 * Notice in each file and include the License file at
362.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
362.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
362.21 * particular file as subject to the "Classpath" exception as provided
362.22 - * by Sun in the GPL Version 2 section of the License file that
362.23 + * by Oracle in the GPL Version 2 section of the License file that
362.24 * accompanied this code. If applicable, add the following below the
362.25 * License Header, with the fields enclosed by brackets [] replaced by
362.26 * your own identifying information:
363.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/AutoableLengthManager.java Fri Jul 16 11:47:36 2010 -0400
363.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/AutoableLengthManager.java Fri Jul 16 14:21:50 2010 -0400
363.3 @@ -1,7 +1,10 @@
363.4 /*
363.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
363.6 *
363.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
363.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
363.9 + *
363.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
363.11 + * Other names may be trademarks of their respective owners.
363.12 *
363.13 * The contents of this file are subject to the terms of either the GNU
363.14 * General Public License Version 2 only ("GPL") or the Common
363.15 @@ -13,9 +16,9 @@
363.16 * specific language governing permissions and limitations under the
363.17 * License. When distributing the software, include this License Header
363.18 * Notice in each file and include the License file at
363.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
363.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
363.21 * particular file as subject to the "Classpath" exception as provided
363.22 - * by Sun in the GPL Version 2 section of the License file that
363.23 + * by Oracle in the GPL Version 2 section of the License file that
363.24 * accompanied this code. If applicable, add the following below the
363.25 * License Header, with the fields enclosed by brackets [] replaced by
363.26 * your own identifying information:
364.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundColorManager.java Fri Jul 16 11:47:36 2010 -0400
364.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundColorManager.java Fri Jul 16 14:21:50 2010 -0400
364.3 @@ -1,7 +1,10 @@
364.4 /*
364.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
364.6 *
364.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
364.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
364.9 + *
364.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
364.11 + * Other names may be trademarks of their respective owners.
364.12 *
364.13 * The contents of this file are subject to the terms of either the GNU
364.14 * General Public License Version 2 only ("GPL") or the Common
364.15 @@ -13,9 +16,9 @@
364.16 * specific language governing permissions and limitations under the
364.17 * License. When distributing the software, include this License Header
364.18 * Notice in each file and include the License file at
364.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
364.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
364.21 * particular file as subject to the "Classpath" exception as provided
364.22 - * by Sun in the GPL Version 2 section of the License file that
364.23 + * by Oracle in the GPL Version 2 section of the License file that
364.24 * accompanied this code. If applicable, add the following below the
364.25 * License Header, with the fields enclosed by brackets [] replaced by
364.26 * your own identifying information:
365.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundImageManager.java Fri Jul 16 11:47:36 2010 -0400
365.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundImageManager.java Fri Jul 16 14:21:50 2010 -0400
365.3 @@ -1,7 +1,10 @@
365.4 /*
365.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
365.6 *
365.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
365.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
365.9 + *
365.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
365.11 + * Other names may be trademarks of their respective owners.
365.12 *
365.13 * The contents of this file are subject to the terms of either the GNU
365.14 * General Public License Version 2 only ("GPL") or the Common
365.15 @@ -13,9 +16,9 @@
365.16 * specific language governing permissions and limitations under the
365.17 * License. When distributing the software, include this License Header
365.18 * Notice in each file and include the License file at
365.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
365.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
365.21 * particular file as subject to the "Classpath" exception as provided
365.22 - * by Sun in the GPL Version 2 section of the License file that
365.23 + * by Oracle in the GPL Version 2 section of the License file that
365.24 * accompanied this code. If applicable, add the following below the
365.25 * License Header, with the fields enclosed by brackets [] replaced by
365.26 * your own identifying information:
366.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundPositionManager.java Fri Jul 16 11:47:36 2010 -0400
366.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundPositionManager.java Fri Jul 16 14:21:50 2010 -0400
366.3 @@ -1,7 +1,10 @@
366.4 /*
366.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
366.6 *
366.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
366.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
366.9 + *
366.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
366.11 + * Other names may be trademarks of their respective owners.
366.12 *
366.13 * The contents of this file are subject to the terms of either the GNU
366.14 * General Public License Version 2 only ("GPL") or the Common
366.15 @@ -13,9 +16,9 @@
366.16 * specific language governing permissions and limitations under the
366.17 * License. When distributing the software, include this License Header
366.18 * Notice in each file and include the License file at
366.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
366.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
366.21 * particular file as subject to the "Classpath" exception as provided
366.22 - * by Sun in the GPL Version 2 section of the License file that
366.23 + * by Oracle in the GPL Version 2 section of the License file that
366.24 * accompanied this code. If applicable, add the following below the
366.25 * License Header, with the fields enclosed by brackets [] replaced by
366.26 * your own identifying information:
367.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundRepeatManager.java Fri Jul 16 11:47:36 2010 -0400
367.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundRepeatManager.java Fri Jul 16 14:21:50 2010 -0400
367.3 @@ -1,7 +1,10 @@
367.4 /*
367.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
367.6 *
367.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
367.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
367.9 + *
367.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
367.11 + * Other names may be trademarks of their respective owners.
367.12 *
367.13 * The contents of this file are subject to the terms of either the GNU
367.14 * General Public License Version 2 only ("GPL") or the Common
367.15 @@ -13,9 +16,9 @@
367.16 * specific language governing permissions and limitations under the
367.17 * License. When distributing the software, include this License Header
367.18 * Notice in each file and include the License file at
367.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
367.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
367.21 * particular file as subject to the "Classpath" exception as provided
367.22 - * by Sun in the GPL Version 2 section of the License file that
367.23 + * by Oracle in the GPL Version 2 section of the License file that
367.24 * accompanied this code. If applicable, add the following below the
367.25 * License Header, with the fields enclosed by brackets [] replaced by
367.26 * your own identifying information:
368.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
368.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BackgroundShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
368.3 @@ -1,7 +1,10 @@
368.4 /*
368.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
368.6 *
368.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
368.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
368.9 + *
368.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
368.11 + * Other names may be trademarks of their respective owners.
368.12 *
368.13 * The contents of this file are subject to the terms of either the GNU
368.14 * General Public License Version 2 only ("GPL") or the Common
368.15 @@ -13,9 +16,9 @@
368.16 * specific language governing permissions and limitations under the
368.17 * License. When distributing the software, include this License Header
368.18 * Notice in each file and include the License file at
368.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
368.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
368.21 * particular file as subject to the "Classpath" exception as provided
368.22 - * by Sun in the GPL Version 2 section of the License file that
368.23 + * by Oracle in the GPL Version 2 section of the License file that
368.24 * accompanied this code. If applicable, add the following below the
368.25 * License Header, with the fields enclosed by brackets [] replaced by
368.26 * your own identifying information:
369.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderCollapseManager.java Fri Jul 16 11:47:36 2010 -0400
369.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderCollapseManager.java Fri Jul 16 14:21:50 2010 -0400
369.3 @@ -1,7 +1,10 @@
369.4 /*
369.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
369.6 *
369.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
369.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
369.9 + *
369.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
369.11 + * Other names may be trademarks of their respective owners.
369.12 *
369.13 * The contents of this file are subject to the terms of either the GNU
369.14 * General Public License Version 2 only ("GPL") or the Common
369.15 @@ -13,9 +16,9 @@
369.16 * specific language governing permissions and limitations under the
369.17 * License. When distributing the software, include this License Header
369.18 * Notice in each file and include the License file at
369.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
369.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
369.21 * particular file as subject to the "Classpath" exception as provided
369.22 - * by Sun in the GPL Version 2 section of the License file that
369.23 + * by Oracle in the GPL Version 2 section of the License file that
369.24 * accompanied this code. If applicable, add the following below the
369.25 * License Header, with the fields enclosed by brackets [] replaced by
369.26 * your own identifying information:
370.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderColorManager.java Fri Jul 16 11:47:36 2010 -0400
370.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderColorManager.java Fri Jul 16 14:21:50 2010 -0400
370.3 @@ -1,7 +1,10 @@
370.4 /*
370.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
370.6 *
370.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
370.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
370.9 + *
370.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
370.11 + * Other names may be trademarks of their respective owners.
370.12 *
370.13 * The contents of this file are subject to the terms of either the GNU
370.14 * General Public License Version 2 only ("GPL") or the Common
370.15 @@ -13,9 +16,9 @@
370.16 * specific language governing permissions and limitations under the
370.17 * License. When distributing the software, include this License Header
370.18 * Notice in each file and include the License file at
370.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
370.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
370.21 * particular file as subject to the "Classpath" exception as provided
370.22 - * by Sun in the GPL Version 2 section of the License file that
370.23 + * by Oracle in the GPL Version 2 section of the License file that
370.24 * accompanied this code. If applicable, add the following below the
370.25 * License Header, with the fields enclosed by brackets [] replaced by
370.26 * your own identifying information:
371.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderColorShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
371.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderColorShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
371.3 @@ -1,7 +1,10 @@
371.4 /*
371.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
371.6 *
371.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
371.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
371.9 + *
371.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
371.11 + * Other names may be trademarks of their respective owners.
371.12 *
371.13 * The contents of this file are subject to the terms of either the GNU
371.14 * General Public License Version 2 only ("GPL") or the Common
371.15 @@ -13,9 +16,9 @@
371.16 * specific language governing permissions and limitations under the
371.17 * License. When distributing the software, include this License Header
371.18 * Notice in each file and include the License file at
371.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
371.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
371.21 * particular file as subject to the "Classpath" exception as provided
371.22 - * by Sun in the GPL Version 2 section of the License file that
371.23 + * by Oracle in the GPL Version 2 section of the License file that
371.24 * accompanied this code. If applicable, add the following below the
371.25 * License Header, with the fields enclosed by brackets [] replaced by
371.26 * your own identifying information:
372.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
372.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
372.3 @@ -1,7 +1,10 @@
372.4 /*
372.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
372.6 *
372.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
372.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
372.9 + *
372.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
372.11 + * Other names may be trademarks of their respective owners.
372.12 *
372.13 * The contents of this file are subject to the terms of either the GNU
372.14 * General Public License Version 2 only ("GPL") or the Common
372.15 @@ -13,9 +16,9 @@
372.16 * specific language governing permissions and limitations under the
372.17 * License. When distributing the software, include this License Header
372.18 * Notice in each file and include the License file at
372.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
372.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
372.21 * particular file as subject to the "Classpath" exception as provided
372.22 - * by Sun in the GPL Version 2 section of the License file that
372.23 + * by Oracle in the GPL Version 2 section of the License file that
372.24 * accompanied this code. If applicable, add the following below the
372.25 * License Header, with the fields enclosed by brackets [] replaced by
372.26 * your own identifying information:
373.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderSideShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
373.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderSideShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
373.3 @@ -1,7 +1,10 @@
373.4 /*
373.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
373.6 *
373.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
373.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
373.9 + *
373.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
373.11 + * Other names may be trademarks of their respective owners.
373.12 *
373.13 * The contents of this file are subject to the terms of either the GNU
373.14 * General Public License Version 2 only ("GPL") or the Common
373.15 @@ -13,9 +16,9 @@
373.16 * specific language governing permissions and limitations under the
373.17 * License. When distributing the software, include this License Header
373.18 * Notice in each file and include the License file at
373.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
373.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
373.21 * particular file as subject to the "Classpath" exception as provided
373.22 - * by Sun in the GPL Version 2 section of the License file that
373.23 + * by Oracle in the GPL Version 2 section of the License file that
373.24 * accompanied this code. If applicable, add the following below the
373.25 * License Header, with the fields enclosed by brackets [] replaced by
373.26 * your own identifying information:
374.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderStyleManager.java Fri Jul 16 11:47:36 2010 -0400
374.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderStyleManager.java Fri Jul 16 14:21:50 2010 -0400
374.3 @@ -1,7 +1,10 @@
374.4 /*
374.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
374.6 *
374.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
374.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
374.9 + *
374.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
374.11 + * Other names may be trademarks of their respective owners.
374.12 *
374.13 * The contents of this file are subject to the terms of either the GNU
374.14 * General Public License Version 2 only ("GPL") or the Common
374.15 @@ -13,9 +16,9 @@
374.16 * specific language governing permissions and limitations under the
374.17 * License. When distributing the software, include this License Header
374.18 * Notice in each file and include the License file at
374.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
374.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
374.21 * particular file as subject to the "Classpath" exception as provided
374.22 - * by Sun in the GPL Version 2 section of the License file that
374.23 + * by Oracle in the GPL Version 2 section of the License file that
374.24 * accompanied this code. If applicable, add the following below the
374.25 * License Header, with the fields enclosed by brackets [] replaced by
374.26 * your own identifying information:
375.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderStyleShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
375.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderStyleShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
375.3 @@ -1,7 +1,10 @@
375.4 /*
375.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
375.6 *
375.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
375.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
375.9 + *
375.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
375.11 + * Other names may be trademarks of their respective owners.
375.12 *
375.13 * The contents of this file are subject to the terms of either the GNU
375.14 * General Public License Version 2 only ("GPL") or the Common
375.15 @@ -13,9 +16,9 @@
375.16 * specific language governing permissions and limitations under the
375.17 * License. When distributing the software, include this License Header
375.18 * Notice in each file and include the License file at
375.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
375.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
375.21 * particular file as subject to the "Classpath" exception as provided
375.22 - * by Sun in the GPL Version 2 section of the License file that
375.23 + * by Oracle in the GPL Version 2 section of the License file that
375.24 * accompanied this code. If applicable, add the following below the
375.25 * License Header, with the fields enclosed by brackets [] replaced by
375.26 * your own identifying information:
376.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderWidthManager.java Fri Jul 16 11:47:36 2010 -0400
376.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderWidthManager.java Fri Jul 16 14:21:50 2010 -0400
376.3 @@ -1,7 +1,10 @@
376.4 /*
376.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
376.6 *
376.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
376.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
376.9 + *
376.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
376.11 + * Other names may be trademarks of their respective owners.
376.12 *
376.13 * The contents of this file are subject to the terms of either the GNU
376.14 * General Public License Version 2 only ("GPL") or the Common
376.15 @@ -13,9 +16,9 @@
376.16 * specific language governing permissions and limitations under the
376.17 * License. When distributing the software, include this License Header
376.18 * Notice in each file and include the License file at
376.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
376.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
376.21 * particular file as subject to the "Classpath" exception as provided
376.22 - * by Sun in the GPL Version 2 section of the License file that
376.23 + * by Oracle in the GPL Version 2 section of the License file that
376.24 * accompanied this code. If applicable, add the following below the
376.25 * License Header, with the fields enclosed by brackets [] replaced by
376.26 * your own identifying information:
377.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderWidthShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
377.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/BorderWidthShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
377.3 @@ -1,7 +1,10 @@
377.4 /*
377.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
377.6 *
377.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
377.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
377.9 + *
377.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
377.11 + * Other names may be trademarks of their respective owners.
377.12 *
377.13 * The contents of this file are subject to the terms of either the GNU
377.14 * General Public License Version 2 only ("GPL") or the Common
377.15 @@ -13,9 +16,9 @@
377.16 * specific language governing permissions and limitations under the
377.17 * License. When distributing the software, include this License Header
377.18 * Notice in each file and include the License file at
377.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
377.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
377.21 * particular file as subject to the "Classpath" exception as provided
377.22 - * by Sun in the GPL Version 2 section of the License file that
377.23 + * by Oracle in the GPL Version 2 section of the License file that
377.24 * accompanied this code. If applicable, add the following below the
377.25 * License Header, with the fields enclosed by brackets [] replaced by
377.26 * your own identifying information:
378.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
378.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
378.3 @@ -1,7 +1,10 @@
378.4 #
378.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
378.6 #
378.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
378.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
378.9 +#
378.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
378.11 +# Other names may be trademarks of their respective owners.
378.12 #
378.13 # The contents of this file are subject to the terms of either the GNU
378.14 # General Public License Version 2 only ("GPL") or the Common
378.15 @@ -13,9 +16,9 @@
378.16 # specific language governing permissions and limitations under the
378.17 # License. When distributing the software, include this License Header
378.18 # Notice in each file and include the License file at
378.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
378.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
378.21 # particular file as subject to the "Classpath" exception as provided
378.22 -# by Sun in the GPL Version 2 section of the License file that
378.23 +# by Oracle in the GPL Version 2 section of the License file that
378.24 # accompanied this code. If applicable, add the following below the
378.25 # License Header, with the fields enclosed by brackets [] replaced by
378.26 # your own identifying information:
379.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CaptionSideManager.java Fri Jul 16 11:47:36 2010 -0400
379.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CaptionSideManager.java Fri Jul 16 14:21:50 2010 -0400
379.3 @@ -1,7 +1,10 @@
379.4 /*
379.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
379.6 *
379.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
379.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
379.9 + *
379.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
379.11 + * Other names may be trademarks of their respective owners.
379.12 *
379.13 * The contents of this file are subject to the terms of either the GNU
379.14 * General Public License Version 2 only ("GPL") or the Common
379.15 @@ -13,9 +16,9 @@
379.16 * specific language governing permissions and limitations under the
379.17 * License. When distributing the software, include this License Header
379.18 * Notice in each file and include the License file at
379.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
379.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
379.21 * particular file as subject to the "Classpath" exception as provided
379.22 - * by Sun in the GPL Version 2 section of the License file that
379.23 + * by Oracle in the GPL Version 2 section of the License file that
379.24 * accompanied this code. If applicable, add the following below the
379.25 * License Header, with the fields enclosed by brackets [] replaced by
379.26 * your own identifying information:
380.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ClearManager.java Fri Jul 16 11:47:36 2010 -0400
380.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ClearManager.java Fri Jul 16 14:21:50 2010 -0400
380.3 @@ -1,7 +1,10 @@
380.4 /*
380.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
380.6 *
380.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
380.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
380.9 + *
380.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
380.11 + * Other names may be trademarks of their respective owners.
380.12 *
380.13 * The contents of this file are subject to the terms of either the GNU
380.14 * General Public License Version 2 only ("GPL") or the Common
380.15 @@ -13,9 +16,9 @@
380.16 * specific language governing permissions and limitations under the
380.17 * License. When distributing the software, include this License Header
380.18 * Notice in each file and include the License file at
380.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
380.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
380.21 * particular file as subject to the "Classpath" exception as provided
380.22 - * by Sun in the GPL Version 2 section of the License file that
380.23 + * by Oracle in the GPL Version 2 section of the License file that
380.24 * accompanied this code. If applicable, add the following below the
380.25 * License Header, with the fields enclosed by brackets [] replaced by
380.26 * your own identifying information:
381.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssComputedValueImpl.java Fri Jul 16 11:47:36 2010 -0400
381.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssComputedValueImpl.java Fri Jul 16 14:21:50 2010 -0400
381.3 @@ -1,7 +1,10 @@
381.4 /*
381.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
381.6 *
381.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
381.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
381.9 + *
381.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
381.11 + * Other names may be trademarks of their respective owners.
381.12 *
381.13 * The contents of this file are subject to the terms of either the GNU
381.14 * General Public License Version 2 only ("GPL") or the Common
381.15 @@ -13,9 +16,9 @@
381.16 * specific language governing permissions and limitations under the
381.17 * License. When distributing the software, include this License Header
381.18 * Notice in each file and include the License file at
381.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
381.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
381.21 * particular file as subject to the "Classpath" exception as provided
381.22 - * by Sun in the GPL Version 2 section of the License file that
381.23 + * by Oracle in the GPL Version 2 section of the License file that
381.24 * accompanied this code. If applicable, add the following below the
381.25 * License Header, with the fields enclosed by brackets [] replaced by
381.26 * your own identifying information:
382.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssConstants.java Fri Jul 16 11:47:36 2010 -0400
382.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssConstants.java Fri Jul 16 14:21:50 2010 -0400
382.3 @@ -1,7 +1,10 @@
382.4 /*
382.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
382.6 *
382.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
382.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
382.9 + *
382.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
382.11 + * Other names may be trademarks of their respective owners.
382.12 *
382.13 * The contents of this file are subject to the terms of either the GNU
382.14 * General Public License Version 2 only ("GPL") or the Common
382.15 @@ -13,9 +16,9 @@
382.16 * specific language governing permissions and limitations under the
382.17 * License. When distributing the software, include this License Header
382.18 * Notice in each file and include the License file at
382.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
382.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
382.21 * particular file as subject to the "Classpath" exception as provided
382.22 - * by Sun in the GPL Version 2 section of the License file that
382.23 + * by Oracle in the GPL Version 2 section of the License file that
382.24 * accompanied this code. If applicable, add the following below the
382.25 * License Header, with the fields enclosed by brackets [] replaced by
382.26 * your own identifying information:
383.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssEngineServiceImpl.java Fri Jul 16 11:47:36 2010 -0400
383.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssEngineServiceImpl.java Fri Jul 16 14:21:50 2010 -0400
383.3 @@ -1,7 +1,10 @@
383.4 /*
383.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
383.6 *
383.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
383.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
383.9 + *
383.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
383.11 + * Other names may be trademarks of their respective owners.
383.12 *
383.13 * The contents of this file are subject to the terms of either the GNU
383.14 * General Public License Version 2 only ("GPL") or the Common
383.15 @@ -13,9 +16,9 @@
383.16 * specific language governing permissions and limitations under the
383.17 * License. When distributing the software, include this License Header
383.18 * Notice in each file and include the License file at
383.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
383.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
383.21 * particular file as subject to the "Classpath" exception as provided
383.22 - * by Sun in the GPL Version 2 section of the License file that
383.23 + * by Oracle in the GPL Version 2 section of the License file that
383.24 * accompanied this code. If applicable, add the following below the
383.25 * License Header, with the fields enclosed by brackets [] replaced by
383.26 * your own identifying information:
384.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssListValueImpl.java Fri Jul 16 11:47:36 2010 -0400
384.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssListValueImpl.java Fri Jul 16 14:21:50 2010 -0400
384.3 @@ -1,7 +1,10 @@
384.4 /*
384.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
384.6 *
384.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
384.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
384.9 + *
384.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
384.11 + * Other names may be trademarks of their respective owners.
384.12 *
384.13 * The contents of this file are subject to the terms of either the GNU
384.14 * General Public License Version 2 only ("GPL") or the Common
384.15 @@ -13,9 +16,9 @@
384.16 * specific language governing permissions and limitations under the
384.17 * License. When distributing the software, include this License Header
384.18 * Notice in each file and include the License file at
384.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
384.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
384.21 * particular file as subject to the "Classpath" exception as provided
384.22 - * by Sun in the GPL Version 2 section of the License file that
384.23 + * by Oracle in the GPL Version 2 section of the License file that
384.24 * accompanied this code. If applicable, add the following below the
384.25 * License Header, with the fields enclosed by brackets [] replaced by
384.26 * your own identifying information:
385.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssValueConstants.java Fri Jul 16 11:47:36 2010 -0400
385.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssValueConstants.java Fri Jul 16 14:21:50 2010 -0400
385.3 @@ -1,7 +1,10 @@
385.4 /*
385.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
385.6 *
385.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
385.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
385.9 + *
385.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
385.11 + * Other names may be trademarks of their respective owners.
385.12 *
385.13 * The contents of this file are subject to the terms of either the GNU
385.14 * General Public License Version 2 only ("GPL") or the Common
385.15 @@ -13,9 +16,9 @@
385.16 * specific language governing permissions and limitations under the
385.17 * License. When distributing the software, include this License Header
385.18 * Notice in each file and include the License file at
385.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
385.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
385.21 * particular file as subject to the "Classpath" exception as provided
385.22 - * by Sun in the GPL Version 2 section of the License file that
385.23 + * by Oracle in the GPL Version 2 section of the License file that
385.24 * accompanied this code. If applicable, add the following below the
385.25 * License Header, with the fields enclosed by brackets [] replaced by
385.26 * your own identifying information:
386.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssValueFactory.java Fri Jul 16 11:47:36 2010 -0400
386.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssValueFactory.java Fri Jul 16 14:21:50 2010 -0400
386.3 @@ -1,7 +1,10 @@
386.4 /*
386.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
386.6 *
386.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
386.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
386.9 + *
386.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
386.11 + * Other names may be trademarks of their respective owners.
386.12 *
386.13 * The contents of this file are subject to the terms of either the GNU
386.14 * General Public License Version 2 only ("GPL") or the Common
386.15 @@ -13,9 +16,9 @@
386.16 * specific language governing permissions and limitations under the
386.17 * License. When distributing the software, include this License Header
386.18 * Notice in each file and include the License file at
386.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
386.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
386.21 * particular file as subject to the "Classpath" exception as provided
386.22 - * by Sun in the GPL Version 2 section of the License file that
386.23 + * by Oracle in the GPL Version 2 section of the License file that
386.24 * accompanied this code. If applicable, add the following below the
386.25 * License Header, with the fields enclosed by brackets [] replaced by
386.26 * your own identifying information:
387.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssValueImpl.java Fri Jul 16 11:47:36 2010 -0400
387.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssValueImpl.java Fri Jul 16 14:21:50 2010 -0400
387.3 @@ -1,7 +1,10 @@
387.4 /*
387.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
387.6 *
387.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
387.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
387.9 + *
387.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
387.11 + * Other names may be trademarks of their respective owners.
387.12 *
387.13 * The contents of this file are subject to the terms of either the GNU
387.14 * General Public License Version 2 only ("GPL") or the Common
387.15 @@ -13,9 +16,9 @@
387.16 * specific language governing permissions and limitations under the
387.17 * License. When distributing the software, include this License Header
387.18 * Notice in each file and include the License file at
387.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
387.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
387.21 * particular file as subject to the "Classpath" exception as provided
387.22 - * by Sun in the GPL Version 2 section of the License file that
387.23 + * by Oracle in the GPL Version 2 section of the License file that
387.24 * accompanied this code. If applicable, add the following below the
387.25 * License Header, with the fields enclosed by brackets [] replaced by
387.26 * your own identifying information:
388.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssValueServiceImpl.java Fri Jul 16 11:47:36 2010 -0400
388.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/CssValueServiceImpl.java Fri Jul 16 14:21:50 2010 -0400
388.3 @@ -1,7 +1,10 @@
388.4 /*
388.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
388.6 *
388.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
388.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
388.9 + *
388.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
388.11 + * Other names may be trademarks of their respective owners.
388.12 *
388.13 * The contents of this file are subject to the terms of either the GNU
388.14 * General Public License Version 2 only ("GPL") or the Common
388.15 @@ -13,9 +16,9 @@
388.16 * specific language governing permissions and limitations under the
388.17 * License. When distributing the software, include this License Header
388.18 * Notice in each file and include the License file at
388.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
388.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
388.21 * particular file as subject to the "Classpath" exception as provided
388.22 - * by Sun in the GPL Version 2 section of the License file that
388.23 + * by Oracle in the GPL Version 2 section of the License file that
388.24 * accompanied this code. If applicable, add the following below the
388.25 * License Header, with the fields enclosed by brackets [] replaced by
388.26 * your own identifying information:
389.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/DesignerContext.java Fri Jul 16 11:47:36 2010 -0400
389.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/DesignerContext.java Fri Jul 16 14:21:50 2010 -0400
389.3 @@ -1,7 +1,10 @@
389.4 /*
389.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
389.6 *
389.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
389.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
389.9 + *
389.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
389.11 + * Other names may be trademarks of their respective owners.
389.12 *
389.13 * The contents of this file are subject to the terms of either the GNU
389.14 * General Public License Version 2 only ("GPL") or the Common
389.15 @@ -13,9 +16,9 @@
389.16 * specific language governing permissions and limitations under the
389.17 * License. When distributing the software, include this License Header
389.18 * Notice in each file and include the License file at
389.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
389.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
389.21 * particular file as subject to the "Classpath" exception as provided
389.22 - * by Sun in the GPL Version 2 section of the License file that
389.23 + * by Oracle in the GPL Version 2 section of the License file that
389.24 * accompanied this code. If applicable, add the following below the
389.25 * License Header, with the fields enclosed by brackets [] replaced by
389.26 * your own identifying information:
390.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/FloatManager.java Fri Jul 16 11:47:36 2010 -0400
390.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/FloatManager.java Fri Jul 16 14:21:50 2010 -0400
390.3 @@ -1,7 +1,10 @@
390.4 /*
390.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
390.6 *
390.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
390.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
390.9 + *
390.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
390.11 + * Other names may be trademarks of their respective owners.
390.12 *
390.13 * The contents of this file are subject to the terms of either the GNU
390.14 * General Public License Version 2 only ("GPL") or the Common
390.15 @@ -13,9 +16,9 @@
390.16 * specific language governing permissions and limitations under the
390.17 * License. When distributing the software, include this License Header
390.18 * Notice in each file and include the License file at
390.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
390.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
390.21 * particular file as subject to the "Classpath" exception as provided
390.22 - * by Sun in the GPL Version 2 section of the License file that
390.23 + * by Oracle in the GPL Version 2 section of the License file that
390.24 * accompanied this code. If applicable, add the following below the
390.25 * License Header, with the fields enclosed by brackets [] replaced by
390.26 * your own identifying information:
391.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/FontShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
391.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/FontShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
391.3 @@ -1,7 +1,10 @@
391.4 /*
391.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
391.6 *
391.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
391.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
391.9 + *
391.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
391.11 + * Other names may be trademarks of their respective owners.
391.12 *
391.13 * The contents of this file are subject to the terms of either the GNU
391.14 * General Public License Version 2 only ("GPL") or the Common
391.15 @@ -13,9 +16,9 @@
391.16 * specific language governing permissions and limitations under the
391.17 * License. When distributing the software, include this License Header
391.18 * Notice in each file and include the License file at
391.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
391.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
391.21 * particular file as subject to the "Classpath" exception as provided
391.22 - * by Sun in the GPL Version 2 section of the License file that
391.23 + * by Oracle in the GPL Version 2 section of the License file that
391.24 * accompanied this code. If applicable, add the following below the
391.25 * License Header, with the fields enclosed by brackets [] replaced by
391.26 * your own identifying information:
392.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/HeightManager.java Fri Jul 16 11:47:36 2010 -0400
392.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/HeightManager.java Fri Jul 16 14:21:50 2010 -0400
392.3 @@ -1,7 +1,10 @@
392.4 /*
392.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
392.6 *
392.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
392.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
392.9 + *
392.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
392.11 + * Other names may be trademarks of their respective owners.
392.12 *
392.13 * The contents of this file are subject to the terms of either the GNU
392.14 * General Public License Version 2 only ("GPL") or the Common
392.15 @@ -13,9 +16,9 @@
392.16 * specific language governing permissions and limitations under the
392.17 * License. When distributing the software, include this License Header
392.18 * Notice in each file and include the License file at
392.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
392.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
392.21 * particular file as subject to the "Classpath" exception as provided
392.22 - * by Sun in the GPL Version 2 section of the License file that
392.23 + * by Oracle in the GPL Version 2 section of the License file that
392.24 * accompanied this code. If applicable, add the following below the
392.25 * License Header, with the fields enclosed by brackets [] replaced by
392.26 * your own identifying information:
393.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/LineHeightManager.java Fri Jul 16 11:47:36 2010 -0400
393.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/LineHeightManager.java Fri Jul 16 14:21:50 2010 -0400
393.3 @@ -1,7 +1,10 @@
393.4 /*
393.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
393.6 *
393.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
393.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
393.9 + *
393.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
393.11 + * Other names may be trademarks of their respective owners.
393.12 *
393.13 * The contents of this file are subject to the terms of either the GNU
393.14 * General Public License Version 2 only ("GPL") or the Common
393.15 @@ -13,9 +16,9 @@
393.16 * specific language governing permissions and limitations under the
393.17 * License. When distributing the software, include this License Header
393.18 * Notice in each file and include the License file at
393.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
393.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
393.21 * particular file as subject to the "Classpath" exception as provided
393.22 - * by Sun in the GPL Version 2 section of the License file that
393.23 + * by Oracle in the GPL Version 2 section of the License file that
393.24 * accompanied this code. If applicable, add the following below the
393.25 * License Header, with the fields enclosed by brackets [] replaced by
393.26 * your own identifying information:
394.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ListStyleImageManager.java Fri Jul 16 11:47:36 2010 -0400
394.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ListStyleImageManager.java Fri Jul 16 14:21:50 2010 -0400
394.3 @@ -1,7 +1,10 @@
394.4 /*
394.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
394.6 *
394.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
394.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
394.9 + *
394.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
394.11 + * Other names may be trademarks of their respective owners.
394.12 *
394.13 * The contents of this file are subject to the terms of either the GNU
394.14 * General Public License Version 2 only ("GPL") or the Common
394.15 @@ -13,9 +16,9 @@
394.16 * specific language governing permissions and limitations under the
394.17 * License. When distributing the software, include this License Header
394.18 * Notice in each file and include the License file at
394.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
394.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
394.21 * particular file as subject to the "Classpath" exception as provided
394.22 - * by Sun in the GPL Version 2 section of the License file that
394.23 + * by Oracle in the GPL Version 2 section of the License file that
394.24 * accompanied this code. If applicable, add the following below the
394.25 * License Header, with the fields enclosed by brackets [] replaced by
394.26 * your own identifying information:
395.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ListStyleShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
395.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ListStyleShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
395.3 @@ -1,7 +1,10 @@
395.4 /*
395.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
395.6 *
395.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
395.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
395.9 + *
395.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
395.11 + * Other names may be trademarks of their respective owners.
395.12 *
395.13 * The contents of this file are subject to the terms of either the GNU
395.14 * General Public License Version 2 only ("GPL") or the Common
395.15 @@ -13,9 +16,9 @@
395.16 * specific language governing permissions and limitations under the
395.17 * License. When distributing the software, include this License Header
395.18 * Notice in each file and include the License file at
395.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
395.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
395.21 * particular file as subject to the "Classpath" exception as provided
395.22 - * by Sun in the GPL Version 2 section of the License file that
395.23 + * by Oracle in the GPL Version 2 section of the License file that
395.24 * accompanied this code. If applicable, add the following below the
395.25 * License Header, with the fields enclosed by brackets [] replaced by
395.26 * your own identifying information:
396.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ListStyleTypeManager.java Fri Jul 16 11:47:36 2010 -0400
396.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ListStyleTypeManager.java Fri Jul 16 14:21:50 2010 -0400
396.3 @@ -1,7 +1,10 @@
396.4 /*
396.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
396.6 *
396.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
396.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
396.9 + *
396.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
396.11 + * Other names may be trademarks of their respective owners.
396.12 *
396.13 * The contents of this file are subject to the terms of either the GNU
396.14 * General Public License Version 2 only ("GPL") or the Common
396.15 @@ -13,9 +16,9 @@
396.16 * specific language governing permissions and limitations under the
396.17 * License. When distributing the software, include this License Header
396.18 * Notice in each file and include the License file at
396.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
396.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
396.21 * particular file as subject to the "Classpath" exception as provided
396.22 - * by Sun in the GPL Version 2 section of the License file that
396.23 + * by Oracle in the GPL Version 2 section of the License file that
396.24 * accompanied this code. If applicable, add the following below the
396.25 * License Header, with the fields enclosed by brackets [] replaced by
396.26 * your own identifying information:
397.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/MarginManager.java Fri Jul 16 11:47:36 2010 -0400
397.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/MarginManager.java Fri Jul 16 14:21:50 2010 -0400
397.3 @@ -1,7 +1,10 @@
397.4 /*
397.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
397.6 *
397.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
397.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
397.9 + *
397.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
397.11 + * Other names may be trademarks of their respective owners.
397.12 *
397.13 * The contents of this file are subject to the terms of either the GNU
397.14 * General Public License Version 2 only ("GPL") or the Common
397.15 @@ -13,9 +16,9 @@
397.16 * specific language governing permissions and limitations under the
397.17 * License. When distributing the software, include this License Header
397.18 * Notice in each file and include the License file at
397.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
397.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
397.21 * particular file as subject to the "Classpath" exception as provided
397.22 - * by Sun in the GPL Version 2 section of the License file that
397.23 + * by Oracle in the GPL Version 2 section of the License file that
397.24 * accompanied this code. If applicable, add the following below the
397.25 * License Header, with the fields enclosed by brackets [] replaced by
397.26 * your own identifying information:
398.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/MarginShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
398.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/MarginShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
398.3 @@ -1,7 +1,10 @@
398.4 /*
398.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
398.6 *
398.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
398.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
398.9 + *
398.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
398.11 + * Other names may be trademarks of their respective owners.
398.12 *
398.13 * The contents of this file are subject to the terms of either the GNU
398.14 * General Public License Version 2 only ("GPL") or the Common
398.15 @@ -13,9 +16,9 @@
398.16 * specific language governing permissions and limitations under the
398.17 * License. When distributing the software, include this License Header
398.18 * Notice in each file and include the License file at
398.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
398.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
398.21 * particular file as subject to the "Classpath" exception as provided
398.22 - * by Sun in the GPL Version 2 section of the License file that
398.23 + * by Oracle in the GPL Version 2 section of the License file that
398.24 * accompanied this code. If applicable, add the following below the
398.25 * License Header, with the fields enclosed by brackets [] replaced by
398.26 * your own identifying information:
399.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/NonautoableLengthManager.java Fri Jul 16 11:47:36 2010 -0400
399.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/NonautoableLengthManager.java Fri Jul 16 14:21:50 2010 -0400
399.3 @@ -1,7 +1,10 @@
399.4 /*
399.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
399.6 *
399.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
399.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
399.9 + *
399.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
399.11 + * Other names may be trademarks of their respective owners.
399.12 *
399.13 * The contents of this file are subject to the terms of either the GNU
399.14 * General Public License Version 2 only ("GPL") or the Common
399.15 @@ -13,9 +16,9 @@
399.16 * specific language governing permissions and limitations under the
399.17 * License. When distributing the software, include this License Header
399.18 * Notice in each file and include the License file at
399.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
399.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
399.21 * particular file as subject to the "Classpath" exception as provided
399.22 - * by Sun in the GPL Version 2 section of the License file that
399.23 + * by Oracle in the GPL Version 2 section of the License file that
399.24 * accompanied this code. If applicable, add the following below the
399.25 * License Header, with the fields enclosed by brackets [] replaced by
399.26 * your own identifying information:
400.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/OffsetManager.java Fri Jul 16 11:47:36 2010 -0400
400.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/OffsetManager.java Fri Jul 16 14:21:50 2010 -0400
400.3 @@ -1,7 +1,10 @@
400.4 /*
400.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
400.6 *
400.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
400.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
400.9 + *
400.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
400.11 + * Other names may be trademarks of their respective owners.
400.12 *
400.13 * The contents of this file are subject to the terms of either the GNU
400.14 * General Public License Version 2 only ("GPL") or the Common
400.15 @@ -13,9 +16,9 @@
400.16 * specific language governing permissions and limitations under the
400.17 * License. When distributing the software, include this License Header
400.18 * Notice in each file and include the License file at
400.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
400.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
400.21 * particular file as subject to the "Classpath" exception as provided
400.22 - * by Sun in the GPL Version 2 section of the License file that
400.23 + * by Oracle in the GPL Version 2 section of the License file that
400.24 * accompanied this code. If applicable, add the following below the
400.25 * License Header, with the fields enclosed by brackets [] replaced by
400.26 * your own identifying information:
401.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/PaddingManager.java Fri Jul 16 11:47:36 2010 -0400
401.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/PaddingManager.java Fri Jul 16 14:21:50 2010 -0400
401.3 @@ -1,7 +1,10 @@
401.4 /*
401.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
401.6 *
401.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
401.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
401.9 + *
401.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
401.11 + * Other names may be trademarks of their respective owners.
401.12 *
401.13 * The contents of this file are subject to the terms of either the GNU
401.14 * General Public License Version 2 only ("GPL") or the Common
401.15 @@ -13,9 +16,9 @@
401.16 * specific language governing permissions and limitations under the
401.17 * License. When distributing the software, include this License Header
401.18 * Notice in each file and include the License file at
401.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
401.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
401.21 * particular file as subject to the "Classpath" exception as provided
401.22 - * by Sun in the GPL Version 2 section of the License file that
401.23 + * by Oracle in the GPL Version 2 section of the License file that
401.24 * accompanied this code. If applicable, add the following below the
401.25 * License Header, with the fields enclosed by brackets [] replaced by
401.26 * your own identifying information:
402.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/PaddingShorthandManager.java Fri Jul 16 11:47:36 2010 -0400
402.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/PaddingShorthandManager.java Fri Jul 16 14:21:50 2010 -0400
402.3 @@ -1,7 +1,10 @@
402.4 /*
402.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
402.6 *
402.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
402.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
402.9 + *
402.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
402.11 + * Other names may be trademarks of their respective owners.
402.12 *
402.13 * The contents of this file are subject to the terms of either the GNU
402.14 * General Public License Version 2 only ("GPL") or the Common
402.15 @@ -13,9 +16,9 @@
402.16 * specific language governing permissions and limitations under the
402.17 * License. When distributing the software, include this License Header
402.18 * Notice in each file and include the License file at
402.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
402.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
402.21 * particular file as subject to the "Classpath" exception as provided
402.22 - * by Sun in the GPL Version 2 section of the License file that
402.23 + * by Oracle in the GPL Version 2 section of the License file that
402.24 * accompanied this code. If applicable, add the following below the
402.25 * License Header, with the fields enclosed by brackets [] replaced by
402.26 * your own identifying information:
403.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/PositionManager.java Fri Jul 16 11:47:36 2010 -0400
403.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/PositionManager.java Fri Jul 16 14:21:50 2010 -0400
403.3 @@ -1,7 +1,10 @@
403.4 /*
403.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
403.6 *
403.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
403.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
403.9 + *
403.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
403.11 + * Other names may be trademarks of their respective owners.
403.12 *
403.13 * The contents of this file are subject to the terms of either the GNU
403.14 * General Public License Version 2 only ("GPL") or the Common
403.15 @@ -13,9 +16,9 @@
403.16 * specific language governing permissions and limitations under the
403.17 * License. When distributing the software, include this License Header
403.18 * Notice in each file and include the License file at
403.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
403.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
403.21 * particular file as subject to the "Classpath" exception as provided
403.22 - * by Sun in the GPL Version 2 section of the License file that
403.23 + * by Oracle in the GPL Version 2 section of the License file that
403.24 * accompanied this code. If applicable, add the following below the
403.25 * License Header, with the fields enclosed by brackets [] replaced by
403.26 * your own identifying information:
404.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/PreviewElement.java Fri Jul 16 11:47:36 2010 -0400
404.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/PreviewElement.java Fri Jul 16 14:21:50 2010 -0400
404.3 @@ -1,7 +1,10 @@
404.4 /*
404.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
404.6 *
404.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
404.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
404.9 + *
404.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
404.11 + * Other names may be trademarks of their respective owners.
404.12 *
404.13 * The contents of this file are subject to the terms of either the GNU
404.14 * General Public License Version 2 only ("GPL") or the Common
404.15 @@ -13,9 +16,9 @@
404.16 * specific language governing permissions and limitations under the
404.17 * License. When distributing the software, include this License Header
404.18 * Notice in each file and include the License file at
404.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
404.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
404.21 * particular file as subject to the "Classpath" exception as provided
404.22 - * by Sun in the GPL Version 2 section of the License file that
404.23 + * by Oracle in the GPL Version 2 section of the License file that
404.24 * accompanied this code. If applicable, add the following below the
404.25 * License Header, with the fields enclosed by brackets [] replaced by
404.26 * your own identifying information:
405.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/RaveLayoutManager.java Fri Jul 16 11:47:36 2010 -0400
405.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/RaveLayoutManager.java Fri Jul 16 14:21:50 2010 -0400
405.3 @@ -1,7 +1,10 @@
405.4 /*
405.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
405.6 *
405.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
405.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
405.9 + *
405.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
405.11 + * Other names may be trademarks of their respective owners.
405.12 *
405.13 * The contents of this file are subject to the terms of either the GNU
405.14 * General Public License Version 2 only ("GPL") or the Common
405.15 @@ -13,9 +16,9 @@
405.16 * specific language governing permissions and limitations under the
405.17 * License. When distributing the software, include this License Header
405.18 * Notice in each file and include the License file at
405.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
405.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
405.21 * particular file as subject to the "Classpath" exception as provided
405.22 - * by Sun in the GPL Version 2 section of the License file that
405.23 + * by Oracle in the GPL Version 2 section of the License file that
405.24 * accompanied this code. If applicable, add the following below the
405.25 * License Header, with the fields enclosed by brackets [] replaced by
405.26 * your own identifying information:
406.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/RaveLinkColorManager.java Fri Jul 16 11:47:36 2010 -0400
406.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/RaveLinkColorManager.java Fri Jul 16 14:21:50 2010 -0400
406.3 @@ -1,7 +1,10 @@
406.4 /*
406.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
406.6 *
406.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
406.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
406.9 + *
406.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
406.11 + * Other names may be trademarks of their respective owners.
406.12 *
406.13 * The contents of this file are subject to the terms of either the GNU
406.14 * General Public License Version 2 only ("GPL") or the Common
406.15 @@ -13,9 +16,9 @@
406.16 * specific language governing permissions and limitations under the
406.17 * License. When distributing the software, include this License Header
406.18 * Notice in each file and include the License file at
406.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
406.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
406.21 * particular file as subject to the "Classpath" exception as provided
406.22 - * by Sun in the GPL Version 2 section of the License file that
406.23 + * by Oracle in the GPL Version 2 section of the License file that
406.24 * accompanied this code. If applicable, add the following below the
406.25 * License Header, with the fields enclosed by brackets [] replaced by
406.26 * your own identifying information:
407.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/RaveParser.java Fri Jul 16 11:47:36 2010 -0400
407.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/RaveParser.java Fri Jul 16 14:21:50 2010 -0400
407.3 @@ -1,7 +1,10 @@
407.4 /*
407.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
407.6 *
407.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
407.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
407.9 + *
407.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
407.11 + * Other names may be trademarks of their respective owners.
407.12 *
407.13 * The contents of this file are subject to the terms of either the GNU
407.14 * General Public License Version 2 only ("GPL") or the Common
407.15 @@ -13,9 +16,9 @@
407.16 * specific language governing permissions and limitations under the
407.17 * License. When distributing the software, include this License Header
407.18 * Notice in each file and include the License file at
407.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
407.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
407.21 * particular file as subject to the "Classpath" exception as provided
407.22 - * by Sun in the GPL Version 2 section of the License file that
407.23 + * by Oracle in the GPL Version 2 section of the License file that
407.24 * accompanied this code. If applicable, add the following below the
407.25 * License Header, with the fields enclosed by brackets [] replaced by
407.26 * your own identifying information:
408.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/StringIntMap.java Fri Jul 16 11:47:36 2010 -0400
408.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/StringIntMap.java Fri Jul 16 14:21:50 2010 -0400
408.3 @@ -1,7 +1,10 @@
408.4 /*
408.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
408.6 *
408.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
408.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
408.9 + *
408.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
408.11 + * Other names may be trademarks of their respective owners.
408.12 *
408.13 * The contents of this file are subject to the terms of either the GNU
408.14 * General Public License Version 2 only ("GPL") or the Common
408.15 @@ -13,9 +16,9 @@
408.16 * specific language governing permissions and limitations under the
408.17 * License. When distributing the software, include this License Header
408.18 * Notice in each file and include the License file at
408.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
408.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
408.21 * particular file as subject to the "Classpath" exception as provided
408.22 - * by Sun in the GPL Version 2 section of the License file that
408.23 + * by Oracle in the GPL Version 2 section of the License file that
408.24 * accompanied this code. If applicable, add the following below the
408.25 * License Header, with the fields enclosed by brackets [] replaced by
408.26 * your own identifying information:
409.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/TableLayoutManager.java Fri Jul 16 11:47:36 2010 -0400
409.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/TableLayoutManager.java Fri Jul 16 14:21:50 2010 -0400
409.3 @@ -1,7 +1,10 @@
409.4 /*
409.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
409.6 *
409.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
409.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
409.9 + *
409.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
409.11 + * Other names may be trademarks of their respective owners.
409.12 *
409.13 * The contents of this file are subject to the terms of either the GNU
409.14 * General Public License Version 2 only ("GPL") or the Common
409.15 @@ -13,9 +16,9 @@
409.16 * specific language governing permissions and limitations under the
409.17 * License. When distributing the software, include this License Header
409.18 * Notice in each file and include the License file at
409.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
409.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
409.21 * particular file as subject to the "Classpath" exception as provided
409.22 - * by Sun in the GPL Version 2 section of the License file that
409.23 + * by Oracle in the GPL Version 2 section of the License file that
409.24 * accompanied this code. If applicable, add the following below the
409.25 * License Header, with the fields enclosed by brackets [] replaced by
409.26 * your own identifying information:
410.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/TextAlignManager.java Fri Jul 16 11:47:36 2010 -0400
410.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/TextAlignManager.java Fri Jul 16 14:21:50 2010 -0400
410.3 @@ -1,7 +1,10 @@
410.4 /*
410.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
410.6 *
410.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
410.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
410.9 + *
410.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
410.11 + * Other names may be trademarks of their respective owners.
410.12 *
410.13 * The contents of this file are subject to the terms of either the GNU
410.14 * General Public License Version 2 only ("GPL") or the Common
410.15 @@ -13,9 +16,9 @@
410.16 * specific language governing permissions and limitations under the
410.17 * License. When distributing the software, include this License Header
410.18 * Notice in each file and include the License file at
410.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
410.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
410.21 * particular file as subject to the "Classpath" exception as provided
410.22 - * by Sun in the GPL Version 2 section of the License file that
410.23 + * by Oracle in the GPL Version 2 section of the License file that
410.24 * accompanied this code. If applicable, add the following below the
410.25 * License Header, with the fields enclosed by brackets [] replaced by
410.26 * your own identifying information:
411.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/TextIndentManager.java Fri Jul 16 11:47:36 2010 -0400
411.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/TextIndentManager.java Fri Jul 16 14:21:50 2010 -0400
411.3 @@ -1,7 +1,10 @@
411.4 /*
411.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
411.6 *
411.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
411.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
411.9 + *
411.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
411.11 + * Other names may be trademarks of their respective owners.
411.12 *
411.13 * The contents of this file are subject to the terms of either the GNU
411.14 * General Public License Version 2 only ("GPL") or the Common
411.15 @@ -13,9 +16,9 @@
411.16 * specific language governing permissions and limitations under the
411.17 * License. When distributing the software, include this License Header
411.18 * Notice in each file and include the License file at
411.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
411.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
411.21 * particular file as subject to the "Classpath" exception as provided
411.22 - * by Sun in the GPL Version 2 section of the License file that
411.23 + * by Oracle in the GPL Version 2 section of the License file that
411.24 * accompanied this code. If applicable, add the following below the
411.25 * License Header, with the fields enclosed by brackets [] replaced by
411.26 * your own identifying information:
412.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/TextTransformManager.java Fri Jul 16 11:47:36 2010 -0400
412.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/TextTransformManager.java Fri Jul 16 14:21:50 2010 -0400
412.3 @@ -1,7 +1,10 @@
412.4 /*
412.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
412.6 *
412.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
412.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
412.9 + *
412.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
412.11 + * Other names may be trademarks of their respective owners.
412.12 *
412.13 * The contents of this file are subject to the terms of either the GNU
412.14 * General Public License Version 2 only ("GPL") or the Common
412.15 @@ -13,9 +16,9 @@
412.16 * specific language governing permissions and limitations under the
412.17 * License. When distributing the software, include this License Header
412.18 * Notice in each file and include the License file at
412.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
412.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
412.21 * particular file as subject to the "Classpath" exception as provided
412.22 - * by Sun in the GPL Version 2 section of the License file that
412.23 + * by Oracle in the GPL Version 2 section of the License file that
412.24 * accompanied this code. If applicable, add the following below the
412.25 * License Header, with the fields enclosed by brackets [] replaced by
412.26 * your own identifying information:
413.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/UserAgent.java Fri Jul 16 11:47:36 2010 -0400
413.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/UserAgent.java Fri Jul 16 14:21:50 2010 -0400
413.3 @@ -1,7 +1,10 @@
413.4 /*
413.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
413.6 *
413.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
413.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
413.9 + *
413.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
413.11 + * Other names may be trademarks of their respective owners.
413.12 *
413.13 * The contents of this file are subject to the terms of either the GNU
413.14 * General Public License Version 2 only ("GPL") or the Common
413.15 @@ -13,9 +16,9 @@
413.16 * specific language governing permissions and limitations under the
413.17 * License. When distributing the software, include this License Header
413.18 * Notice in each file and include the License file at
413.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
413.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
413.21 * particular file as subject to the "Classpath" exception as provided
413.22 - * by Sun in the GPL Version 2 section of the License file that
413.23 + * by Oracle in the GPL Version 2 section of the License file that
413.24 * accompanied this code. If applicable, add the following below the
413.25 * License Header, with the fields enclosed by brackets [] replaced by
413.26 * your own identifying information:
414.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/VerticalAlignmentManager.java Fri Jul 16 11:47:36 2010 -0400
414.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/VerticalAlignmentManager.java Fri Jul 16 14:21:50 2010 -0400
414.3 @@ -1,7 +1,10 @@
414.4 /*
414.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
414.6 *
414.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
414.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
414.9 + *
414.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
414.11 + * Other names may be trademarks of their respective owners.
414.12 *
414.13 * The contents of this file are subject to the terms of either the GNU
414.14 * General Public License Version 2 only ("GPL") or the Common
414.15 @@ -13,9 +16,9 @@
414.16 * specific language governing permissions and limitations under the
414.17 * License. When distributing the software, include this License Header
414.18 * Notice in each file and include the License file at
414.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
414.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
414.21 * particular file as subject to the "Classpath" exception as provided
414.22 - * by Sun in the GPL Version 2 section of the License file that
414.23 + * by Oracle in the GPL Version 2 section of the License file that
414.24 * accompanied this code. If applicable, add the following below the
414.25 * License Header, with the fields enclosed by brackets [] replaced by
414.26 * your own identifying information:
415.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/WhitespaceManager.java Fri Jul 16 11:47:36 2010 -0400
415.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/WhitespaceManager.java Fri Jul 16 14:21:50 2010 -0400
415.3 @@ -1,7 +1,10 @@
415.4 /*
415.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
415.6 *
415.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
415.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
415.9 + *
415.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
415.11 + * Other names may be trademarks of their respective owners.
415.12 *
415.13 * The contents of this file are subject to the terms of either the GNU
415.14 * General Public License Version 2 only ("GPL") or the Common
415.15 @@ -13,9 +16,9 @@
415.16 * specific language governing permissions and limitations under the
415.17 * License. When distributing the software, include this License Header
415.18 * Notice in each file and include the License file at
415.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
415.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
415.21 * particular file as subject to the "Classpath" exception as provided
415.22 - * by Sun in the GPL Version 2 section of the License file that
415.23 + * by Oracle in the GPL Version 2 section of the License file that
415.24 * accompanied this code. If applicable, add the following below the
415.25 * License Header, with the fields enclosed by brackets [] replaced by
415.26 * your own identifying information:
416.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/WidthManager.java Fri Jul 16 11:47:36 2010 -0400
416.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/WidthManager.java Fri Jul 16 14:21:50 2010 -0400
416.3 @@ -1,7 +1,10 @@
416.4 /*
416.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
416.6 *
416.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
416.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
416.9 + *
416.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
416.11 + * Other names may be trademarks of their respective owners.
416.12 *
416.13 * The contents of this file are subject to the terms of either the GNU
416.14 * General Public License Version 2 only ("GPL") or the Common
416.15 @@ -13,9 +16,9 @@
416.16 * specific language governing permissions and limitations under the
416.17 * License. When distributing the software, include this License Header
416.18 * Notice in each file and include the License file at
416.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
416.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
416.21 * particular file as subject to the "Classpath" exception as provided
416.22 - * by Sun in the GPL Version 2 section of the License file that
416.23 + * by Oracle in the GPL Version 2 section of the License file that
416.24 * accompanied this code. If applicable, add the following below the
416.25 * License Header, with the fields enclosed by brackets [] replaced by
416.26 * your own identifying information:
417.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/XhtmlCssEngine.java Fri Jul 16 11:47:36 2010 -0400
417.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/XhtmlCssEngine.java Fri Jul 16 14:21:50 2010 -0400
417.3 @@ -1,7 +1,10 @@
417.4 /*
417.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
417.6 *
417.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
417.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
417.9 + *
417.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
417.11 + * Other names may be trademarks of their respective owners.
417.12 *
417.13 * The contents of this file are subject to the terms of either the GNU
417.14 * General Public License Version 2 only ("GPL") or the Common
417.15 @@ -13,9 +16,9 @@
417.16 * specific language governing permissions and limitations under the
417.17 * License. When distributing the software, include this License Header
417.18 * Notice in each file and include the License file at
417.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
417.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
417.21 * particular file as subject to the "Classpath" exception as provided
417.22 - * by Sun in the GPL Version 2 section of the License file that
417.23 + * by Oracle in the GPL Version 2 section of the License file that
417.24 * accompanied this code. If applicable, add the following below the
417.25 * License Header, with the fields enclosed by brackets [] replaced by
417.26 * your own identifying information:
418.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ZIndexManager.java Fri Jul 16 11:47:36 2010 -0400
418.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/ZIndexManager.java Fri Jul 16 14:21:50 2010 -0400
418.3 @@ -1,7 +1,10 @@
418.4 /*
418.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
418.6 *
418.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
418.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
418.9 + *
418.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
418.11 + * Other names may be trademarks of their respective owners.
418.12 *
418.13 * The contents of this file are subject to the terms of either the GNU
418.14 * General Public License Version 2 only ("GPL") or the Common
418.15 @@ -13,9 +16,9 @@
418.16 * specific language governing permissions and limitations under the
418.17 * License. When distributing the software, include this License Header
418.18 * Notice in each file and include the License file at
418.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
418.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
418.21 * particular file as subject to the "Classpath" exception as provided
418.22 - * by Sun in the GPL Version 2 section of the License file that
418.23 + * by Oracle in the GPL Version 2 section of the License file that
418.24 * accompanied this code. If applicable, add the following below the
418.25 * License Header, with the fields enclosed by brackets [] replaced by
418.26 * your own identifying information:
419.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
419.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/designer/cssengine/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
419.3 @@ -1,6 +1,9 @@
419.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
419.5 #
419.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
419.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
419.8 +#
419.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
419.10 +# Other names may be trademarks of their respective owners.
419.11 #
419.12 # The contents of this file are subject to the terms of either the GNU
419.13 # General Public License Version 2 only ("GPL") or the Common
419.14 @@ -12,9 +15,9 @@
419.15 # specific language governing permissions and limitations under the
419.16 # License. When distributing the software, include this License Header
419.17 # Notice in each file and include the License file at
419.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
419.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
419.20 # particular file as subject to the "Classpath" exception as provided
419.21 -# by Sun in the GPL Version 2 section of the License file that
419.22 +# by Oracle in the GPL Version 2 section of the License file that
419.23 # accompanied this code. If applicable, add the following below the
419.24 # License Header, with the fields enclosed by brackets [] replaced by
419.25 # your own identifying information:
420.1 --- a/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/spi/designer/cssengine/CssUserAgentInfo.java Fri Jul 16 11:47:36 2010 -0400
420.2 +++ b/visualweb.designer.cssengine/src/org/netbeans/modules/visualweb/spi/designer/cssengine/CssUserAgentInfo.java Fri Jul 16 14:21:50 2010 -0400
420.3 @@ -1,7 +1,10 @@
420.4 /*
420.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
420.6 *
420.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
420.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
420.9 + *
420.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
420.11 + * Other names may be trademarks of their respective owners.
420.12 *
420.13 * The contents of this file are subject to the terms of either the GNU
420.14 * General Public License Version 2 only ("GPL") or the Common
420.15 @@ -13,9 +16,9 @@
420.16 * specific language governing permissions and limitations under the
420.17 * License. When distributing the software, include this License Header
420.18 * Notice in each file and include the License file at
420.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
420.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
420.21 * particular file as subject to the "Classpath" exception as provided
420.22 - * by Sun in the GPL Version 2 section of the License file that
420.23 + * by Oracle in the GPL Version 2 section of the License file that
420.24 * accompanied this code. If applicable, add the following below the
420.25 * License Header, with the fields enclosed by brackets [] replaced by
420.26 * your own identifying information:
421.1 --- a/visualweb.designer.html/build.xml Fri Jul 16 11:47:36 2010 -0400
421.2 +++ b/visualweb.designer.html/build.xml Fri Jul 16 14:21:50 2010 -0400
421.3 @@ -2,7 +2,10 @@
421.4 <!--
421.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
421.6
421.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
421.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
421.9 +
421.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
421.11 +Other names may be trademarks of their respective owners.
421.12
421.13
421.14 The contents of this file are subject to the terms of either the GNU
421.15 @@ -15,9 +18,9 @@
421.16 specific language governing permissions and limitations under the
421.17 License. When distributing the software, include this License Header
421.18 Notice in each file and include the License file at
421.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
421.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
421.21 particular file as subject to the "Classpath" exception as provided
421.22 -by Sun in the GPL Version 2 section of the License file that
421.23 +by Oracle in the GPL Version 2 section of the License file that
421.24 accompanied this code. If applicable, add the following below the
421.25 License Header, with the fields enclosed by brackets [] replaced by
421.26 your own identifying information:
422.1 --- a/visualweb.designer.html/library/build.xml Fri Jul 16 11:47:36 2010 -0400
422.2 +++ b/visualweb.designer.html/library/build.xml Fri Jul 16 14:21:50 2010 -0400
422.3 @@ -2,7 +2,10 @@
422.4 <!--
422.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
422.6
422.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
422.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
422.9 +
422.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
422.11 +Other names may be trademarks of their respective owners.
422.12
422.13
422.14 The contents of this file are subject to the terms of either the GNU
422.15 @@ -15,9 +18,9 @@
422.16 specific language governing permissions and limitations under the
422.17 License. When distributing the software, include this License Header
422.18 Notice in each file and include the License file at
422.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
422.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
422.21 particular file as subject to the "Classpath" exception as provided
422.22 -by Sun in the GPL Version 2 section of the License file that
422.23 +by Oracle in the GPL Version 2 section of the License file that
422.24 accompanied this code. If applicable, add the following below the
422.25 License Header, with the fields enclosed by brackets [] replaced by
422.26 your own identifying information:
423.1 --- a/visualweb.designer.html/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
423.2 +++ b/visualweb.designer.html/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
423.3 @@ -1,6 +1,9 @@
423.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
423.5 #
423.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
423.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
423.8 +#
423.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
423.10 +# Other names may be trademarks of their respective owners.
423.11 #
423.12 # The contents of this file are subject to the terms of either the GNU
423.13 # General Public License Version 2 only ("GPL") or the Common
423.14 @@ -12,9 +15,9 @@
423.15 # specific language governing permissions and limitations under the
423.16 # License. When distributing the software, include this License Header
423.17 # Notice in each file and include the License file at
423.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
423.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
423.20 # particular file as subject to the "Classpath" exception as provided
423.21 -# by Sun in the GPL Version 2 section of the License file that
423.22 +# by Oracle in the GPL Version 2 section of the License file that
423.23 # accompanied this code. If applicable, add the following below the
423.24 # License Header, with the fields enclosed by brackets [] replaced by
423.25 # your own identifying information:
424.1 --- a/visualweb.designer.html/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
424.2 +++ b/visualweb.designer.html/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
424.3 @@ -2,7 +2,10 @@
424.4 <!--
424.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
424.6
424.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
424.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
424.9 +
424.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
424.11 +Other names may be trademarks of their respective owners.
424.12
424.13
424.14 The contents of this file are subject to the terms of either the GNU
424.15 @@ -15,9 +18,9 @@
424.16 specific language governing permissions and limitations under the
424.17 License. When distributing the software, include this License Header
424.18 Notice in each file and include the License file at
424.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
424.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
424.21 particular file as subject to the "Classpath" exception as provided
424.22 -by Sun in the GPL Version 2 section of the License file that
424.23 +by Oracle in the GPL Version 2 section of the License file that
424.24 accompanied this code. If applicable, add the following below the
424.25 License Header, with the fields enclosed by brackets [] replaced by
424.26 your own identifying information:
425.1 --- a/visualweb.designer.html/library/src/org/netbeans/modules/visualweb/designer/html/HtmlAttribute.java Fri Jul 16 11:47:36 2010 -0400
425.2 +++ b/visualweb.designer.html/library/src/org/netbeans/modules/visualweb/designer/html/HtmlAttribute.java Fri Jul 16 14:21:50 2010 -0400
425.3 @@ -1,7 +1,10 @@
425.4 /*
425.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
425.6 *
425.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
425.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
425.9 + *
425.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
425.11 + * Other names may be trademarks of their respective owners.
425.12 *
425.13 * The contents of this file are subject to the terms of either the GNU
425.14 * General Public License Version 2 only ("GPL") or the Common
425.15 @@ -13,9 +16,9 @@
425.16 * specific language governing permissions and limitations under the
425.17 * License. When distributing the software, include this License Header
425.18 * Notice in each file and include the License file at
425.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
425.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
425.21 * particular file as subject to the "Classpath" exception as provided
425.22 - * by Sun in the GPL Version 2 section of the License file that
425.23 + * by Oracle in the GPL Version 2 section of the License file that
425.24 * accompanied this code. If applicable, add the following below the
425.25 * License Header, with the fields enclosed by brackets [] replaced by
425.26 * your own identifying information:
426.1 --- a/visualweb.designer.html/library/src/org/netbeans/modules/visualweb/designer/html/HtmlTag.java Fri Jul 16 11:47:36 2010 -0400
426.2 +++ b/visualweb.designer.html/library/src/org/netbeans/modules/visualweb/designer/html/HtmlTag.java Fri Jul 16 14:21:50 2010 -0400
426.3 @@ -1,7 +1,10 @@
426.4 /*
426.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
426.6 *
426.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
426.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
426.9 + *
426.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
426.11 + * Other names may be trademarks of their respective owners.
426.12 *
426.13 * The contents of this file are subject to the terms of either the GNU
426.14 * General Public License Version 2 only ("GPL") or the Common
426.15 @@ -13,9 +16,9 @@
426.16 * specific language governing permissions and limitations under the
426.17 * License. When distributing the software, include this License Header
426.18 * Notice in each file and include the License file at
426.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
426.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
426.21 * particular file as subject to the "Classpath" exception as provided
426.22 - * by Sun in the GPL Version 2 section of the License file that
426.23 + * by Oracle in the GPL Version 2 section of the License file that
426.24 * accompanied this code. If applicable, add the following below the
426.25 * License Header, with the fields enclosed by brackets [] replaced by
426.26 * your own identifying information:
427.1 --- a/visualweb.designer.html/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
427.2 +++ b/visualweb.designer.html/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
427.3 @@ -1,6 +1,9 @@
427.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
427.5 #
427.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
427.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
427.8 +#
427.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
427.10 +# Other names may be trademarks of their respective owners.
427.11 #
427.12 # The contents of this file are subject to the terms of either the GNU
427.13 # General Public License Version 2 only ("GPL") or the Common
427.14 @@ -12,9 +15,9 @@
427.15 # specific language governing permissions and limitations under the
427.16 # License. When distributing the software, include this License Header
427.17 # Notice in each file and include the License file at
427.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
427.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
427.20 # particular file as subject to the "Classpath" exception as provided
427.21 -# by Sun in the GPL Version 2 section of the License file that
427.22 +# by Oracle in the GPL Version 2 section of the License file that
427.23 # accompanied this code. If applicable, add the following below the
427.24 # License Header, with the fields enclosed by brackets [] replaced by
427.25 # your own identifying information:
428.1 --- a/visualweb.designer.html/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
428.2 +++ b/visualweb.designer.html/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
428.3 @@ -2,7 +2,10 @@
428.4 <!--
428.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
428.6
428.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
428.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
428.9 +
428.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
428.11 +Other names may be trademarks of their respective owners.
428.12
428.13
428.14 The contents of this file are subject to the terms of either the GNU
428.15 @@ -15,9 +18,9 @@
428.16 specific language governing permissions and limitations under the
428.17 License. When distributing the software, include this License Header
428.18 Notice in each file and include the License file at
428.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
428.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
428.21 particular file as subject to the "Classpath" exception as provided
428.22 -by Sun in the GPL Version 2 section of the License file that
428.23 +by Oracle in the GPL Version 2 section of the License file that
428.24 accompanied this code. If applicable, add the following below the
428.25 License Header, with the fields enclosed by brackets [] replaced by
428.26 your own identifying information:
429.1 --- a/visualweb.designer.html/src/org/netbeans/modules/visualweb/designer/html/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
429.2 +++ b/visualweb.designer.html/src/org/netbeans/modules/visualweb/designer/html/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
429.3 @@ -1,6 +1,9 @@
429.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
429.5 #
429.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
429.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
429.8 +#
429.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
429.10 +# Other names may be trademarks of their respective owners.
429.11 #
429.12 # The contents of this file are subject to the terms of either the GNU
429.13 # General Public License Version 2 only ("GPL") or the Common
429.14 @@ -12,9 +15,9 @@
429.15 # specific language governing permissions and limitations under the
429.16 # License. When distributing the software, include this License Header
429.17 # Notice in each file and include the License file at
429.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
429.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
429.20 # particular file as subject to the "Classpath" exception as provided
429.21 -# by Sun in the GPL Version 2 section of the License file that
429.22 +# by Oracle in the GPL Version 2 section of the License file that
429.23 # accompanied this code. If applicable, add the following below the
429.24 # License Header, with the fields enclosed by brackets [] replaced by
429.25 # your own identifying information:
430.1 --- a/visualweb.designer.jsf/build.xml Fri Jul 16 11:47:36 2010 -0400
430.2 +++ b/visualweb.designer.jsf/build.xml Fri Jul 16 14:21:50 2010 -0400
430.3 @@ -2,7 +2,10 @@
430.4 <!--
430.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
430.6
430.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
430.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
430.9 +
430.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
430.11 +Other names may be trademarks of their respective owners.
430.12
430.13
430.14 The contents of this file are subject to the terms of either the GNU
430.15 @@ -15,9 +18,9 @@
430.16 specific language governing permissions and limitations under the
430.17 License. When distributing the software, include this License Header
430.18 Notice in each file and include the License file at
430.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
430.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
430.21 particular file as subject to the "Classpath" exception as provided
430.22 -by Sun in the GPL Version 2 section of the License file that
430.23 +by Oracle in the GPL Version 2 section of the License file that
430.24 accompanied this code. If applicable, add the following below the
430.25 License Header, with the fields enclosed by brackets [] replaced by
430.26 your own identifying information:
431.1 --- a/visualweb.designer.jsf/manifest.mf Fri Jul 16 11:47:36 2010 -0400
431.2 +++ b/visualweb.designer.jsf/manifest.mf Fri Jul 16 14:21:50 2010 -0400
431.3 @@ -2,5 +2,5 @@
431.4 OpenIDE-Module: org.netbeans.modules.visualweb.designer.jsf
431.5 OpenIDE-Module-Layer: org/netbeans/modules/visualweb/designer/jsf/resources/layer.xml
431.6 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/visualweb/designer/jsf/resources/Bundle.properties
431.7 -OpenIDE-Module-Specification-Version: 2.6
431.8 +OpenIDE-Module-Specification-Version: 2.7
431.9 AutoUpdate-Show-In-Client: false
432.1 --- a/visualweb.designer.jsf/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
432.2 +++ b/visualweb.designer.jsf/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
432.3 @@ -1,6 +1,9 @@
432.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
432.5 #
432.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
432.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
432.8 +#
432.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
432.10 +# Other names may be trademarks of their respective owners.
432.11 #
432.12 # The contents of this file are subject to the terms of either the GNU
432.13 # General Public License Version 2 only ("GPL") or the Common
432.14 @@ -12,9 +15,9 @@
432.15 # specific language governing permissions and limitations under the
432.16 # License. When distributing the software, include this License Header
432.17 # Notice in each file and include the License file at
432.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
432.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
432.20 # particular file as subject to the "Classpath" exception as provided
432.21 -# by Sun in the GPL Version 2 section of the License file that
432.22 +# by Oracle in the GPL Version 2 section of the License file that
432.23 # accompanied this code. If applicable, add the following below the
432.24 # License Header, with the fields enclosed by brackets [] replaced by
432.25 # your own identifying information:
432.26 @@ -38,4 +41,4 @@
432.27 # made subject to such option by the copyright holder.
432.28
432.29 javac.compilerargs=-Xlint:unchecked
432.30 -javac.source=1.5
432.31 +javac.source=1.6
433.1 --- a/visualweb.designer.jsf/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
433.2 +++ b/visualweb.designer.jsf/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
433.3 @@ -2,7 +2,10 @@
433.4 <!--
433.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
433.6
433.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
433.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
433.9 +
433.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
433.11 +Other names may be trademarks of their respective owners.
433.12
433.13
433.14 The contents of this file are subject to the terms of either the GNU
433.15 @@ -15,9 +18,9 @@
433.16 specific language governing permissions and limitations under the
433.17 License. When distributing the software, include this License Header
433.18 Notice in each file and include the License file at
433.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
433.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
433.21 particular file as subject to the "Classpath" exception as provided
433.22 -by Sun in the GPL Version 2 section of the License file that
433.23 +by Oracle in the GPL Version 2 section of the License file that
433.24 accompanied this code. If applicable, add the following below the
433.25 License Header, with the fields enclosed by brackets [] replaced by
433.26 your own identifying information:
433.27 @@ -87,8 +90,8 @@
433.28 <build-prerequisite/>
433.29 <compile-dependency/>
433.30 <run-dependency>
433.31 - <release-version>1</release-version>
433.32 - <specification-version>1.27</specification-version>
433.33 + <release-version>2</release-version>
433.34 + <specification-version>2.1</specification-version>
433.35 </run-dependency>
433.36 </dependency>
433.37 <dependency>
433.38 @@ -405,7 +408,15 @@
433.39 <build-prerequisite/>
433.40 <compile-dependency/>
433.41 <run-dependency>
433.42 - <specification-version>7.22</specification-version>
433.43 + <specification-version>8.0</specification-version>
433.44 + </run-dependency>
433.45 + </dependency>
433.46 + <dependency>
433.47 + <code-name-base>org.openide.util.lookup</code-name-base>
433.48 + <build-prerequisite/>
433.49 + <compile-dependency/>
433.50 + <run-dependency>
433.51 + <specification-version>8.0</specification-version>
433.52 </run-dependency>
433.53 </dependency>
433.54 <dependency>
434.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/BeanModifyListener.java Fri Jul 16 11:47:36 2010 -0400
434.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/BeanModifyListener.java Fri Jul 16 14:21:50 2010 -0400
434.3 @@ -1,7 +1,10 @@
434.4 /*
434.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
434.6 *
434.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
434.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
434.9 + *
434.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
434.11 + * Other names may be trademarks of their respective owners.
434.12 *
434.13 * The contents of this file are subject to the terms of either the GNU
434.14 * General Public License Version 2 only ("GPL") or the Common
434.15 @@ -13,9 +16,9 @@
434.16 * specific language governing permissions and limitations under the
434.17 * License. When distributing the software, include this License Header
434.18 * Notice in each file and include the License file at
434.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
434.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
434.21 * particular file as subject to the "Classpath" exception as provided
434.22 - * by Sun in the GPL Version 2 section of the License file that
434.23 + * by Oracle in the GPL Version 2 section of the License file that
434.24 * accompanied this code. If applicable, add the following below the
434.25 * License Header, with the fields enclosed by brackets [] replaced by
434.26 * your own identifying information:
435.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
435.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
435.3 @@ -1,7 +1,10 @@
435.4 #
435.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
435.6 #
435.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
435.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
435.9 +#
435.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
435.11 +# Other names may be trademarks of their respective owners.
435.12 #
435.13 # The contents of this file are subject to the terms of either the GNU
435.14 # General Public License Version 2 only ("GPL") or the Common
435.15 @@ -13,9 +16,9 @@
435.16 # specific language governing permissions and limitations under the
435.17 # License. When distributing the software, include this License Header
435.18 # Notice in each file and include the License file at
435.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
435.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
435.21 # particular file as subject to the "Classpath" exception as provided
435.22 -# by Sun in the GPL Version 2 section of the License file that
435.23 +# by Oracle in the GPL Version 2 section of the License file that
435.24 # accompanied this code. If applicable, add the following below the
435.25 # License Header, with the fields enclosed by brackets [] replaced by
435.26 # your own identifying information:
436.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/CssUserAgentInfoImpl.java Fri Jul 16 11:47:36 2010 -0400
436.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/CssUserAgentInfoImpl.java Fri Jul 16 14:21:50 2010 -0400
436.3 @@ -1,7 +1,10 @@
436.4 /*
436.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
436.6 *
436.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
436.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
436.9 + *
436.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
436.11 + * Other names may be trademarks of their respective owners.
436.12 *
436.13 * The contents of this file are subject to the terms of either the GNU
436.14 * General Public License Version 2 only ("GPL") or the Common
436.15 @@ -13,9 +16,9 @@
436.16 * specific language governing permissions and limitations under the
436.17 * License. When distributing the software, include this License Header
436.18 * Notice in each file and include the License file at
436.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
436.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
436.21 * particular file as subject to the "Classpath" exception as provided
436.22 - * by Sun in the GPL Version 2 section of the License file that
436.23 + * by Oracle in the GPL Version 2 section of the License file that
436.24 * accompanied this code. If applicable, add the following below the
436.25 * License Header, with the fields enclosed by brackets [] replaced by
436.26 * your own identifying information:
437.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DecorationManager.java Fri Jul 16 11:47:36 2010 -0400
437.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DecorationManager.java Fri Jul 16 14:21:50 2010 -0400
437.3 @@ -1,7 +1,10 @@
437.4 /*
437.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
437.6 *
437.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
437.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
437.9 + *
437.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
437.11 + * Other names may be trademarks of their respective owners.
437.12 *
437.13 * The contents of this file are subject to the terms of either the GNU
437.14 * General Public License Version 2 only ("GPL") or the Common
437.15 @@ -13,9 +16,9 @@
437.16 * specific language governing permissions and limitations under the
437.17 * License. When distributing the software, include this License Header
437.18 * Notice in each file and include the License file at
437.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
437.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
437.21 * particular file as subject to the "Classpath" exception as provided
437.22 - * by Sun in the GPL Version 2 section of the License file that
437.23 + * by Oracle in the GPL Version 2 section of the License file that
437.24 * accompanied this code. If applicable, add the following below the
437.25 * License Header, with the fields enclosed by brackets [] replaced by
437.26 * your own identifying information:
438.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DecorationProviderImpl.java Fri Jul 16 11:47:36 2010 -0400
438.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DecorationProviderImpl.java Fri Jul 16 14:21:50 2010 -0400
438.3 @@ -1,7 +1,10 @@
438.4 /*
438.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
438.6 *
438.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
438.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
438.9 + *
438.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
438.11 + * Other names may be trademarks of their respective owners.
438.12 *
438.13 * The contents of this file are subject to the terms of either the GNU
438.14 * General Public License Version 2 only ("GPL") or the Common
438.15 @@ -13,9 +16,9 @@
438.16 * specific language governing permissions and limitations under the
438.17 * License. When distributing the software, include this License Header
438.18 * Notice in each file and include the License file at
438.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
438.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
438.21 * particular file as subject to the "Classpath" exception as provided
438.22 - * by Sun in the GPL Version 2 section of the License file that
438.23 + * by Oracle in the GPL Version 2 section of the License file that
438.24 * accompanied this code. If applicable, add the following below the
438.25 * License Header, with the fields enclosed by brackets [] replaced by
438.26 * your own identifying information:
439.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DesignerJsfServiceImpl.java Fri Jul 16 11:47:36 2010 -0400
439.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DesignerJsfServiceImpl.java Fri Jul 16 14:21:50 2010 -0400
439.3 @@ -1,7 +1,10 @@
439.4 /*
439.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
439.6 *
439.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
439.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
439.9 + *
439.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
439.11 + * Other names may be trademarks of their respective owners.
439.12 *
439.13 * The contents of this file are subject to the terms of either the GNU
439.14 * General Public License Version 2 only ("GPL") or the Common
439.15 @@ -13,9 +16,9 @@
439.16 * specific language governing permissions and limitations under the
439.17 * License. When distributing the software, include this License Header
439.18 * Notice in each file and include the License file at
439.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
439.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
439.21 * particular file as subject to the "Classpath" exception as provided
439.22 - * by Sun in the GPL Version 2 section of the License file that
439.23 + * by Oracle in the GPL Version 2 section of the License file that
439.24 * accompanied this code. If applicable, add the following below the
439.25 * License Header, with the fields enclosed by brackets [] replaced by
439.26 * your own identifying information:
440.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DesignerServiceHackImpl.java Fri Jul 16 11:47:36 2010 -0400
440.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DesignerServiceHackImpl.java Fri Jul 16 14:21:50 2010 -0400
440.3 @@ -1,7 +1,10 @@
440.4 /*
440.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
440.6 *
440.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
440.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
440.9 + *
440.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
440.11 + * Other names may be trademarks of their respective owners.
440.12 *
440.13 * The contents of this file are subject to the terms of either the GNU
440.14 * General Public License Version 2 only ("GPL") or the Common
440.15 @@ -13,9 +16,9 @@
440.16 * specific language governing permissions and limitations under the
440.17 * License. When distributing the software, include this License Header
440.18 * Notice in each file and include the License file at
440.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
440.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
440.21 * particular file as subject to the "Classpath" exception as provided
440.22 - * by Sun in the GPL Version 2 section of the License file that
440.23 + * by Oracle in the GPL Version 2 section of the License file that
440.24 * accompanied this code. If applicable, add the following below the
440.25 * License Header, with the fields enclosed by brackets [] replaced by
440.26 * your own identifying information:
441.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DndSupport.java Fri Jul 16 11:47:36 2010 -0400
441.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DndSupport.java Fri Jul 16 14:21:50 2010 -0400
441.3 @@ -1,7 +1,10 @@
441.4 /*
441.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
441.6 *
441.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
441.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
441.9 + *
441.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
441.11 + * Other names may be trademarks of their respective owners.
441.12 *
441.13 * The contents of this file are subject to the terms of either the GNU
441.14 * General Public License Version 2 only ("GPL") or the Common
441.15 @@ -13,9 +16,9 @@
441.16 * specific language governing permissions and limitations under the
441.17 * License. When distributing the software, include this License Header
441.18 * Notice in each file and include the License file at
441.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
441.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
441.21 * particular file as subject to the "Classpath" exception as provided
441.22 - * by Sun in the GPL Version 2 section of the License file that
441.23 + * by Oracle in the GPL Version 2 section of the License file that
441.24 * accompanied this code. If applicable, add the following below the
441.25 * License Header, with the fields enclosed by brackets [] replaced by
441.26 * your own identifying information:
442.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DomProviderImpl.java Fri Jul 16 11:47:36 2010 -0400
442.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DomProviderImpl.java Fri Jul 16 14:21:50 2010 -0400
442.3 @@ -1,7 +1,10 @@
442.4 /*
442.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
442.6 *
442.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
442.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
442.9 + *
442.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
442.11 + * Other names may be trademarks of their respective owners.
442.12 *
442.13 * The contents of this file are subject to the terms of either the GNU
442.14 * General Public License Version 2 only ("GPL") or the Common
442.15 @@ -13,9 +16,9 @@
442.16 * specific language governing permissions and limitations under the
442.17 * License. When distributing the software, include this License Header
442.18 * Notice in each file and include the License file at
442.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
442.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
442.21 * particular file as subject to the "Classpath" exception as provided
442.22 - * by Sun in the GPL Version 2 section of the License file that
442.23 + * by Oracle in the GPL Version 2 section of the License file that
442.24 * accompanied this code. If applicable, add the following below the
442.25 * License Header, with the fields enclosed by brackets [] replaced by
442.26 * your own identifying information:
443.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DomProviderServiceImpl.java Fri Jul 16 11:47:36 2010 -0400
443.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DomProviderServiceImpl.java Fri Jul 16 14:21:50 2010 -0400
443.3 @@ -1,7 +1,10 @@
443.4 /*
443.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
443.6 *
443.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
443.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
443.9 + *
443.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
443.11 + * Other names may be trademarks of their respective owners.
443.12 *
443.13 * The contents of this file are subject to the terms of either the GNU
443.14 * General Public License Version 2 only ("GPL") or the Common
443.15 @@ -13,9 +16,9 @@
443.16 * specific language governing permissions and limitations under the
443.17 * License. When distributing the software, include this License Header
443.18 * Notice in each file and include the License file at
443.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
443.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
443.21 * particular file as subject to the "Classpath" exception as provided
443.22 - * by Sun in the GPL Version 2 section of the License file that
443.23 + * by Oracle in the GPL Version 2 section of the License file that
443.24 * accompanied this code. If applicable, add the following below the
443.25 * License Header, with the fields enclosed by brackets [] replaced by
443.26 * your own identifying information:
444.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DomSynchronizer.java Fri Jul 16 11:47:36 2010 -0400
444.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DomSynchronizer.java Fri Jul 16 14:21:50 2010 -0400
444.3 @@ -1,7 +1,10 @@
444.4 /*
444.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
444.6 *
444.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
444.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
444.9 + *
444.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
444.11 + * Other names may be trademarks of their respective owners.
444.12 *
444.13 * The contents of this file are subject to the terms of either the GNU
444.14 * General Public License Version 2 only ("GPL") or the Common
444.15 @@ -13,9 +16,9 @@
444.16 * specific language governing permissions and limitations under the
444.17 * License. When distributing the software, include this License Header
444.18 * Notice in each file and include the License file at
444.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
444.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
444.21 * particular file as subject to the "Classpath" exception as provided
444.22 - * by Sun in the GPL Version 2 section of the License file that
444.23 + * by Oracle in the GPL Version 2 section of the License file that
444.24 * accompanied this code. If applicable, add the following below the
444.25 * License Header, with the fields enclosed by brackets [] replaced by
444.26 * your own identifying information:
445.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ExternalDomProviderCache.java Fri Jul 16 11:47:36 2010 -0400
445.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ExternalDomProviderCache.java Fri Jul 16 14:21:50 2010 -0400
445.3 @@ -1,7 +1,10 @@
445.4 /*
445.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
445.6 *
445.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
445.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
445.9 + *
445.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
445.11 + * Other names may be trademarks of their respective owners.
445.12 *
445.13 * The contents of this file are subject to the terms of either the GNU
445.14 * General Public License Version 2 only ("GPL") or the Common
445.15 @@ -13,9 +16,9 @@
445.16 * specific language governing permissions and limitations under the
445.17 * License. When distributing the software, include this License Header
445.18 * Notice in each file and include the License file at
445.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
445.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
445.21 * particular file as subject to the "Classpath" exception as provided
445.22 - * by Sun in the GPL Version 2 section of the License file that
445.23 + * by Oracle in the GPL Version 2 section of the License file that
445.24 * accompanied this code. If applicable, add the following below the
445.25 * License Header, with the fields enclosed by brackets [] replaced by
445.26 * your own identifying information:
446.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/FacesDndSupport.java Fri Jul 16 11:47:36 2010 -0400
446.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/FacesDndSupport.java Fri Jul 16 14:21:50 2010 -0400
446.3 @@ -1,7 +1,10 @@
446.4 /*
446.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
446.6 *
446.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
446.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
446.9 + *
446.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
446.11 + * Other names may be trademarks of their respective owners.
446.12 *
446.13 * The contents of this file are subject to the terms of either the GNU
446.14 * General Public License Version 2 only ("GPL") or the Common
446.15 @@ -13,9 +16,9 @@
446.16 * specific language governing permissions and limitations under the
446.17 * License. When distributing the software, include this License Header
446.18 * Notice in each file and include the License file at
446.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
446.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
446.21 * particular file as subject to the "Classpath" exception as provided
446.22 - * by Sun in the GPL Version 2 section of the License file that
446.23 + * by Oracle in the GPL Version 2 section of the License file that
446.24 * accompanied this code. If applicable, add the following below the
446.25 * License Header, with the fields enclosed by brackets [] replaced by
446.26 * your own identifying information:
447.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/InlineEditorSupportImpl.java Fri Jul 16 11:47:36 2010 -0400
447.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/InlineEditorSupportImpl.java Fri Jul 16 14:21:50 2010 -0400
447.3 @@ -1,7 +1,10 @@
447.4 /*
447.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
447.6 *
447.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
447.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
447.9 + *
447.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
447.11 + * Other names may be trademarks of their respective owners.
447.12 *
447.13 * The contents of this file are subject to the terms of either the GNU
447.14 * General Public License Version 2 only ("GPL") or the Common
447.15 @@ -13,9 +16,9 @@
447.16 * specific language governing permissions and limitations under the
447.17 * License. When distributing the software, include this License Header
447.18 * Notice in each file and include the License file at
447.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
447.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
447.21 * particular file as subject to the "Classpath" exception as provided
447.22 - * by Sun in the GPL Version 2 section of the License file that
447.23 + * by Oracle in the GPL Version 2 section of the License file that
447.24 * accompanied this code. If applicable, add the following below the
447.25 * License Header, with the fields enclosed by brackets [] replaced by
447.26 * your own identifying information:
448.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerAdvancedOptions.java Fri Jul 16 11:47:36 2010 -0400
448.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerAdvancedOptions.java Fri Jul 16 14:21:50 2010 -0400
448.3 @@ -1,7 +1,10 @@
448.4 /*
448.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
448.6 *
448.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
448.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
448.9 + *
448.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
448.11 + * Other names may be trademarks of their respective owners.
448.12 *
448.13 * The contents of this file are subject to the terms of either the GNU
448.14 * General Public License Version 2 only ("GPL") or the Common
448.15 @@ -13,9 +16,9 @@
448.16 * specific language governing permissions and limitations under the
448.17 * License. When distributing the software, include this License Header
448.18 * Notice in each file and include the License file at
448.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
448.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
448.21 * particular file as subject to the "Classpath" exception as provided
448.22 - * by Sun in the GPL Version 2 section of the License file that
448.23 + * by Oracle in the GPL Version 2 section of the License file that
448.24 * accompanied this code. If applicable, add the following below the
448.25 * License Header, with the fields enclosed by brackets [] replaced by
448.26 * your own identifying information:
449.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerAdvancedOptionsPanel.java Fri Jul 16 11:47:36 2010 -0400
449.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerAdvancedOptionsPanel.java Fri Jul 16 14:21:50 2010 -0400
449.3 @@ -1,7 +1,10 @@
449.4 /*
449.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
449.6 *
449.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
449.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
449.9 + *
449.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
449.11 + * Other names may be trademarks of their respective owners.
449.12 *
449.13 * The contents of this file are subject to the terms of either the GNU
449.14 * General Public License Version 2 only ("GPL") or the Common
449.15 @@ -13,9 +16,9 @@
449.16 * specific language governing permissions and limitations under the
449.17 * License. When distributing the software, include this License Header
449.18 * Notice in each file and include the License file at
449.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
449.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
449.21 * particular file as subject to the "Classpath" exception as provided
449.22 - * by Sun in the GPL Version 2 section of the License file that
449.23 + * by Oracle in the GPL Version 2 section of the License file that
449.24 * accompanied this code. If applicable, add the following below the
449.25 * License Header, with the fields enclosed by brackets [] replaced by
449.26 * your own identifying information:
450.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerPreferences.java Fri Jul 16 11:47:36 2010 -0400
450.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerPreferences.java Fri Jul 16 14:21:50 2010 -0400
450.3 @@ -1,7 +1,10 @@
450.4 /*
450.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
450.6 *
450.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
450.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
450.9 + *
450.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
450.11 + * Other names may be trademarks of their respective owners.
450.12 *
450.13 * The contents of this file are subject to the terms of either the GNU
450.14 * General Public License Version 2 only ("GPL") or the Common
450.15 @@ -13,9 +16,9 @@
450.16 * specific language governing permissions and limitations under the
450.17 * License. When distributing the software, include this License Header
450.18 * Notice in each file and include the License file at
450.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
450.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
450.21 * particular file as subject to the "Classpath" exception as provided
450.22 - * by Sun in the GPL Version 2 section of the License file that
450.23 + * by Oracle in the GPL Version 2 section of the License file that
450.24 * accompanied this code. If applicable, add the following below the
450.25 * License Header, with the fields enclosed by brackets [] replaced by
450.26 * your own identifying information:
451.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerPreferencesBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
451.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfDesignerPreferencesBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
451.3 @@ -1,7 +1,10 @@
451.4 /*
451.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
451.6 *
451.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
451.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
451.9 + *
451.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
451.11 + * Other names may be trademarks of their respective owners.
451.12 *
451.13 * The contents of this file are subject to the terms of either the GNU
451.14 * General Public License Version 2 only ("GPL") or the Common
451.15 @@ -13,9 +16,9 @@
451.16 * specific language governing permissions and limitations under the
451.17 * License. When distributing the software, include this License Header
451.18 * Notice in each file and include the License file at
451.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
451.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
451.21 * particular file as subject to the "Classpath" exception as provided
451.22 - * by Sun in the GPL Version 2 section of the License file that
451.23 + * by Oracle in the GPL Version 2 section of the License file that
451.24 * accompanied this code. If applicable, add the following below the
451.25 * License Header, with the fields enclosed by brackets [] replaced by
451.26 * your own identifying information:
452.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java Fri Jul 16 11:47:36 2010 -0400
452.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java Fri Jul 16 14:21:50 2010 -0400
452.3 @@ -1,7 +1,10 @@
452.4 /*
452.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
452.6 *
452.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
452.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
452.9 + *
452.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
452.11 + * Other names may be trademarks of their respective owners.
452.12 *
452.13 * The contents of this file are subject to the terms of either the GNU
452.14 * General Public License Version 2 only ("GPL") or the Common
452.15 @@ -13,9 +16,9 @@
452.16 * specific language governing permissions and limitations under the
452.17 * License. When distributing the software, include this License Header
452.18 * Notice in each file and include the License file at
452.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
452.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
452.21 * particular file as subject to the "Classpath" exception as provided
452.22 - * by Sun in the GPL Version 2 section of the License file that
452.23 + * by Oracle in the GPL Version 2 section of the License file that
452.24 * accompanied this code. If applicable, add the following below the
452.25 * License Header, with the fields enclosed by brackets [] replaced by
452.26 * your own identifying information:
453.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfSupportProviderImpl.java Fri Jul 16 11:47:36 2010 -0400
453.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfSupportProviderImpl.java Fri Jul 16 14:21:50 2010 -0400
453.3 @@ -1,7 +1,10 @@
453.4 /*
453.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
453.6 *
453.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
453.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
453.9 + *
453.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
453.11 + * Other names may be trademarks of their respective owners.
453.12 *
453.13 * The contents of this file are subject to the terms of either the GNU
453.14 * General Public License Version 2 only ("GPL") or the Common
453.15 @@ -13,9 +16,9 @@
453.16 * specific language governing permissions and limitations under the
453.17 * License. When distributing the software, include this License Header
453.18 * Notice in each file and include the License file at
453.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
453.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
453.21 * particular file as subject to the "Classpath" exception as provided
453.22 - * by Sun in the GPL Version 2 section of the License file that
453.23 + * by Oracle in the GPL Version 2 section of the License file that
453.24 * accompanied this code. If applicable, add the following below the
453.25 * License Header, with the fields enclosed by brackets [] replaced by
453.26 * your own identifying information:
454.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfSupportUtilities.java Fri Jul 16 11:47:36 2010 -0400
454.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfSupportUtilities.java Fri Jul 16 14:21:50 2010 -0400
454.3 @@ -1,7 +1,10 @@
454.4 /*
454.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
454.6 *
454.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
454.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
454.9 + *
454.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
454.11 + * Other names may be trademarks of their respective owners.
454.12 *
454.13 * The contents of this file are subject to the terms of either the GNU
454.14 * General Public License Version 2 only ("GPL") or the Common
454.15 @@ -13,9 +16,9 @@
454.16 * specific language governing permissions and limitations under the
454.17 * License. When distributing the software, include this License Header
454.18 * Notice in each file and include the License file at
454.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
454.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
454.21 * particular file as subject to the "Classpath" exception as provided
454.22 - * by Sun in the GPL Version 2 section of the License file that
454.23 + * by Oracle in the GPL Version 2 section of the License file that
454.24 * accompanied this code. If applicable, add the following below the
454.25 * License Header, with the fields enclosed by brackets [] replaced by
454.26 * your own identifying information:
455.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/RefreshServiceImpl.java Fri Jul 16 11:47:36 2010 -0400
455.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/RefreshServiceImpl.java Fri Jul 16 14:21:50 2010 -0400
455.3 @@ -1,7 +1,10 @@
455.4 /*
455.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
455.6 *
455.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
455.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
455.9 + *
455.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
455.11 + * Other names may be trademarks of their respective owners.
455.12 *
455.13 * The contents of this file are subject to the terms of either the GNU
455.14 * General Public License Version 2 only ("GPL") or the Common
455.15 @@ -13,9 +16,9 @@
455.16 * specific language governing permissions and limitations under the
455.17 * License. When distributing the software, include this License Header
455.18 * Notice in each file and include the License file at
455.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
455.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
455.21 * particular file as subject to the "Classpath" exception as provided
455.22 - * by Sun in the GPL Version 2 section of the License file that
455.23 + * by Oracle in the GPL Version 2 section of the License file that
455.24 * accompanied this code. If applicable, add the following below the
455.25 * License Header, with the fields enclosed by brackets [] replaced by
455.26 * your own identifying information:
456.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ResolutionEditor.java Fri Jul 16 11:47:36 2010 -0400
456.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ResolutionEditor.java Fri Jul 16 14:21:50 2010 -0400
456.3 @@ -1,7 +1,10 @@
456.4 /*
456.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
456.6 *
456.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
456.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
456.9 + *
456.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
456.11 + * Other names may be trademarks of their respective owners.
456.12 *
456.13 * The contents of this file are subject to the terms of either the GNU
456.14 * General Public License Version 2 only ("GPL") or the Common
456.15 @@ -13,9 +16,9 @@
456.16 * specific language governing permissions and limitations under the
456.17 * License. When distributing the software, include this License Header
456.18 * Notice in each file and include the License file at
456.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
456.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
456.21 * particular file as subject to the "Classpath" exception as provided
456.22 - * by Sun in the GPL Version 2 section of the License file that
456.23 + * by Oracle in the GPL Version 2 section of the License file that
456.24 * accompanied this code. If applicable, add the following below the
456.25 * License Header, with the fields enclosed by brackets [] replaced by
456.26 * your own identifying information:
457.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/AbstractComponentAction.java Fri Jul 16 11:47:36 2010 -0400
457.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/AbstractComponentAction.java Fri Jul 16 14:21:50 2010 -0400
457.3 @@ -1,7 +1,10 @@
457.4 /*
457.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
457.6 *
457.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
457.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
457.9 + *
457.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
457.11 + * Other names may be trademarks of their respective owners.
457.12 *
457.13 * The contents of this file are subject to the terms of either the GNU
457.14 * General Public License Version 2 only ("GPL") or the Common
457.15 @@ -13,9 +16,9 @@
457.16 * specific language governing permissions and limitations under the
457.17 * License. When distributing the software, include this License Header
457.18 * Notice in each file and include the License file at
457.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
457.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
457.21 * particular file as subject to the "Classpath" exception as provided
457.22 - * by Sun in the GPL Version 2 section of the License file that
457.23 + * by Oracle in the GPL Version 2 section of the License file that
457.24 * accompanied this code. If applicable, add the following below the
457.25 * License Header, with the fields enclosed by brackets [] replaced by
457.26 * your own identifying information:
458.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/AbstractJsfFormAction.java Fri Jul 16 11:47:36 2010 -0400
458.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/AbstractJsfFormAction.java Fri Jul 16 14:21:50 2010 -0400
458.3 @@ -1,7 +1,10 @@
458.4 /*
458.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
458.6 *
458.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
458.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
458.9 + *
458.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
458.11 + * Other names may be trademarks of their respective owners.
458.12 *
458.13 * The contents of this file are subject to the terms of either the GNU
458.14 * General Public License Version 2 only ("GPL") or the Common
458.15 @@ -13,9 +16,9 @@
458.16 * specific language governing permissions and limitations under the
458.17 * License. When distributing the software, include this License Header
458.18 * Notice in each file and include the License file at
458.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
458.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
458.21 * particular file as subject to the "Classpath" exception as provided
458.22 - * by Sun in the GPL Version 2 section of the License file that
458.23 + * by Oracle in the GPL Version 2 section of the License file that
458.24 * accompanied this code. If applicable, add the following below the
458.25 * License Header, with the fields enclosed by brackets [] replaced by
458.26 * your own identifying information:
459.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/AjaxTransactionsSupportAction.java Fri Jul 16 11:47:36 2010 -0400
459.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/AjaxTransactionsSupportAction.java Fri Jul 16 14:21:50 2010 -0400
459.3 @@ -1,7 +1,10 @@
459.4 /*
459.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
459.6 *
459.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
459.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
459.9 + *
459.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
459.11 + * Other names may be trademarks of their respective owners.
459.12 *
459.13 * The contents of this file are subject to the terms of either the GNU
459.14 * General Public License Version 2 only ("GPL") or the Common
459.15 @@ -13,9 +16,9 @@
459.16 * specific language governing permissions and limitations under the
459.17 * License. When distributing the software, include this License Header
459.18 * Notice in each file and include the License file at
459.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
459.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
459.21 * particular file as subject to the "Classpath" exception as provided
459.22 - * by Sun in the GPL Version 2 section of the License file that
459.23 + * by Oracle in the GPL Version 2 section of the License file that
459.24 * accompanied this code. If applicable, add the following below the
459.25 * License Header, with the fields enclosed by brackets [] replaced by
459.26 * your own identifying information:
460.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/AlignAction.java Fri Jul 16 11:47:36 2010 -0400
460.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/AlignAction.java Fri Jul 16 14:21:50 2010 -0400
460.3 @@ -1,7 +1,10 @@
460.4 /*
460.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
460.6 *
460.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
460.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
460.9 + *
460.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
460.11 + * Other names may be trademarks of their respective owners.
460.12 *
460.13 * The contents of this file are subject to the terms of either the GNU
460.14 * General Public License Version 2 only ("GPL") or the Common
460.15 @@ -13,9 +16,9 @@
460.16 * specific language governing permissions and limitations under the
460.17 * License. When distributing the software, include this License Header
460.18 * Notice in each file and include the License file at
460.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
460.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
460.21 * particular file as subject to the "Classpath" exception as provided
460.22 - * by Sun in the GPL Version 2 section of the License file that
460.23 + * by Oracle in the GPL Version 2 section of the License file that
460.24 * accompanied this code. If applicable, add the following below the
460.25 * License Header, with the fields enclosed by brackets [] replaced by
460.26 * your own identifying information:
461.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/BringToFrontAction.java Fri Jul 16 11:47:36 2010 -0400
461.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/BringToFrontAction.java Fri Jul 16 14:21:50 2010 -0400
461.3 @@ -1,7 +1,10 @@
461.4 /*
461.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
461.6 *
461.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
461.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
461.9 + *
461.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
461.11 + * Other names may be trademarks of their respective owners.
461.12 *
461.13 * The contents of this file are subject to the terms of either the GNU
461.14 * General Public License Version 2 only ("GPL") or the Common
461.15 @@ -13,9 +16,9 @@
461.16 * specific language governing permissions and limitations under the
461.17 * License. When distributing the software, include this License Header
461.18 * Notice in each file and include the License file at
461.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
461.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
461.21 * particular file as subject to the "Classpath" exception as provided
461.22 - * by Sun in the GPL Version 2 section of the License file that
461.23 + * by Oracle in the GPL Version 2 section of the License file that
461.24 * accompanied this code. If applicable, add the following below the
461.25 * License Header, with the fields enclosed by brackets [] replaced by
461.26 * your own identifying information:
462.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
462.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
462.3 @@ -1,7 +1,10 @@
462.4 #
462.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
462.6 #
462.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
462.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
462.9 +#
462.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
462.11 +# Other names may be trademarks of their respective owners.
462.12 #
462.13 # The contents of this file are subject to the terms of either the GNU
462.14 # General Public License Version 2 only ("GPL") or the Common
462.15 @@ -13,9 +16,9 @@
462.16 # specific language governing permissions and limitations under the
462.17 # License. When distributing the software, include this License Header
462.18 # Notice in each file and include the License file at
462.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
462.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
462.21 # particular file as subject to the "Classpath" exception as provided
462.22 -# by Sun in the GPL Version 2 section of the License file that
462.23 +# by Oracle in the GPL Version 2 section of the License file that
462.24 # accompanied this code. If applicable, add the following below the
462.25 # License Header, with the fields enclosed by brackets [] replaced by
462.26 # your own identifying information:
463.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/DecorationsAction.java Fri Jul 16 11:47:36 2010 -0400
463.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/DecorationsAction.java Fri Jul 16 14:21:50 2010 -0400
463.3 @@ -1,7 +1,10 @@
463.4 /*
463.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
463.6 *
463.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
463.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
463.9 + *
463.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
463.11 + * Other names may be trademarks of their respective owners.
463.12 *
463.13 * The contents of this file are subject to the terms of either the GNU
463.14 * General Public License Version 2 only ("GPL") or the Common
463.15 @@ -13,9 +16,9 @@
463.16 * specific language governing permissions and limitations under the
463.17 * License. When distributing the software, include this License Header
463.18 * Notice in each file and include the License file at
463.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
463.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
463.21 * particular file as subject to the "Classpath" exception as provided
463.22 - * by Sun in the GPL Version 2 section of the License file that
463.23 + * by Oracle in the GPL Version 2 section of the License file that
463.24 * accompanied this code. If applicable, add the following below the
463.25 * License Header, with the fields enclosed by brackets [] replaced by
463.26 * your own identifying information:
464.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/InlineEditAction.java Fri Jul 16 11:47:36 2010 -0400
464.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/InlineEditAction.java Fri Jul 16 14:21:50 2010 -0400
464.3 @@ -1,7 +1,10 @@
464.4 /*
464.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
464.6 *
464.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
464.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
464.9 + *
464.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
464.11 + * Other names may be trademarks of their respective owners.
464.12 *
464.13 * The contents of this file are subject to the terms of either the GNU
464.14 * General Public License Version 2 only ("GPL") or the Common
464.15 @@ -13,9 +16,9 @@
464.16 * specific language governing permissions and limitations under the
464.17 * License. When distributing the software, include this License Header
464.18 * Notice in each file and include the License file at
464.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
464.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
464.21 * particular file as subject to the "Classpath" exception as provided
464.22 - * by Sun in the GPL Version 2 section of the License file that
464.23 + * by Oracle in the GPL Version 2 section of the License file that
464.24 * accompanied this code. If applicable, add the following below the
464.25 * License Header, with the fields enclosed by brackets [] replaced by
464.26 * your own identifying information:
465.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/RefreshAction.java Fri Jul 16 11:47:36 2010 -0400
465.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/RefreshAction.java Fri Jul 16 14:21:50 2010 -0400
465.3 @@ -1,7 +1,10 @@
465.4 /*
465.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
465.6 *
465.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
465.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
465.9 + *
465.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
465.11 + * Other names may be trademarks of their respective owners.
465.12 *
465.13 * The contents of this file are subject to the terms of either the GNU
465.14 * General Public License Version 2 only ("GPL") or the Common
465.15 @@ -13,9 +16,9 @@
465.16 * specific language governing permissions and limitations under the
465.17 * License. When distributing the software, include this License Header
465.18 * Notice in each file and include the License file at
465.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
465.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
465.21 * particular file as subject to the "Classpath" exception as provided
465.22 - * by Sun in the GPL Version 2 section of the License file that
465.23 + * by Oracle in the GPL Version 2 section of the License file that
465.24 * accompanied this code. If applicable, add the following below the
465.25 * License Header, with the fields enclosed by brackets [] replaced by
465.26 * your own identifying information:
466.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/SelectParentAction.java Fri Jul 16 11:47:36 2010 -0400
466.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/SelectParentAction.java Fri Jul 16 14:21:50 2010 -0400
466.3 @@ -1,7 +1,10 @@
466.4 /*
466.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
466.6 *
466.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
466.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
466.9 + *
466.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
466.11 + * Other names may be trademarks of their respective owners.
466.12 *
466.13 * The contents of this file are subject to the terms of either the GNU
466.14 * General Public License Version 2 only ("GPL") or the Common
466.15 @@ -13,9 +16,9 @@
466.16 * specific language governing permissions and limitations under the
466.17 * License. When distributing the software, include this License Header
466.18 * Notice in each file and include the License file at
466.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
466.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
466.21 * particular file as subject to the "Classpath" exception as provided
466.22 - * by Sun in the GPL Version 2 section of the License file that
466.23 + * by Oracle in the GPL Version 2 section of the License file that
466.24 * accompanied this code. If applicable, add the following below the
466.25 * License Header, with the fields enclosed by brackets [] replaced by
466.26 * your own identifying information:
467.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/SendToBackAction.java Fri Jul 16 11:47:36 2010 -0400
467.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/SendToBackAction.java Fri Jul 16 14:21:50 2010 -0400
467.3 @@ -1,7 +1,10 @@
467.4 /*
467.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
467.6 *
467.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
467.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
467.9 + *
467.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
467.11 + * Other names may be trademarks of their respective owners.
467.12 *
467.13 * The contents of this file are subject to the terms of either the GNU
467.14 * General Public License Version 2 only ("GPL") or the Common
467.15 @@ -13,9 +16,9 @@
467.16 * specific language governing permissions and limitations under the
467.17 * License. When distributing the software, include this License Header
467.18 * Notice in each file and include the License file at
467.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
467.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
467.21 * particular file as subject to the "Classpath" exception as provided
467.22 - * by Sun in the GPL Version 2 section of the License file that
467.23 + * by Oracle in the GPL Version 2 section of the License file that
467.24 * accompanied this code. If applicable, add the following below the
467.25 * License Header, with the fields enclosed by brackets [] replaced by
467.26 * your own identifying information:
468.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/TargetResolutionAction.java Fri Jul 16 11:47:36 2010 -0400
468.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/TargetResolutionAction.java Fri Jul 16 14:21:50 2010 -0400
468.3 @@ -1,7 +1,10 @@
468.4 /*
468.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
468.6 *
468.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
468.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
468.9 + *
468.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
468.11 + * Other names may be trademarks of their respective owners.
468.12 *
468.13 * The contents of this file are subject to the terms of either the GNU
468.14 * General Public License Version 2 only ("GPL") or the Common
468.15 @@ -13,9 +16,9 @@
468.16 * specific language governing permissions and limitations under the
468.17 * License. When distributing the software, include this License Header
468.18 * Notice in each file and include the License file at
468.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
468.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
468.21 * particular file as subject to the "Classpath" exception as provided
468.22 - * by Sun in the GPL Version 2 section of the License file that
468.23 + * by Oracle in the GPL Version 2 section of the License file that
468.24 * accompanied this code. If applicable, add the following below the
468.25 * License Header, with the fields enclosed by brackets [] replaced by
468.26 * your own identifying information:
469.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/VirtualFormsSupportAction.java Fri Jul 16 11:47:36 2010 -0400
469.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/action/VirtualFormsSupportAction.java Fri Jul 16 14:21:50 2010 -0400
469.3 @@ -1,7 +1,10 @@
469.4 /*
469.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
469.6 *
469.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
469.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
469.9 + *
469.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
469.11 + * Other names may be trademarks of their respective owners.
469.12 *
469.13 * The contents of this file are subject to the terms of either the GNU
469.14 * General Public License Version 2 only ("GPL") or the Common
469.15 @@ -13,9 +16,9 @@
469.16 * specific language governing permissions and limitations under the
469.17 * License. When distributing the software, include this License Header
469.18 * Notice in each file and include the License file at
469.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
469.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
469.21 * particular file as subject to the "Classpath" exception as provided
469.22 - * by Sun in the GPL Version 2 section of the License file that
469.23 + * by Oracle in the GPL Version 2 section of the License file that
469.24 * accompanied this code. If applicable, add the following below the
469.25 * License Header, with the fields enclosed by brackets [] replaced by
469.26 * your own identifying information:
470.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
470.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
470.3 @@ -1,6 +1,9 @@
470.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
470.5 #
470.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
470.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
470.8 +#
470.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
470.10 +# Other names may be trademarks of their respective owners.
470.11 #
470.12 # The contents of this file are subject to the terms of either the GNU
470.13 # General Public License Version 2 only ("GPL") or the Common
470.14 @@ -12,9 +15,9 @@
470.15 # specific language governing permissions and limitations under the
470.16 # License. When distributing the software, include this License Header
470.17 # Notice in each file and include the License file at
470.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
470.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
470.20 # particular file as subject to the "Classpath" exception as provided
470.21 -# by Sun in the GPL Version 2 section of the License file that
470.22 +# by Oracle in the GPL Version 2 section of the License file that
470.23 # accompanied this code. If applicable, add the following below the
470.24 # License Header, with the fields enclosed by brackets [] replaced by
470.25 # your own identifying information:
471.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/CreatorPaletteInsertAction.java Fri Jul 16 11:47:36 2010 -0400
471.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/CreatorPaletteInsertAction.java Fri Jul 16 14:21:50 2010 -0400
471.3 @@ -1,7 +1,10 @@
471.4 /*
471.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
471.6 *
471.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
471.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
471.9 + *
471.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
471.11 + * Other names may be trademarks of their respective owners.
471.12 *
471.13 * The contents of this file are subject to the terms of either the GNU
471.14 * General Public License Version 2 only ("GPL") or the Common
471.15 @@ -13,9 +16,9 @@
471.16 * specific language governing permissions and limitations under the
471.17 * License. When distributing the software, include this License Header
471.18 * Notice in each file and include the License file at
471.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
471.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
471.21 * particular file as subject to the "Classpath" exception as provided
471.22 - * by Sun in the GPL Version 2 section of the License file that
471.23 + * by Oracle in the GPL Version 2 section of the License file that
471.24 * accompanied this code. If applicable, add the following below the
471.25 * License Header, with the fields enclosed by brackets [] replaced by
471.26 * your own identifying information:
472.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/JsfPaletteActions.java Fri Jul 16 11:47:36 2010 -0400
472.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/JsfPaletteActions.java Fri Jul 16 14:21:50 2010 -0400
472.3 @@ -1,7 +1,10 @@
472.4 /*
472.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
472.6 *
472.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
472.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
472.9 + *
472.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
472.11 + * Other names may be trademarks of their respective owners.
472.12 *
472.13 * The contents of this file are subject to the terms of either the GNU
472.14 * General Public License Version 2 only ("GPL") or the Common
472.15 @@ -13,9 +16,9 @@
472.16 * specific language governing permissions and limitations under the
472.17 * License. When distributing the software, include this License Header
472.18 * Notice in each file and include the License file at
472.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
472.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
472.21 * particular file as subject to the "Classpath" exception as provided
472.22 - * by Sun in the GPL Version 2 section of the License file that
472.23 + * by Oracle in the GPL Version 2 section of the License file that
472.24 * accompanied this code. If applicable, add the following below the
472.25 * License Header, with the fields enclosed by brackets [] replaced by
472.26 * your own identifying information:
473.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/MergedPaletteActions.java Fri Jul 16 11:47:36 2010 -0400
473.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/MergedPaletteActions.java Fri Jul 16 14:21:50 2010 -0400
473.3 @@ -1,7 +1,10 @@
473.4 /*
473.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
473.6 *
473.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
473.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
473.9 + *
473.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
473.11 + * Other names may be trademarks of their respective owners.
473.12 *
473.13 * The contents of this file are subject to the terms of either the GNU
473.14 * General Public License Version 2 only ("GPL") or the Common
473.15 @@ -13,9 +16,9 @@
473.16 * specific language governing permissions and limitations under the
473.17 * License. When distributing the software, include this License Header
473.18 * Notice in each file and include the License file at
473.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
473.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
473.21 * particular file as subject to the "Classpath" exception as provided
473.22 - * by Sun in the GPL Version 2 section of the License file that
473.23 + * by Oracle in the GPL Version 2 section of the License file that
473.24 * accompanied this code. If applicable, add the following below the
473.25 * License Header, with the fields enclosed by brackets [] replaced by
473.26 * your own identifying information:
474.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/PaletteControllerFactory.java Fri Jul 16 11:47:36 2010 -0400
474.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/palette/PaletteControllerFactory.java Fri Jul 16 14:21:50 2010 -0400
474.3 @@ -1,7 +1,10 @@
474.4 /*
474.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
474.6 *
474.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
474.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
474.9 + *
474.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
474.11 + * Other names may be trademarks of their respective owners.
474.12 *
474.13 * The contents of this file are subject to the terms of either the GNU
474.14 * General Public License Version 2 only ("GPL") or the Common
474.15 @@ -13,9 +16,9 @@
474.16 * specific language governing permissions and limitations under the
474.17 * License. When distributing the software, include this License Header
474.18 * Notice in each file and include the License file at
474.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
474.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
474.21 * particular file as subject to the "Classpath" exception as provided
474.22 - * by Sun in the GPL Version 2 section of the License file that
474.23 + * by Oracle in the GPL Version 2 section of the License file that
474.24 * accompanied this code. If applicable, add the following below the
474.25 * License Header, with the fields enclosed by brackets [] replaced by
474.26 * your own identifying information:
475.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
475.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
475.3 @@ -1,6 +1,9 @@
475.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
475.5 #
475.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
475.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
475.8 +#
475.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
475.10 +# Other names may be trademarks of their respective owners.
475.11 #
475.12 # The contents of this file are subject to the terms of either the GNU
475.13 # General Public License Version 2 only ("GPL") or the Common
475.14 @@ -12,9 +15,9 @@
475.15 # specific language governing permissions and limitations under the
475.16 # License. When distributing the software, include this License Header
475.17 # Notice in each file and include the License file at
475.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
475.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
475.20 # particular file as subject to the "Classpath" exception as provided
475.21 -# by Sun in the GPL Version 2 section of the License file that
475.22 +# by Oracle in the GPL Version 2 section of the License file that
475.23 # accompanied this code. If applicable, add the following below the
475.24 # License Header, with the fields enclosed by brackets [] replaced by
475.25 # your own identifying information:
476.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
476.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
476.3 @@ -2,7 +2,10 @@
476.4 <!--
476.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
476.6
476.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
476.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
476.9 +
476.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
476.11 +Other names may be trademarks of their respective owners.
476.12
476.13
476.14 The contents of this file are subject to the terms of either the GNU
476.15 @@ -15,9 +18,9 @@
476.16 specific language governing permissions and limitations under the
476.17 License. When distributing the software, include this License Header
476.18 Notice in each file and include the License file at
476.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
476.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
476.21 particular file as subject to the "Classpath" exception as provided
476.22 -by Sun in the GPL Version 2 section of the License file that
476.23 +by Oracle in the GPL Version 2 section of the License file that
476.24 accompanied this code. If applicable, add the following below the
476.25 License Header, with the fields enclosed by brackets [] replaced by
476.26 your own identifying information:
477.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
477.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
477.3 @@ -1,6 +1,9 @@
477.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
477.5 #
477.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
477.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
477.8 +#
477.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
477.10 +# Other names may be trademarks of their respective owners.
477.11 #
477.12 # The contents of this file are subject to the terms of either the GNU
477.13 # General Public License Version 2 only ("GPL") or the Common
477.14 @@ -12,9 +15,9 @@
477.15 # specific language governing permissions and limitations under the
477.16 # License. When distributing the software, include this License Header
477.17 # Notice in each file and include the License file at
477.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
477.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
477.20 # particular file as subject to the "Classpath" exception as provided
477.21 -# by Sun in the GPL Version 2 section of the License file that
477.22 +# by Oracle in the GPL Version 2 section of the License file that
477.23 # accompanied this code. If applicable, add the following below the
477.24 # License Header, with the fields enclosed by brackets [] replaced by
477.25 # your own identifying information:
478.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/DomDocumentImpl.java Fri Jul 16 11:47:36 2010 -0400
478.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/DomDocumentImpl.java Fri Jul 16 14:21:50 2010 -0400
478.3 @@ -1,7 +1,10 @@
478.4 /*
478.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
478.6 *
478.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
478.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
478.9 + *
478.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
478.11 + * Other names may be trademarks of their respective owners.
478.12 *
478.13 * The contents of this file are subject to the terms of either the GNU
478.14 * General Public License Version 2 only ("GPL") or the Common
478.15 @@ -13,9 +16,9 @@
478.16 * specific language governing permissions and limitations under the
478.17 * License. When distributing the software, include this License Header
478.18 * Notice in each file and include the License file at
478.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
478.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
478.21 * particular file as subject to the "Classpath" exception as provided
478.22 - * by Sun in the GPL Version 2 section of the License file that
478.23 + * by Oracle in the GPL Version 2 section of the License file that
478.24 * accompanied this code. If applicable, add the following below the
478.25 * License Header, with the fields enclosed by brackets [] replaced by
478.26 * your own identifying information:
479.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/DomPositionImpl.java Fri Jul 16 11:47:36 2010 -0400
479.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/DomPositionImpl.java Fri Jul 16 14:21:50 2010 -0400
479.3 @@ -1,7 +1,10 @@
479.4 /*
479.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
479.6 *
479.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
479.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
479.9 + *
479.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
479.11 + * Other names may be trademarks of their respective owners.
479.12 *
479.13 * The contents of this file are subject to the terms of either the GNU
479.14 * General Public License Version 2 only ("GPL") or the Common
479.15 @@ -13,9 +16,9 @@
479.16 * specific language governing permissions and limitations under the
479.17 * License. When distributing the software, include this License Header
479.18 * Notice in each file and include the License file at
479.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
479.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
479.21 * particular file as subject to the "Classpath" exception as provided
479.22 - * by Sun in the GPL Version 2 section of the License file that
479.23 + * by Oracle in the GPL Version 2 section of the License file that
479.24 * accompanied this code. If applicable, add the following below the
479.25 * License Header, with the fields enclosed by brackets [] replaced by
479.26 * your own identifying information:
480.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/DomRangeImpl.java Fri Jul 16 11:47:36 2010 -0400
480.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/text/DomRangeImpl.java Fri Jul 16 14:21:50 2010 -0400
480.3 @@ -1,7 +1,10 @@
480.4 /*
480.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
480.6 *
480.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
480.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
480.9 + *
480.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
480.11 + * Other names may be trademarks of their respective owners.
480.12 *
480.13 * The contents of this file are subject to the terms of either the GNU
480.14 * General Public License Version 2 only ("GPL") or the Common
480.15 @@ -13,9 +16,9 @@
480.16 * specific language governing permissions and limitations under the
480.17 * License. When distributing the software, include this License Header
480.18 * Notice in each file and include the License file at
480.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
480.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
480.21 * particular file as subject to the "Classpath" exception as provided
480.22 - * by Sun in the GPL Version 2 section of the License file that
480.23 + * by Oracle in the GPL Version 2 section of the License file that
480.24 * accompanied this code. If applicable, add the following below the
480.25 * License Header, with the fields enclosed by brackets [] replaced by
480.26 * your own identifying information:
481.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/AbstractJsfTopComponent.java Fri Jul 16 11:47:36 2010 -0400
481.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/AbstractJsfTopComponent.java Fri Jul 16 14:21:50 2010 -0400
481.3 @@ -1,7 +1,10 @@
481.4 /*
481.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
481.6 *
481.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
481.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
481.9 + *
481.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
481.11 + * Other names may be trademarks of their respective owners.
481.12 *
481.13 * The contents of this file are subject to the terms of either the GNU
481.14 * General Public License Version 2 only ("GPL") or the Common
481.15 @@ -13,9 +16,9 @@
481.16 * specific language governing permissions and limitations under the
481.17 * License. When distributing the software, include this License Header
481.18 * Notice in each file and include the License file at
481.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
481.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
481.21 * particular file as subject to the "Classpath" exception as provided
481.22 - * by Sun in the GPL Version 2 section of the License file that
481.23 + * by Oracle in the GPL Version 2 section of the License file that
481.24 * accompanied this code. If applicable, add the following below the
481.25 * License Header, with the fields enclosed by brackets [] replaced by
481.26 * your own identifying information:
482.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
482.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
482.3 @@ -1,7 +1,10 @@
482.4 #
482.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
482.6 #
482.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
482.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
482.9 +#
482.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
482.11 +# Other names may be trademarks of their respective owners.
482.12 #
482.13 # The contents of this file are subject to the terms of either the GNU
482.14 # General Public License Version 2 only ("GPL") or the Common
482.15 @@ -13,9 +16,9 @@
482.16 # specific language governing permissions and limitations under the
482.17 # License. When distributing the software, include this License Header
482.18 # Notice in each file and include the License file at
482.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
482.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
482.21 # particular file as subject to the "Classpath" exception as provided
482.22 -# by Sun in the GPL Version 2 section of the License file that
482.23 +# by Oracle in the GPL Version 2 section of the License file that
482.24 # accompanied this code. If applicable, add the following below the
482.25 # License Header, with the fields enclosed by brackets [] replaced by
482.26 # your own identifying information:
483.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/ErrorPanelImpl.java Fri Jul 16 11:47:36 2010 -0400
483.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/ErrorPanelImpl.java Fri Jul 16 14:21:50 2010 -0400
483.3 @@ -1,7 +1,10 @@
483.4 /*
483.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
483.6 *
483.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
483.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
483.9 + *
483.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
483.11 + * Other names may be trademarks of their respective owners.
483.12 *
483.13 * The contents of this file are subject to the terms of either the GNU
483.14 * General Public License Version 2 only ("GPL") or the Common
483.15 @@ -13,9 +16,9 @@
483.16 * specific language governing permissions and limitations under the
483.17 * License. When distributing the software, include this License Header
483.18 * Notice in each file and include the License file at
483.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
483.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
483.21 * particular file as subject to the "Classpath" exception as provided
483.22 - * by Sun in the GPL Version 2 section of the License file that
483.23 + * by Oracle in the GPL Version 2 section of the License file that
483.24 * accompanied this code. If applicable, add the following below the
483.25 * License Header, with the fields enclosed by brackets [] replaced by
483.26 * your own identifying information:
484.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/JsfDesignerListener.java Fri Jul 16 11:47:36 2010 -0400
484.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/JsfDesignerListener.java Fri Jul 16 14:21:50 2010 -0400
484.3 @@ -1,7 +1,10 @@
484.4 /*
484.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
484.6 *
484.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
484.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
484.9 + *
484.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
484.11 + * Other names may be trademarks of their respective owners.
484.12 *
484.13 * The contents of this file are subject to the terms of either the GNU
484.14 * General Public License Version 2 only ("GPL") or the Common
484.15 @@ -13,9 +16,9 @@
484.16 * specific language governing permissions and limitations under the
484.17 * License. When distributing the software, include this License Header
484.18 * Notice in each file and include the License file at
484.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
484.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
484.21 * particular file as subject to the "Classpath" exception as provided
484.22 - * by Sun in the GPL Version 2 section of the License file that
484.23 + * by Oracle in the GPL Version 2 section of the License file that
484.24 * accompanied this code. If applicable, add the following below the
484.25 * License Header, with the fields enclosed by brackets [] replaced by
484.26 * your own identifying information:
485.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/JsfMultiViewElement.java Fri Jul 16 11:47:36 2010 -0400
485.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/JsfMultiViewElement.java Fri Jul 16 14:21:50 2010 -0400
485.3 @@ -1,7 +1,10 @@
485.4 /*
485.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
485.6 *
485.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
485.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
485.9 + *
485.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
485.11 + * Other names may be trademarks of their respective owners.
485.12 *
485.13 * The contents of this file are subject to the terms of either the GNU
485.14 * General Public License Version 2 only ("GPL") or the Common
485.15 @@ -13,9 +16,9 @@
485.16 * specific language governing permissions and limitations under the
485.17 * License. When distributing the software, include this License Header
485.18 * Notice in each file and include the License file at
485.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
485.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
485.21 * particular file as subject to the "Classpath" exception as provided
485.22 - * by Sun in the GPL Version 2 section of the License file that
485.23 + * by Oracle in the GPL Version 2 section of the License file that
485.24 * accompanied this code. If applicable, add the following below the
485.25 * License Header, with the fields enclosed by brackets [] replaced by
485.26 * your own identifying information:
486.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/JsfTopComponent.java Fri Jul 16 11:47:36 2010 -0400
486.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/JsfTopComponent.java Fri Jul 16 14:21:50 2010 -0400
486.3 @@ -1,7 +1,10 @@
486.4 /*
486.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
486.6 *
486.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
486.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
486.9 + *
486.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
486.11 + * Other names may be trademarks of their respective owners.
486.12 *
486.13 * The contents of this file are subject to the terms of either the GNU
486.14 * General Public License Version 2 only ("GPL") or the Common
486.15 @@ -13,9 +16,9 @@
486.16 * specific language governing permissions and limitations under the
486.17 * License. When distributing the software, include this License Header
486.18 * Notice in each file and include the License file at
486.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
486.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
486.21 * particular file as subject to the "Classpath" exception as provided
486.22 - * by Sun in the GPL Version 2 section of the License file that
486.23 + * by Oracle in the GPL Version 2 section of the License file that
486.24 * accompanied this code. If applicable, add the following below the
486.25 * License Header, with the fields enclosed by brackets [] replaced by
486.26 * your own identifying information:
487.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/NotAvailableMultiViewElement.java Fri Jul 16 11:47:36 2010 -0400
487.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/NotAvailableMultiViewElement.java Fri Jul 16 14:21:50 2010 -0400
487.3 @@ -1,7 +1,10 @@
487.4 /*
487.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
487.6 *
487.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
487.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
487.9 + *
487.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
487.11 + * Other names may be trademarks of their respective owners.
487.12 *
487.13 * The contents of this file are subject to the terms of either the GNU
487.14 * General Public License Version 2 only ("GPL") or the Common
487.15 @@ -13,9 +16,9 @@
487.16 * specific language governing permissions and limitations under the
487.17 * License. When distributing the software, include this License Header
487.18 * Notice in each file and include the License file at
487.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
487.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
487.21 * particular file as subject to the "Classpath" exception as provided
487.22 - * by Sun in the GPL Version 2 section of the License file that
487.23 + * by Oracle in the GPL Version 2 section of the License file that
487.24 * accompanied this code. If applicable, add the following below the
487.25 * License Header, with the fields enclosed by brackets [] replaced by
487.26 * your own identifying information:
488.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/RenderErrorPanelImpl.java Fri Jul 16 11:47:36 2010 -0400
488.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/RenderErrorPanelImpl.java Fri Jul 16 14:21:50 2010 -0400
488.3 @@ -1,7 +1,10 @@
488.4 /*
488.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
488.6 *
488.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
488.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
488.9 + *
488.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
488.11 + * Other names may be trademarks of their respective owners.
488.12 *
488.13 * The contents of this file are subject to the terms of either the GNU
488.14 * General Public License Version 2 only ("GPL") or the Common
488.15 @@ -13,9 +16,9 @@
488.16 * specific language governing permissions and limitations under the
488.17 * License. When distributing the software, include this License Header
488.18 * Notice in each file and include the License file at
488.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
488.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
488.21 * particular file as subject to the "Classpath" exception as provided
488.22 - * by Sun in the GPL Version 2 section of the License file that
488.23 + * by Oracle in the GPL Version 2 section of the License file that
488.24 * accompanied this code. If applicable, add the following below the
488.25 * License Header, with the fields enclosed by brackets [] replaced by
488.26 * your own identifying information:
489.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/virtualforms/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
489.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/virtualforms/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
489.3 @@ -1,7 +1,10 @@
489.4 #
489.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
489.6 #
489.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
489.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
489.9 +#
489.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
489.11 +# Other names may be trademarks of their respective owners.
489.12 #
489.13 # The contents of this file are subject to the terms of either the GNU
489.14 # General Public License Version 2 only ("GPL") or the Common
489.15 @@ -13,9 +16,9 @@
489.16 # specific language governing permissions and limitations under the
489.17 # License. When distributing the software, include this License Header
489.18 # Notice in each file and include the License file at
489.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
489.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
489.21 # particular file as subject to the "Classpath" exception as provided
489.22 -# by Sun in the GPL Version 2 section of the License file that
489.23 +# by Oracle in the GPL Version 2 section of the License file that
489.24 # accompanied this code. If applicable, add the following below the
489.25 # License Header, with the fields enclosed by brackets [] replaced by
489.26 # your own identifying information:
490.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/virtualforms/ComponentGroupSupport.java Fri Jul 16 11:47:36 2010 -0400
490.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/virtualforms/ComponentGroupSupport.java Fri Jul 16 14:21:50 2010 -0400
490.3 @@ -1,7 +1,10 @@
490.4 /*
490.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
490.6 *
490.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
490.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
490.9 + *
490.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
490.11 + * Other names may be trademarks of their respective owners.
490.12 *
490.13 * The contents of this file are subject to the terms of either the GNU
490.14 * General Public License Version 2 only ("GPL") or the Common
490.15 @@ -13,9 +16,9 @@
490.16 * specific language governing permissions and limitations under the
490.17 * License. When distributing the software, include this License Header
490.18 * Notice in each file and include the License file at
490.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
490.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
490.21 * particular file as subject to the "Classpath" exception as provided
490.22 - * by Sun in the GPL Version 2 section of the License file that
490.23 + * by Oracle in the GPL Version 2 section of the License file that
490.24 * accompanied this code. If applicable, add the following below the
490.25 * License Header, with the fields enclosed by brackets [] replaced by
490.26 * your own identifying information:
491.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/spi/designer/jsf/DesignerJsfService.java Fri Jul 16 11:47:36 2010 -0400
491.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/spi/designer/jsf/DesignerJsfService.java Fri Jul 16 14:21:50 2010 -0400
491.3 @@ -1,7 +1,10 @@
491.4 /*
491.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
491.6 *
491.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
491.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
491.9 + *
491.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
491.11 + * Other names may be trademarks of their respective owners.
491.12 *
491.13 * The contents of this file are subject to the terms of either the GNU
491.14 * General Public License Version 2 only ("GPL") or the Common
491.15 @@ -13,9 +16,9 @@
491.16 * specific language governing permissions and limitations under the
491.17 * License. When distributing the software, include this License Header
491.18 * Notice in each file and include the License file at
491.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
491.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
491.21 * particular file as subject to the "Classpath" exception as provided
491.22 - * by Sun in the GPL Version 2 section of the License file that
491.23 + * by Oracle in the GPL Version 2 section of the License file that
491.24 * accompanied this code. If applicable, add the following below the
491.25 * License Header, with the fields enclosed by brackets [] replaced by
491.26 * your own identifying information:
492.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/spi/designer/jsf/DesignerJsfServiceProvider.java Fri Jul 16 11:47:36 2010 -0400
492.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/spi/designer/jsf/DesignerJsfServiceProvider.java Fri Jul 16 14:21:50 2010 -0400
492.3 @@ -1,7 +1,10 @@
492.4 /*
492.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
492.6 *
492.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
492.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
492.9 + *
492.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
492.11 + * Other names may be trademarks of their respective owners.
492.12 *
492.13 * The contents of this file are subject to the terms of either the GNU
492.14 * General Public License Version 2 only ("GPL") or the Common
492.15 @@ -13,9 +16,9 @@
492.16 * specific language governing permissions and limitations under the
492.17 * License. When distributing the software, include this License Header
492.18 * Notice in each file and include the License file at
492.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
492.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
492.21 * particular file as subject to the "Classpath" exception as provided
492.22 - * by Sun in the GPL Version 2 section of the License file that
492.23 + * by Oracle in the GPL Version 2 section of the License file that
492.24 * accompanied this code. If applicable, add the following below the
492.25 * License Header, with the fields enclosed by brackets [] replaced by
492.26 * your own identifying information:
493.1 --- a/visualweb.designer.markup/build.xml Fri Jul 16 11:47:36 2010 -0400
493.2 +++ b/visualweb.designer.markup/build.xml Fri Jul 16 14:21:50 2010 -0400
493.3 @@ -2,7 +2,10 @@
493.4 <!--
493.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
493.6
493.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
493.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
493.9 +
493.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
493.11 +Other names may be trademarks of their respective owners.
493.12
493.13
493.14 The contents of this file are subject to the terms of either the GNU
493.15 @@ -15,9 +18,9 @@
493.16 specific language governing permissions and limitations under the
493.17 License. When distributing the software, include this License Header
493.18 Notice in each file and include the License file at
493.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
493.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
493.21 particular file as subject to the "Classpath" exception as provided
493.22 -by Sun in the GPL Version 2 section of the License file that
493.23 +by Oracle in the GPL Version 2 section of the License file that
493.24 accompanied this code. If applicable, add the following below the
493.25 License Header, with the fields enclosed by brackets [] replaced by
493.26 your own identifying information:
494.1 --- a/visualweb.designer.markup/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
494.2 +++ b/visualweb.designer.markup/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
494.3 @@ -1,6 +1,9 @@
494.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
494.5 #
494.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
494.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
494.8 +#
494.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
494.10 +# Other names may be trademarks of their respective owners.
494.11 #
494.12 # The contents of this file are subject to the terms of either the GNU
494.13 # General Public License Version 2 only ("GPL") or the Common
494.14 @@ -12,9 +15,9 @@
494.15 # specific language governing permissions and limitations under the
494.16 # License. When distributing the software, include this License Header
494.17 # Notice in each file and include the License file at
494.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
494.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
494.20 # particular file as subject to the "Classpath" exception as provided
494.21 -# by Sun in the GPL Version 2 section of the License file that
494.22 +# by Oracle in the GPL Version 2 section of the License file that
494.23 # accompanied this code. If applicable, add the following below the
494.24 # License Header, with the fields enclosed by brackets [] replaced by
494.25 # your own identifying information:
494.26 @@ -38,4 +41,4 @@
494.27 # made subject to such option by the copyright holder.
494.28
494.29 javac.compilerargs=-Xlint:unchecked
494.30 -javac.source=1.5
494.31 +javac.source=1.6
495.1 --- a/visualweb.designer.markup/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
495.2 +++ b/visualweb.designer.markup/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
495.3 @@ -2,7 +2,10 @@
495.4 <!--
495.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
495.6
495.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
495.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
495.9 +
495.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
495.11 +Other names may be trademarks of their respective owners.
495.12
495.13
495.14 The contents of this file are subject to the terms of either the GNU
495.15 @@ -15,9 +18,9 @@
495.16 specific language governing permissions and limitations under the
495.17 License. When distributing the software, include this License Header
495.18 Notice in each file and include the License file at
495.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
495.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
495.21 particular file as subject to the "Classpath" exception as provided
495.22 -by Sun in the GPL Version 2 section of the License file that
495.23 +by Oracle in the GPL Version 2 section of the License file that
495.24 accompanied this code. If applicable, add the following below the
495.25 License Header, with the fields enclosed by brackets [] replaced by
495.26 your own identifying information:
496.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/api/designer/markup/MarkupService.java Fri Jul 16 11:47:36 2010 -0400
496.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/api/designer/markup/MarkupService.java Fri Jul 16 14:21:50 2010 -0400
496.3 @@ -1,7 +1,10 @@
496.4 /*
496.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
496.6 *
496.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
496.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
496.9 + *
496.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
496.11 + * Other names may be trademarks of their respective owners.
496.12 *
496.13 * The contents of this file are subject to the terms of either the GNU
496.14 * General Public License Version 2 only ("GPL") or the Common
496.15 @@ -13,9 +16,9 @@
496.16 * specific language governing permissions and limitations under the
496.17 * License. When distributing the software, include this License Header
496.18 * Notice in each file and include the License file at
496.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
496.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
496.21 * particular file as subject to the "Classpath" exception as provided
496.22 - * by Sun in the GPL Version 2 section of the License file that
496.23 + * by Oracle in the GPL Version 2 section of the License file that
496.24 * accompanied this code. If applicable, add the following below the
496.25 * License Header, with the fields enclosed by brackets [] replaced by
496.26 * your own identifying information:
497.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/AbstractRaveDocument.java Fri Jul 16 11:47:36 2010 -0400
497.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/AbstractRaveDocument.java Fri Jul 16 14:21:50 2010 -0400
497.3 @@ -1,7 +1,10 @@
497.4 /*
497.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
497.6 *
497.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
497.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
497.9 + *
497.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
497.11 + * Other names may be trademarks of their respective owners.
497.12 *
497.13 * The contents of this file are subject to the terms of either the GNU
497.14 * General Public License Version 2 only ("GPL") or the Common
497.15 @@ -13,9 +16,9 @@
497.16 * specific language governing permissions and limitations under the
497.17 * License. When distributing the software, include this License Header
497.18 * Notice in each file and include the License file at
497.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
497.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
497.21 * particular file as subject to the "Classpath" exception as provided
497.22 - * by Sun in the GPL Version 2 section of the License file that
497.23 + * by Oracle in the GPL Version 2 section of the License file that
497.24 * accompanied this code. If applicable, add the following below the
497.25 * License Header, with the fields enclosed by brackets [] replaced by
497.26 * your own identifying information:
498.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
498.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
498.3 @@ -1,7 +1,10 @@
498.4 #
498.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
498.6 #
498.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
498.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
498.9 +#
498.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
498.11 +# Other names may be trademarks of their respective owners.
498.12 #
498.13 # The contents of this file are subject to the terms of either the GNU
498.14 # General Public License Version 2 only ("GPL") or the Common
498.15 @@ -13,9 +16,9 @@
498.16 # specific language governing permissions and limitations under the
498.17 # License. When distributing the software, include this License Header
498.18 # Notice in each file and include the License file at
498.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
498.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
498.21 # particular file as subject to the "Classpath" exception as provided
498.22 -# by Sun in the GPL Version 2 section of the License file that
498.23 +# by Oracle in the GPL Version 2 section of the License file that
498.24 # accompanied this code. If applicable, add the following below the
498.25 # License Header, with the fields enclosed by brackets [] replaced by
498.26 # your own identifying information:
499.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/MarkupServiceImpl.java Fri Jul 16 11:47:36 2010 -0400
499.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/MarkupServiceImpl.java Fri Jul 16 14:21:50 2010 -0400
499.3 @@ -1,7 +1,10 @@
499.4 /*
499.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
499.6 *
499.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
499.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
499.9 + *
499.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
499.11 + * Other names may be trademarks of their respective owners.
499.12 *
499.13 * The contents of this file are subject to the terms of either the GNU
499.14 * General Public License Version 2 only ("GPL") or the Common
499.15 @@ -13,9 +16,9 @@
499.16 * specific language governing permissions and limitations under the
499.17 * License. When distributing the software, include this License Header
499.18 * Notice in each file and include the License file at
499.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
499.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
499.21 * particular file as subject to the "Classpath" exception as provided
499.22 - * by Sun in the GPL Version 2 section of the License file that
499.23 + * by Oracle in the GPL Version 2 section of the License file that
499.24 * accompanied this code. If applicable, add the following below the
499.25 * License Header, with the fields enclosed by brackets [] replaced by
499.26 * your own identifying information:
500.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/MarkupUtilities.java Fri Jul 16 11:47:36 2010 -0400
500.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/MarkupUtilities.java Fri Jul 16 14:21:50 2010 -0400
500.3 @@ -1,7 +1,10 @@
500.4 /*
500.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
500.6 *
500.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
500.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
500.9 + *
500.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
500.11 + * Other names may be trademarks of their respective owners.
500.12 *
500.13 * The contents of this file are subject to the terms of either the GNU
500.14 * General Public License Version 2 only ("GPL") or the Common
500.15 @@ -13,9 +16,9 @@
500.16 * specific language governing permissions and limitations under the
500.17 * License. When distributing the software, include this License Header
500.18 * Notice in each file and include the License file at
500.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
500.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
500.21 * particular file as subject to the "Classpath" exception as provided
500.22 - * by Sun in the GPL Version 2 section of the License file that
500.23 + * by Oracle in the GPL Version 2 section of the License file that
500.24 * accompanied this code. If applicable, add the following below the
500.25 * License Header, with the fields enclosed by brackets [] replaced by
500.26 * your own identifying information:
501.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveDocumentBuilder.java Fri Jul 16 11:47:36 2010 -0400
501.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveDocumentBuilder.java Fri Jul 16 14:21:50 2010 -0400
501.3 @@ -1,7 +1,10 @@
501.4 /*
501.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
501.6 *
501.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
501.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
501.9 + *
501.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
501.11 + * Other names may be trademarks of their respective owners.
501.12 *
501.13 * The contents of this file are subject to the terms of either the GNU
501.14 * General Public License Version 2 only ("GPL") or the Common
501.15 @@ -13,9 +16,9 @@
501.16 * specific language governing permissions and limitations under the
501.17 * License. When distributing the software, include this License Header
501.18 * Notice in each file and include the License file at
501.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
501.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
501.21 * particular file as subject to the "Classpath" exception as provided
501.22 - * by Sun in the GPL Version 2 section of the License file that
501.23 + * by Oracle in the GPL Version 2 section of the License file that
501.24 * accompanied this code. If applicable, add the following below the
501.25 * License Header, with the fields enclosed by brackets [] replaced by
501.26 * your own identifying information:
502.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveDocumentBuilderFactory.java Fri Jul 16 11:47:36 2010 -0400
502.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveDocumentBuilderFactory.java Fri Jul 16 14:21:50 2010 -0400
502.3 @@ -1,7 +1,10 @@
502.4 /*
502.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
502.6 *
502.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
502.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
502.9 + *
502.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
502.11 + * Other names may be trademarks of their respective owners.
502.12 *
502.13 * The contents of this file are subject to the terms of either the GNU
502.14 * General Public License Version 2 only ("GPL") or the Common
502.15 @@ -13,9 +16,9 @@
502.16 * specific language governing permissions and limitations under the
502.17 * License. When distributing the software, include this License Header
502.18 * Notice in each file and include the License file at
502.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
502.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
502.21 * particular file as subject to the "Classpath" exception as provided
502.22 - * by Sun in the GPL Version 2 section of the License file that
502.23 + * by Oracle in the GPL Version 2 section of the License file that
502.24 * accompanied this code. If applicable, add the following below the
502.25 * License Header, with the fields enclosed by brackets [] replaced by
502.26 * your own identifying information:
503.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveDomParser.java Fri Jul 16 11:47:36 2010 -0400
503.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveDomParser.java Fri Jul 16 14:21:50 2010 -0400
503.3 @@ -1,7 +1,10 @@
503.4 /*
503.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
503.6 *
503.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
503.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
503.9 + *
503.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
503.11 + * Other names may be trademarks of their respective owners.
503.12 *
503.13 * The contents of this file are subject to the terms of either the GNU
503.14 * General Public License Version 2 only ("GPL") or the Common
503.15 @@ -13,9 +16,9 @@
503.16 * specific language governing permissions and limitations under the
503.17 * License. When distributing the software, include this License Header
503.18 * Notice in each file and include the License file at
503.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
503.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
503.21 * particular file as subject to the "Classpath" exception as provided
503.22 - * by Sun in the GPL Version 2 section of the License file that
503.23 + * by Oracle in the GPL Version 2 section of the License file that
503.24 * accompanied this code. If applicable, add the following below the
503.25 * License Header, with the fields enclosed by brackets [] replaced by
503.26 * your own identifying information:
504.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveElement.java Fri Jul 16 11:47:36 2010 -0400
504.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveElement.java Fri Jul 16 14:21:50 2010 -0400
504.3 @@ -1,7 +1,10 @@
504.4 /*
504.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
504.6 *
504.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
504.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
504.9 + *
504.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
504.11 + * Other names may be trademarks of their respective owners.
504.12 *
504.13 * The contents of this file are subject to the terms of either the GNU
504.14 * General Public License Version 2 only ("GPL") or the Common
504.15 @@ -13,9 +16,9 @@
504.16 * specific language governing permissions and limitations under the
504.17 * License. When distributing the software, include this License Header
504.18 * Notice in each file and include the License file at
504.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
504.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
504.21 * particular file as subject to the "Classpath" exception as provided
504.22 - * by Sun in the GPL Version 2 section of the License file that
504.23 + * by Oracle in the GPL Version 2 section of the License file that
504.24 * accompanied this code. If applicable, add the following below the
504.25 * License Header, with the fields enclosed by brackets [] replaced by
504.26 * your own identifying information:
505.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveRenderedDocument.java Fri Jul 16 11:47:36 2010 -0400
505.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveRenderedDocument.java Fri Jul 16 14:21:50 2010 -0400
505.3 @@ -1,7 +1,10 @@
505.4 /*
505.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
505.6 *
505.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
505.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
505.9 + *
505.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
505.11 + * Other names may be trademarks of their respective owners.
505.12 *
505.13 * The contents of this file are subject to the terms of either the GNU
505.14 * General Public License Version 2 only ("GPL") or the Common
505.15 @@ -13,9 +16,9 @@
505.16 * specific language governing permissions and limitations under the
505.17 * License. When distributing the software, include this License Header
505.18 * Notice in each file and include the License file at
505.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
505.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
505.21 * particular file as subject to the "Classpath" exception as provided
505.22 - * by Sun in the GPL Version 2 section of the License file that
505.23 + * by Oracle in the GPL Version 2 section of the License file that
505.24 * accompanied this code. If applicable, add the following below the
505.25 * License Header, with the fields enclosed by brackets [] replaced by
505.26 * your own identifying information:
506.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveSourceDocument.java Fri Jul 16 11:47:36 2010 -0400
506.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveSourceDocument.java Fri Jul 16 14:21:50 2010 -0400
506.3 @@ -1,7 +1,10 @@
506.4 /*
506.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
506.6 *
506.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
506.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
506.9 + *
506.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
506.11 + * Other names may be trademarks of their respective owners.
506.12 *
506.13 * The contents of this file are subject to the terms of either the GNU
506.14 * General Public License Version 2 only ("GPL") or the Common
506.15 @@ -13,9 +16,9 @@
506.16 * specific language governing permissions and limitations under the
506.17 * License. When distributing the software, include this License Header
506.18 * Notice in each file and include the License file at
506.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
506.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
506.21 * particular file as subject to the "Classpath" exception as provided
506.22 - * by Sun in the GPL Version 2 section of the License file that
506.23 + * by Oracle in the GPL Version 2 section of the License file that
506.24 * accompanied this code. If applicable, add the following below the
506.25 * License Header, with the fields enclosed by brackets [] replaced by
506.26 * your own identifying information:
507.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveTableElement.java Fri Jul 16 11:47:36 2010 -0400
507.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveTableElement.java Fri Jul 16 14:21:50 2010 -0400
507.3 @@ -1,7 +1,10 @@
507.4 /*
507.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
507.6 *
507.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
507.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
507.9 + *
507.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
507.11 + * Other names may be trademarks of their respective owners.
507.12 *
507.13 * The contents of this file are subject to the terms of either the GNU
507.14 * General Public License Version 2 only ("GPL") or the Common
507.15 @@ -13,9 +16,9 @@
507.16 * specific language governing permissions and limitations under the
507.17 * License. When distributing the software, include this License Header
507.18 * Notice in each file and include the License file at
507.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
507.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
507.21 * particular file as subject to the "Classpath" exception as provided
507.22 - * by Sun in the GPL Version 2 section of the License file that
507.23 + * by Oracle in the GPL Version 2 section of the License file that
507.24 * accompanied this code. If applicable, add the following below the
507.25 * License Header, with the fields enclosed by brackets [] replaced by
507.26 * your own identifying information:
508.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveText.java Fri Jul 16 11:47:36 2010 -0400
508.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RaveText.java Fri Jul 16 14:21:50 2010 -0400
508.3 @@ -1,7 +1,10 @@
508.4 /*
508.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
508.6 *
508.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
508.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
508.9 + *
508.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
508.11 + * Other names may be trademarks of their respective owners.
508.12 *
508.13 * The contents of this file are subject to the terms of either the GNU
508.14 * General Public License Version 2 only ("GPL") or the Common
508.15 @@ -13,9 +16,9 @@
508.16 * specific language governing permissions and limitations under the
508.17 * License. When distributing the software, include this License Header
508.18 * Notice in each file and include the License file at
508.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
508.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
508.21 * particular file as subject to the "Classpath" exception as provided
508.22 - * by Sun in the GPL Version 2 section of the License file that
508.23 + * by Oracle in the GPL Version 2 section of the License file that
508.24 * accompanied this code. If applicable, add the following below the
508.25 * License Header, with the fields enclosed by brackets [] replaced by
508.26 * your own identifying information:
509.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RenderedStyleElement.java Fri Jul 16 11:47:36 2010 -0400
509.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RenderedStyleElement.java Fri Jul 16 14:21:50 2010 -0400
509.3 @@ -1,7 +1,10 @@
509.4 /*
509.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
509.6 *
509.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
509.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
509.9 + *
509.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
509.11 + * Other names may be trademarks of their respective owners.
509.12 *
509.13 * The contents of this file are subject to the terms of either the GNU
509.14 * General Public License Version 2 only ("GPL") or the Common
509.15 @@ -13,9 +16,9 @@
509.16 * specific language governing permissions and limitations under the
509.17 * License. When distributing the software, include this License Header
509.18 * Notice in each file and include the License file at
509.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
509.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
509.21 * particular file as subject to the "Classpath" exception as provided
509.22 - * by Sun in the GPL Version 2 section of the License file that
509.23 + * by Oracle in the GPL Version 2 section of the License file that
509.24 * accompanied this code. If applicable, add the following below the
509.25 * License Header, with the fields enclosed by brackets [] replaced by
509.26 * your own identifying information:
510.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RenderedStylesheetLinkElement.java Fri Jul 16 11:47:36 2010 -0400
510.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/RenderedStylesheetLinkElement.java Fri Jul 16 14:21:50 2010 -0400
510.3 @@ -1,7 +1,10 @@
510.4 /*
510.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
510.6 *
510.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
510.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
510.9 + *
510.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
510.11 + * Other names may be trademarks of their respective owners.
510.12 *
510.13 * The contents of this file are subject to the terms of either the GNU
510.14 * General Public License Version 2 only ("GPL") or the Common
510.15 @@ -13,9 +16,9 @@
510.16 * specific language governing permissions and limitations under the
510.17 * License. When distributing the software, include this License Header
510.18 * Notice in each file and include the License file at
510.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
510.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
510.21 * particular file as subject to the "Classpath" exception as provided
510.22 - * by Sun in the GPL Version 2 section of the License file that
510.23 + * by Oracle in the GPL Version 2 section of the License file that
510.24 * accompanied this code. If applicable, add the following below the
510.25 * License Header, with the fields enclosed by brackets [] replaced by
510.26 * your own identifying information:
511.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/SourceStyleElement.java Fri Jul 16 11:47:36 2010 -0400
511.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/SourceStyleElement.java Fri Jul 16 14:21:50 2010 -0400
511.3 @@ -1,7 +1,10 @@
511.4 /*
511.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
511.6 *
511.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
511.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
511.9 + *
511.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
511.11 + * Other names may be trademarks of their respective owners.
511.12 *
511.13 * The contents of this file are subject to the terms of either the GNU
511.14 * General Public License Version 2 only ("GPL") or the Common
511.15 @@ -13,9 +16,9 @@
511.16 * specific language governing permissions and limitations under the
511.17 * License. When distributing the software, include this License Header
511.18 * Notice in each file and include the License file at
511.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
511.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
511.21 * particular file as subject to the "Classpath" exception as provided
511.22 - * by Sun in the GPL Version 2 section of the License file that
511.23 + * by Oracle in the GPL Version 2 section of the License file that
511.24 * accompanied this code. If applicable, add the following below the
511.25 * License Header, with the fields enclosed by brackets [] replaced by
511.26 * your own identifying information:
512.1 --- a/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/SourceStylesheetLinkElement.java Fri Jul 16 11:47:36 2010 -0400
512.2 +++ b/visualweb.designer.markup/src/org/netbeans/modules/visualweb/designer/markup/SourceStylesheetLinkElement.java Fri Jul 16 14:21:50 2010 -0400
512.3 @@ -1,7 +1,10 @@
512.4 /*
512.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
512.6 *
512.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
512.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
512.9 + *
512.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
512.11 + * Other names may be trademarks of their respective owners.
512.12 *
512.13 * The contents of this file are subject to the terms of either the GNU
512.14 * General Public License Version 2 only ("GPL") or the Common
512.15 @@ -13,9 +16,9 @@
512.16 * specific language governing permissions and limitations under the
512.17 * License. When distributing the software, include this License Header
512.18 * Notice in each file and include the License file at
512.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
512.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
512.21 * particular file as subject to the "Classpath" exception as provided
512.22 - * by Sun in the GPL Version 2 section of the License file that
512.23 + * by Oracle in the GPL Version 2 section of the License file that
512.24 * accompanied this code. If applicable, add the following below the
512.25 * License Header, with the fields enclosed by brackets [] replaced by
512.26 * your own identifying information:
513.1 --- a/visualweb.designer/build.xml Fri Jul 16 11:47:36 2010 -0400
513.2 +++ b/visualweb.designer/build.xml Fri Jul 16 14:21:50 2010 -0400
513.3 @@ -2,7 +2,10 @@
513.4 <!--
513.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
513.6
513.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
513.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
513.9 +
513.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
513.11 +Other names may be trademarks of their respective owners.
513.12
513.13
513.14 The contents of this file are subject to the terms of either the GNU
513.15 @@ -15,9 +18,9 @@
513.16 specific language governing permissions and limitations under the
513.17 License. When distributing the software, include this License Header
513.18 Notice in each file and include the License file at
513.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
513.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
513.21 particular file as subject to the "Classpath" exception as provided
513.22 -by Sun in the GPL Version 2 section of the License file that
513.23 +by Oracle in the GPL Version 2 section of the License file that
513.24 accompanied this code. If applicable, add the following below the
513.25 License Header, with the fields enclosed by brackets [] replaced by
513.26 your own identifying information:
514.1 --- a/visualweb.designer/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
514.2 +++ b/visualweb.designer/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
514.3 @@ -1,6 +1,9 @@
514.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
514.5 #
514.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
514.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
514.8 +#
514.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
514.10 +# Other names may be trademarks of their respective owners.
514.11 #
514.12 # The contents of this file are subject to the terms of either the GNU
514.13 # General Public License Version 2 only ("GPL") or the Common
514.14 @@ -12,9 +15,9 @@
514.15 # specific language governing permissions and limitations under the
514.16 # License. When distributing the software, include this License Header
514.17 # Notice in each file and include the License file at
514.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
514.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
514.20 # particular file as subject to the "Classpath" exception as provided
514.21 -# by Sun in the GPL Version 2 section of the License file that
514.22 +# by Oracle in the GPL Version 2 section of the License file that
514.23 # accompanied this code. If applicable, add the following below the
514.24 # License Header, with the fields enclosed by brackets [] replaced by
514.25 # your own identifying information:
514.26 @@ -39,7 +42,7 @@
514.27
514.28
514.29 javac.compilerargs=-Xlint:unchecked
514.30 -javac.source=1.5
514.31 +javac.source=1.6
514.32 javadoc.arch=${basedir}/arch/arch-designer.xml
514.33
514.34 javadoc.base=../../designer
515.1 --- a/visualweb.designer/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
515.2 +++ b/visualweb.designer/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
515.3 @@ -2,7 +2,10 @@
515.4 <!--
515.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
515.6
515.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
515.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
515.9 +
515.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
515.11 +Other names may be trademarks of their respective owners.
515.12
515.13
515.14 The contents of this file are subject to the terms of either the GNU
515.15 @@ -15,9 +18,9 @@
515.16 specific language governing permissions and limitations under the
515.17 License. When distributing the software, include this License Header
515.18 Notice in each file and include the License file at
515.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
515.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
515.21 particular file as subject to the "Classpath" exception as provided
515.22 -by Sun in the GPL Version 2 section of the License file that
515.23 +by Oracle in the GPL Version 2 section of the License file that
515.24 accompanied this code. If applicable, add the following below the
515.25 License Header, with the fields enclosed by brackets [] replaced by
515.26 your own identifying information:
515.27 @@ -168,7 +171,15 @@
515.28 <build-prerequisite/>
515.29 <compile-dependency/>
515.30 <run-dependency>
515.31 - <specification-version>7.15</specification-version>
515.32 + <specification-version>8.0</specification-version>
515.33 + </run-dependency>
515.34 + </dependency>
515.35 + <dependency>
515.36 + <code-name-base>org.openide.util.lookup</code-name-base>
515.37 + <build-prerequisite/>
515.38 + <compile-dependency/>
515.39 + <run-dependency>
515.40 + <specification-version>8.0</specification-version>
515.41 </run-dependency>
515.42 </dependency>
515.43 <dependency>
516.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/Designer.java Fri Jul 16 11:47:36 2010 -0400
516.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/Designer.java Fri Jul 16 14:21:50 2010 -0400
516.3 @@ -1,7 +1,10 @@
516.4 /*
516.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
516.6 *
516.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
516.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
516.9 + *
516.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
516.11 + * Other names may be trademarks of their respective owners.
516.12 *
516.13 * The contents of this file are subject to the terms of either the GNU
516.14 * General Public License Version 2 only ("GPL") or the Common
516.15 @@ -13,9 +16,9 @@
516.16 * specific language governing permissions and limitations under the
516.17 * License. When distributing the software, include this License Header
516.18 * Notice in each file and include the License file at
516.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
516.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
516.21 * particular file as subject to the "Classpath" exception as provided
516.22 - * by Sun in the GPL Version 2 section of the License file that
516.23 + * by Oracle in the GPL Version 2 section of the License file that
516.24 * accompanied this code. If applicable, add the following below the
516.25 * License Header, with the fields enclosed by brackets [] replaced by
516.26 * your own identifying information:
517.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DesignerFactory.java Fri Jul 16 11:47:36 2010 -0400
517.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DesignerFactory.java Fri Jul 16 14:21:50 2010 -0400
517.3 @@ -1,7 +1,10 @@
517.4 /*
517.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
517.6 *
517.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
517.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
517.9 + *
517.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
517.11 + * Other names may be trademarks of their respective owners.
517.12 *
517.13 * The contents of this file are subject to the terms of either the GNU
517.14 * General Public License Version 2 only ("GPL") or the Common
517.15 @@ -13,9 +16,9 @@
517.16 * specific language governing permissions and limitations under the
517.17 * License. When distributing the software, include this License Header
517.18 * Notice in each file and include the License file at
517.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
517.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
517.21 * particular file as subject to the "Classpath" exception as provided
517.22 - * by Sun in the GPL Version 2 section of the License file that
517.23 + * by Oracle in the GPL Version 2 section of the License file that
517.24 * accompanied this code. If applicable, add the following below the
517.25 * License Header, with the fields enclosed by brackets [] replaced by
517.26 * your own identifying information:
518.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DesignerServiceHackProvider.java Fri Jul 16 11:47:36 2010 -0400
518.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DesignerServiceHackProvider.java Fri Jul 16 14:21:50 2010 -0400
518.3 @@ -1,7 +1,10 @@
518.4 /*
518.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
518.6 *
518.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
518.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
518.9 + *
518.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
518.11 + * Other names may be trademarks of their respective owners.
518.12 *
518.13 * The contents of this file are subject to the terms of either the GNU
518.14 * General Public License Version 2 only ("GPL") or the Common
518.15 @@ -13,9 +16,9 @@
518.16 * specific language governing permissions and limitations under the
518.17 * License. When distributing the software, include this License Header
518.18 * Notice in each file and include the License file at
518.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
518.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
518.21 * particular file as subject to the "Classpath" exception as provided
518.22 - * by Sun in the GPL Version 2 section of the License file that
518.23 + * by Oracle in the GPL Version 2 section of the License file that
518.24 * accompanied this code. If applicable, add the following below the
518.25 * License Header, with the fields enclosed by brackets [] replaced by
518.26 * your own identifying information:
519.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DomProvider.java Fri Jul 16 11:47:36 2010 -0400
519.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DomProvider.java Fri Jul 16 14:21:50 2010 -0400
519.3 @@ -1,7 +1,10 @@
519.4 /*
519.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
519.6 *
519.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
519.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
519.9 + *
519.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
519.11 + * Other names may be trademarks of their respective owners.
519.12 *
519.13 * The contents of this file are subject to the terms of either the GNU
519.14 * General Public License Version 2 only ("GPL") or the Common
519.15 @@ -13,9 +16,9 @@
519.16 * specific language governing permissions and limitations under the
519.17 * License. When distributing the software, include this License Header
519.18 * Notice in each file and include the License file at
519.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
519.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
519.21 * particular file as subject to the "Classpath" exception as provided
519.22 - * by Sun in the GPL Version 2 section of the License file that
519.23 + * by Oracle in the GPL Version 2 section of the License file that
519.24 * accompanied this code. If applicable, add the following below the
519.25 * License Header, with the fields enclosed by brackets [] replaced by
519.26 * your own identifying information:
520.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DomProviderService.java Fri Jul 16 11:47:36 2010 -0400
520.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DomProviderService.java Fri Jul 16 14:21:50 2010 -0400
520.3 @@ -1,7 +1,10 @@
520.4 /*
520.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
520.6 *
520.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
520.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
520.9 + *
520.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
520.11 + * Other names may be trademarks of their respective owners.
520.12 *
520.13 * The contents of this file are subject to the terms of either the GNU
520.14 * General Public License Version 2 only ("GPL") or the Common
520.15 @@ -13,9 +16,9 @@
520.16 * specific language governing permissions and limitations under the
520.17 * License. When distributing the software, include this License Header
520.18 * Notice in each file and include the License file at
520.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
520.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
520.21 * particular file as subject to the "Classpath" exception as provided
520.22 - * by Sun in the GPL Version 2 section of the License file that
520.23 + * by Oracle in the GPL Version 2 section of the License file that
520.24 * accompanied this code. If applicable, add the following below the
520.25 * License Header, with the fields enclosed by brackets [] replaced by
520.26 * your own identifying information:
521.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/BackgroundImagePainter.java Fri Jul 16 11:47:36 2010 -0400
521.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/BackgroundImagePainter.java Fri Jul 16 14:21:50 2010 -0400
521.3 @@ -1,7 +1,10 @@
521.4 /*
521.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
521.6 *
521.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
521.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
521.9 + *
521.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
521.11 + * Other names may be trademarks of their respective owners.
521.12 *
521.13 * The contents of this file are subject to the terms of either the GNU
521.14 * General Public License Version 2 only ("GPL") or the Common
521.15 @@ -13,9 +16,9 @@
521.16 * specific language governing permissions and limitations under the
521.17 * License. When distributing the software, include this License Header
521.18 * Notice in each file and include the License file at
521.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
521.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
521.21 * particular file as subject to the "Classpath" exception as provided
521.22 - * by Sun in the GPL Version 2 section of the License file that
521.23 + * by Oracle in the GPL Version 2 section of the License file that
521.24 * accompanied this code. If applicable, add the following below the
521.25 * License Header, with the fields enclosed by brackets [] replaced by
521.26 * your own identifying information:
522.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/BoxFactory.java Fri Jul 16 11:47:36 2010 -0400
522.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/BoxFactory.java Fri Jul 16 14:21:50 2010 -0400
522.3 @@ -1,7 +1,10 @@
522.4 /*
522.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
522.6 *
522.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
522.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
522.9 + *
522.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
522.11 + * Other names may be trademarks of their respective owners.
522.12 *
522.13 * The contents of this file are subject to the terms of either the GNU
522.14 * General Public License Version 2 only ("GPL") or the Common
522.15 @@ -13,9 +16,9 @@
522.16 * specific language governing permissions and limitations under the
522.17 * License. When distributing the software, include this License Header
522.18 * Notice in each file and include the License file at
522.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
522.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
522.21 * particular file as subject to the "Classpath" exception as provided
522.22 - * by Sun in the GPL Version 2 section of the License file that
522.23 + * by Oracle in the GPL Version 2 section of the License file that
522.24 * accompanied this code. If applicable, add the following below the
522.25 * License Header, with the fields enclosed by brackets [] replaced by
522.26 * your own identifying information:
523.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/BoxList.java Fri Jul 16 11:47:36 2010 -0400
523.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/BoxList.java Fri Jul 16 14:21:50 2010 -0400
523.3 @@ -1,7 +1,10 @@
523.4 /*
523.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
523.6 *
523.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
523.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
523.9 + *
523.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
523.11 + * Other names may be trademarks of their respective owners.
523.12 *
523.13 * The contents of this file are subject to the terms of either the GNU
523.14 * General Public License Version 2 only ("GPL") or the Common
523.15 @@ -13,9 +16,9 @@
523.16 * specific language governing permissions and limitations under the
523.17 * License. When distributing the software, include this License Header
523.18 * Notice in each file and include the License file at
523.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
523.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
523.21 * particular file as subject to the "Classpath" exception as provided
523.22 - * by Sun in the GPL Version 2 section of the License file that
523.23 + * by Oracle in the GPL Version 2 section of the License file that
523.24 * accompanied this code. If applicable, add the following below the
523.25 * License Header, with the fields enclosed by brackets [] replaced by
523.26 * your own identifying information:
524.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/BoxType.java Fri Jul 16 11:47:36 2010 -0400
524.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/BoxType.java Fri Jul 16 14:21:50 2010 -0400
524.3 @@ -1,7 +1,10 @@
524.4 /*
524.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
524.6 *
524.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
524.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
524.9 + *
524.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
524.11 + * Other names may be trademarks of their respective owners.
524.12 *
524.13 * The contents of this file are subject to the terms of either the GNU
524.14 * General Public License Version 2 only ("GPL") or the Common
524.15 @@ -13,9 +16,9 @@
524.16 * specific language governing permissions and limitations under the
524.17 * License. When distributing the software, include this License Header
524.18 * Notice in each file and include the License file at
524.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
524.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
524.21 * particular file as subject to the "Classpath" exception as provided
524.22 - * by Sun in the GPL Version 2 section of the License file that
524.23 + * by Oracle in the GPL Version 2 section of the License file that
524.24 * accompanied this code. If applicable, add the following below the
524.25 * License Header, with the fields enclosed by brackets [] replaced by
524.26 * your own identifying information:
525.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
525.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
525.3 @@ -1,6 +1,9 @@
525.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
525.5 #
525.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
525.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
525.8 +#
525.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
525.10 +# Other names may be trademarks of their respective owners.
525.11 #
525.12 # The contents of this file are subject to the terms of either the GNU
525.13 # General Public License Version 2 only ("GPL") or the Common
525.14 @@ -12,9 +15,9 @@
525.15 # specific language governing permissions and limitations under the
525.16 # License. When distributing the software, include this License Header
525.17 # Notice in each file and include the License file at
525.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
525.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
525.20 # particular file as subject to the "Classpath" exception as provided
525.21 -# by Sun in the GPL Version 2 section of the License file that
525.22 +# by Oracle in the GPL Version 2 section of the License file that
525.23 # accompanied this code. If applicable, add the following below the
525.24 # License Header, with the fields enclosed by brackets [] replaced by
525.25 # your own identifying information:
526.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ContainerBox.java Fri Jul 16 11:47:36 2010 -0400
526.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ContainerBox.java Fri Jul 16 14:21:50 2010 -0400
526.3 @@ -1,7 +1,10 @@
526.4 /*
526.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
526.6 *
526.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
526.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
526.9 + *
526.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
526.11 + * Other names may be trademarks of their respective owners.
526.12 *
526.13 * The contents of this file are subject to the terms of either the GNU
526.14 * General Public License Version 2 only ("GPL") or the Common
526.15 @@ -13,9 +16,9 @@
526.16 * specific language governing permissions and limitations under the
526.17 * License. When distributing the software, include this License Header
526.18 * Notice in each file and include the License file at
526.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
526.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
526.21 * particular file as subject to the "Classpath" exception as provided
526.22 - * by Sun in the GPL Version 2 section of the License file that
526.23 + * by Oracle in the GPL Version 2 section of the License file that
526.24 * accompanied this code. If applicable, add the following below the
526.25 * License Header, with the fields enclosed by brackets [] replaced by
526.26 * your own identifying information:
527.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CreateContext.java Fri Jul 16 11:47:36 2010 -0400
527.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CreateContext.java Fri Jul 16 14:21:50 2010 -0400
527.3 @@ -1,7 +1,10 @@
527.4 /*
527.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
527.6 *
527.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
527.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
527.9 + *
527.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
527.11 + * Other names may be trademarks of their respective owners.
527.12 *
527.13 * The contents of this file are subject to the terms of either the GNU
527.14 * General Public License Version 2 only ("GPL") or the Common
527.15 @@ -13,9 +16,9 @@
527.16 * specific language governing permissions and limitations under the
527.17 * License. When distributing the software, include this License Header
527.18 * Notice in each file and include the License file at
527.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
527.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
527.21 * particular file as subject to the "Classpath" exception as provided
527.22 - * by Sun in the GPL Version 2 section of the License file that
527.23 + * by Oracle in the GPL Version 2 section of the License file that
527.24 * accompanied this code. If applicable, add the following below the
527.25 * License Header, with the fields enclosed by brackets [] replaced by
527.26 * your own identifying information:
528.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CssBorder.java Fri Jul 16 11:47:36 2010 -0400
528.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CssBorder.java Fri Jul 16 14:21:50 2010 -0400
528.3 @@ -1,7 +1,10 @@
528.4 /*
528.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
528.6 *
528.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
528.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
528.9 + *
528.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
528.11 + * Other names may be trademarks of their respective owners.
528.12 *
528.13 * The contents of this file are subject to the terms of either the GNU
528.14 * General Public License Version 2 only ("GPL") or the Common
528.15 @@ -13,9 +16,9 @@
528.16 * specific language governing permissions and limitations under the
528.17 * License. When distributing the software, include this License Header
528.18 * Notice in each file and include the License file at
528.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
528.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
528.21 * particular file as subject to the "Classpath" exception as provided
528.22 - * by Sun in the GPL Version 2 section of the License file that
528.23 + * by Oracle in the GPL Version 2 section of the License file that
528.24 * accompanied this code. If applicable, add the following below the
528.25 * License Header, with the fields enclosed by brackets [] replaced by
528.26 * your own identifying information:
529.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CssBox.java Fri Jul 16 11:47:36 2010 -0400
529.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CssBox.java Fri Jul 16 14:21:50 2010 -0400
529.3 @@ -1,7 +1,10 @@
529.4 /*
529.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
529.6 *
529.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
529.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
529.9 + *
529.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
529.11 + * Other names may be trademarks of their respective owners.
529.12 *
529.13 * The contents of this file are subject to the terms of either the GNU
529.14 * General Public License Version 2 only ("GPL") or the Common
529.15 @@ -13,9 +16,9 @@
529.16 * specific language governing permissions and limitations under the
529.17 * License. When distributing the software, include this License Header
529.18 * Notice in each file and include the License file at
529.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
529.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
529.21 * particular file as subject to the "Classpath" exception as provided
529.22 - * by Sun in the GPL Version 2 section of the License file that
529.23 + * by Oracle in the GPL Version 2 section of the License file that
529.24 * accompanied this code. If applicable, add the following below the
529.25 * License Header, with the fields enclosed by brackets [] replaced by
529.26 * your own identifying information:
530.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CustomButtonBox.java Fri Jul 16 11:47:36 2010 -0400
530.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CustomButtonBox.java Fri Jul 16 14:21:50 2010 -0400
530.3 @@ -1,7 +1,10 @@
530.4 /*
530.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
530.6 *
530.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
530.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
530.9 + *
530.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
530.11 + * Other names may be trademarks of their respective owners.
530.12 *
530.13 * The contents of this file are subject to the terms of either the GNU
530.14 * General Public License Version 2 only ("GPL") or the Common
530.15 @@ -13,9 +16,9 @@
530.16 * specific language governing permissions and limitations under the
530.17 * License. When distributing the software, include this License Header
530.18 * Notice in each file and include the License file at
530.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
530.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
530.21 * particular file as subject to the "Classpath" exception as provided
530.22 - * by Sun in the GPL Version 2 section of the License file that
530.23 + * by Oracle in the GPL Version 2 section of the License file that
530.24 * accompanied this code. If applicable, add the following below the
530.25 * License Header, with the fields enclosed by brackets [] replaced by
530.26 * your own identifying information:
531.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/DocumentBox.java Fri Jul 16 11:47:36 2010 -0400
531.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/DocumentBox.java Fri Jul 16 14:21:50 2010 -0400
531.3 @@ -1,7 +1,10 @@
531.4 /*
531.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
531.6 *
531.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
531.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
531.9 + *
531.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
531.11 + * Other names may be trademarks of their respective owners.
531.12 *
531.13 * The contents of this file are subject to the terms of either the GNU
531.14 * General Public License Version 2 only ("GPL") or the Common
531.15 @@ -13,9 +16,9 @@
531.16 * specific language governing permissions and limitations under the
531.17 * License. When distributing the software, include this License Header
531.18 * Notice in each file and include the License file at
531.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
531.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
531.21 * particular file as subject to the "Classpath" exception as provided
531.22 - * by Sun in the GPL Version 2 section of the License file that
531.23 + * by Oracle in the GPL Version 2 section of the License file that
531.24 * accompanied this code. If applicable, add the following below the
531.25 * License Header, with the fields enclosed by brackets [] replaced by
531.26 * your own identifying information:
532.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/DomInspector.java Fri Jul 16 11:47:36 2010 -0400
532.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/DomInspector.java Fri Jul 16 14:21:50 2010 -0400
532.3 @@ -1,7 +1,10 @@
532.4 /*
532.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
532.6 *
532.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
532.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
532.9 + *
532.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
532.11 + * Other names may be trademarks of their respective owners.
532.12 *
532.13 * The contents of this file are subject to the terms of either the GNU
532.14 * General Public License Version 2 only ("GPL") or the Common
532.15 @@ -13,9 +16,9 @@
532.16 * specific language governing permissions and limitations under the
532.17 * License. When distributing the software, include this License Header
532.18 * Notice in each file and include the License file at
532.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
532.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
532.21 * particular file as subject to the "Classpath" exception as provided
532.22 - * by Sun in the GPL Version 2 section of the License file that
532.23 + * by Oracle in the GPL Version 2 section of the License file that
532.24 * accompanied this code. If applicable, add the following below the
532.25 * License Header, with the fields enclosed by brackets [] replaced by
532.26 * your own identifying information:
533.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ExternalDocumentBox.java Fri Jul 16 11:47:36 2010 -0400
533.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ExternalDocumentBox.java Fri Jul 16 14:21:50 2010 -0400
533.3 @@ -1,7 +1,10 @@
533.4 /*
533.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
533.6 *
533.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
533.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
533.9 + *
533.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
533.11 + * Other names may be trademarks of their respective owners.
533.12 *
533.13 * The contents of this file are subject to the terms of either the GNU
533.14 * General Public License Version 2 only ("GPL") or the Common
533.15 @@ -13,9 +16,9 @@
533.16 * specific language governing permissions and limitations under the
533.17 * License. When distributing the software, include this License Header
533.18 * Notice in each file and include the License file at
533.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
533.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
533.21 * particular file as subject to the "Classpath" exception as provided
533.22 - * by Sun in the GPL Version 2 section of the License file that
533.23 + * by Oracle in the GPL Version 2 section of the License file that
533.24 * accompanied this code. If applicable, add the following below the
533.25 * License Header, with the fields enclosed by brackets [] replaced by
533.26 * your own identifying information:
534.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FieldSetBox.java Fri Jul 16 11:47:36 2010 -0400
534.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FieldSetBox.java Fri Jul 16 14:21:50 2010 -0400
534.3 @@ -1,7 +1,10 @@
534.4 /*
534.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
534.6 *
534.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
534.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
534.9 + *
534.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
534.11 + * Other names may be trademarks of their respective owners.
534.12 *
534.13 * The contents of this file are subject to the terms of either the GNU
534.14 * General Public License Version 2 only ("GPL") or the Common
534.15 @@ -13,9 +16,9 @@
534.16 * specific language governing permissions and limitations under the
534.17 * License. When distributing the software, include this License Header
534.18 * Notice in each file and include the License file at
534.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
534.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
534.21 * particular file as subject to the "Classpath" exception as provided
534.22 - * by Sun in the GPL Version 2 section of the License file that
534.23 + * by Oracle in the GPL Version 2 section of the License file that
534.24 * accompanied this code. If applicable, add the following below the
534.25 * License Header, with the fields enclosed by brackets [] replaced by
534.26 * your own identifying information:
535.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FloatingBoxInfo.java Fri Jul 16 11:47:36 2010 -0400
535.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FloatingBoxInfo.java Fri Jul 16 14:21:50 2010 -0400
535.3 @@ -1,7 +1,10 @@
535.4 /*
535.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
535.6 *
535.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
535.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
535.9 + *
535.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
535.11 + * Other names may be trademarks of their respective owners.
535.12 *
535.13 * The contents of this file are subject to the terms of either the GNU
535.14 * General Public License Version 2 only ("GPL") or the Common
535.15 @@ -13,9 +16,9 @@
535.16 * specific language governing permissions and limitations under the
535.17 * License. When distributing the software, include this License Header
535.18 * Notice in each file and include the License file at
535.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
535.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
535.21 * particular file as subject to the "Classpath" exception as provided
535.22 - * by Sun in the GPL Version 2 section of the License file that
535.23 + * by Oracle in the GPL Version 2 section of the License file that
535.24 * accompanied this code. If applicable, add the following below the
535.25 * License Header, with the fields enclosed by brackets [] replaced by
535.26 * your own identifying information:
536.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FormComponentBox.java Fri Jul 16 11:47:36 2010 -0400
536.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FormComponentBox.java Fri Jul 16 14:21:50 2010 -0400
536.3 @@ -1,7 +1,10 @@
536.4 /*
536.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
536.6 *
536.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
536.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
536.9 + *
536.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
536.11 + * Other names may be trademarks of their respective owners.
536.12 *
536.13 * The contents of this file are subject to the terms of either the GNU
536.14 * General Public License Version 2 only ("GPL") or the Common
536.15 @@ -13,9 +16,9 @@
536.16 * specific language governing permissions and limitations under the
536.17 * License. When distributing the software, include this License Header
536.18 * Notice in each file and include the License file at
536.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
536.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
536.21 * particular file as subject to the "Classpath" exception as provided
536.22 - * by Sun in the GPL Version 2 section of the License file that
536.23 + * by Oracle in the GPL Version 2 section of the License file that
536.24 * accompanied this code. If applicable, add the following below the
536.25 * License Header, with the fields enclosed by brackets [] replaced by
536.26 * your own identifying information:
537.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FormatContext.java Fri Jul 16 11:47:36 2010 -0400
537.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FormatContext.java Fri Jul 16 14:21:50 2010 -0400
537.3 @@ -1,7 +1,10 @@
537.4 /*
537.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
537.6 *
537.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
537.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
537.9 + *
537.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
537.11 + * Other names may be trademarks of their respective owners.
537.12 *
537.13 * The contents of this file are subject to the terms of either the GNU
537.14 * General Public License Version 2 only ("GPL") or the Common
537.15 @@ -13,9 +16,9 @@
537.16 * specific language governing permissions and limitations under the
537.17 * License. When distributing the software, include this License Header
537.18 * Notice in each file and include the License file at
537.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
537.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
537.21 * particular file as subject to the "Classpath" exception as provided
537.22 - * by Sun in the GPL Version 2 section of the License file that
537.23 + * by Oracle in the GPL Version 2 section of the License file that
537.24 * accompanied this code. If applicable, add the following below the
537.25 * License Header, with the fields enclosed by brackets [] replaced by
537.26 * your own identifying information:
538.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FrameBox.java Fri Jul 16 11:47:36 2010 -0400
538.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FrameBox.java Fri Jul 16 14:21:50 2010 -0400
538.3 @@ -1,7 +1,10 @@
538.4 /*
538.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
538.6 *
538.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
538.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
538.9 + *
538.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
538.11 + * Other names may be trademarks of their respective owners.
538.12 *
538.13 * The contents of this file are subject to the terms of either the GNU
538.14 * General Public License Version 2 only ("GPL") or the Common
538.15 @@ -13,9 +16,9 @@
538.16 * specific language governing permissions and limitations under the
538.17 * License. When distributing the software, include this License Header
538.18 * Notice in each file and include the License file at
538.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
538.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
538.21 * particular file as subject to the "Classpath" exception as provided
538.22 - * by Sun in the GPL Version 2 section of the License file that
538.23 + * by Oracle in the GPL Version 2 section of the License file that
538.24 * accompanied this code. If applicable, add the following below the
538.25 * License Header, with the fields enclosed by brackets [] replaced by
538.26 * your own identifying information:
539.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FrameSetBox.java Fri Jul 16 11:47:36 2010 -0400
539.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/FrameSetBox.java Fri Jul 16 14:21:50 2010 -0400
539.3 @@ -1,7 +1,10 @@
539.4 /*
539.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
539.6 *
539.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
539.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
539.9 + *
539.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
539.11 + * Other names may be trademarks of their respective owners.
539.12 *
539.13 * The contents of this file are subject to the terms of either the GNU
539.14 * General Public License Version 2 only ("GPL") or the Common
539.15 @@ -13,9 +16,9 @@
539.16 * specific language governing permissions and limitations under the
539.17 * License. When distributing the software, include this License Header
539.18 * Notice in each file and include the License file at
539.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
539.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
539.21 * particular file as subject to the "Classpath" exception as provided
539.22 - * by Sun in the GPL Version 2 section of the License file that
539.23 + * by Oracle in the GPL Version 2 section of the License file that
539.24 * accompanied this code. If applicable, add the following below the
539.25 * License Header, with the fields enclosed by brackets [] replaced by
539.26 * your own identifying information:
540.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ImageBox.java Fri Jul 16 11:47:36 2010 -0400
540.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ImageBox.java Fri Jul 16 14:21:50 2010 -0400
540.3 @@ -1,7 +1,10 @@
540.4 /*
540.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
540.6 *
540.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
540.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
540.9 + *
540.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
540.11 + * Other names may be trademarks of their respective owners.
540.12 *
540.13 * The contents of this file are subject to the terms of either the GNU
540.14 * General Public License Version 2 only ("GPL") or the Common
540.15 @@ -13,9 +16,9 @@
540.16 * specific language governing permissions and limitations under the
540.17 * License. When distributing the software, include this License Header
540.18 * Notice in each file and include the License file at
540.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
540.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
540.21 * particular file as subject to the "Classpath" exception as provided
540.22 - * by Sun in the GPL Version 2 section of the License file that
540.23 + * by Oracle in the GPL Version 2 section of the License file that
540.24 * accompanied this code. If applicable, add the following below the
540.25 * License Header, with the fields enclosed by brackets [] replaced by
540.26 * your own identifying information:
541.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/JspIncludeBox.java Fri Jul 16 11:47:36 2010 -0400
541.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/JspIncludeBox.java Fri Jul 16 14:21:50 2010 -0400
541.3 @@ -1,7 +1,10 @@
541.4 /*
541.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
541.6 *
541.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
541.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
541.9 + *
541.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
541.11 + * Other names may be trademarks of their respective owners.
541.12 *
541.13 * The contents of this file are subject to the terms of either the GNU
541.14 * General Public License Version 2 only ("GPL") or the Common
541.15 @@ -13,9 +16,9 @@
541.16 * specific language governing permissions and limitations under the
541.17 * License. When distributing the software, include this License Header
541.18 * Notice in each file and include the License file at
541.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
541.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
541.21 * particular file as subject to the "Classpath" exception as provided
541.22 - * by Sun in the GPL Version 2 section of the License file that
541.23 + * by Oracle in the GPL Version 2 section of the License file that
541.24 * accompanied this code. If applicable, add the following below the
541.25 * License Header, with the fields enclosed by brackets [] replaced by
541.26 * your own identifying information:
542.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/LineBox.java Fri Jul 16 11:47:36 2010 -0400
542.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/LineBox.java Fri Jul 16 14:21:50 2010 -0400
542.3 @@ -1,7 +1,10 @@
542.4 /*
542.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
542.6 *
542.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
542.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
542.9 + *
542.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
542.11 + * Other names may be trademarks of their respective owners.
542.12 *
542.13 * The contents of this file are subject to the terms of either the GNU
542.14 * General Public License Version 2 only ("GPL") or the Common
542.15 @@ -13,9 +16,9 @@
542.16 * specific language governing permissions and limitations under the
542.17 * License. When distributing the software, include this License Header
542.18 * Notice in each file and include the License file at
542.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
542.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
542.21 * particular file as subject to the "Classpath" exception as provided
542.22 - * by Sun in the GPL Version 2 section of the License file that
542.23 + * by Oracle in the GPL Version 2 section of the License file that
542.24 * accompanied this code. If applicable, add the following below the
542.25 * License Header, with the fields enclosed by brackets [] replaced by
542.26 * your own identifying information:
543.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/LineBoxGroup.java Fri Jul 16 11:47:36 2010 -0400
543.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/LineBoxGroup.java Fri Jul 16 14:21:50 2010 -0400
543.3 @@ -1,7 +1,10 @@
543.4 /*
543.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
543.6 *
543.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
543.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
543.9 + *
543.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
543.11 + * Other names may be trademarks of their respective owners.
543.12 *
543.13 * The contents of this file are subject to the terms of either the GNU
543.14 * General Public License Version 2 only ("GPL") or the Common
543.15 @@ -13,9 +16,9 @@
543.16 * specific language governing permissions and limitations under the
543.17 * License. When distributing the software, include this License Header
543.18 * Notice in each file and include the License file at
543.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
543.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
543.21 * particular file as subject to the "Classpath" exception as provided
543.22 - * by Sun in the GPL Version 2 section of the License file that
543.23 + * by Oracle in the GPL Version 2 section of the License file that
543.24 * accompanied this code. If applicable, add the following below the
543.25 * License Header, with the fields enclosed by brackets [] replaced by
543.26 * your own identifying information:
544.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/LineBreakBox.java Fri Jul 16 11:47:36 2010 -0400
544.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/LineBreakBox.java Fri Jul 16 14:21:50 2010 -0400
544.3 @@ -1,7 +1,10 @@
544.4 /*
544.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
544.6 *
544.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
544.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
544.9 + *
544.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
544.11 + * Other names may be trademarks of their respective owners.
544.12 *
544.13 * The contents of this file are subject to the terms of either the GNU
544.14 * General Public License Version 2 only ("GPL") or the Common
544.15 @@ -13,9 +16,9 @@
544.16 * specific language governing permissions and limitations under the
544.17 * License. When distributing the software, include this License Header
544.18 * Notice in each file and include the License file at
544.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
544.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
544.21 * particular file as subject to the "Classpath" exception as provided
544.22 - * by Sun in the GPL Version 2 section of the License file that
544.23 + * by Oracle in the GPL Version 2 section of the License file that
544.24 * accompanied this code. If applicable, add the following below the
544.25 * License Header, with the fields enclosed by brackets [] replaced by
544.26 * your own identifying information:
545.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ListBox.java Fri Jul 16 11:47:36 2010 -0400
545.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ListBox.java Fri Jul 16 14:21:50 2010 -0400
545.3 @@ -1,7 +1,10 @@
545.4 /*
545.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
545.6 *
545.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
545.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
545.9 + *
545.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
545.11 + * Other names may be trademarks of their respective owners.
545.12 *
545.13 * The contents of this file are subject to the terms of either the GNU
545.14 * General Public License Version 2 only ("GPL") or the Common
545.15 @@ -13,9 +16,9 @@
545.16 * specific language governing permissions and limitations under the
545.17 * License. When distributing the software, include this License Header
545.18 * Notice in each file and include the License file at
545.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
545.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
545.21 * particular file as subject to the "Classpath" exception as provided
545.22 - * by Sun in the GPL Version 2 section of the License file that
545.23 + * by Oracle in the GPL Version 2 section of the License file that
545.24 * accompanied this code. If applicable, add the following below the
545.25 * License Header, with the fields enclosed by brackets [] replaced by
545.26 * your own identifying information:
546.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ModelViewMapper.java Fri Jul 16 11:47:36 2010 -0400
546.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ModelViewMapper.java Fri Jul 16 14:21:50 2010 -0400
546.3 @@ -1,7 +1,10 @@
546.4 /*
546.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
546.6 *
546.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
546.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
546.9 + *
546.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
546.11 + * Other names may be trademarks of their respective owners.
546.12 *
546.13 * The contents of this file are subject to the terms of either the GNU
546.14 * General Public License Version 2 only ("GPL") or the Common
546.15 @@ -13,9 +16,9 @@
546.16 * specific language governing permissions and limitations under the
546.17 * License. When distributing the software, include this License Header
546.18 * Notice in each file and include the License file at
546.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
546.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
546.21 * particular file as subject to the "Classpath" exception as provided
546.22 - * by Sun in the GPL Version 2 section of the License file that
546.23 + * by Oracle in the GPL Version 2 section of the License file that
546.24 * accompanied this code. If applicable, add the following below the
546.25 * License Header, with the fields enclosed by brackets [] replaced by
546.26 * your own identifying information:
547.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ObjectBox.java Fri Jul 16 11:47:36 2010 -0400
547.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ObjectBox.java Fri Jul 16 14:21:50 2010 -0400
547.3 @@ -1,7 +1,10 @@
547.4 /*
547.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
547.6 *
547.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
547.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
547.9 + *
547.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
547.11 + * Other names may be trademarks of their respective owners.
547.12 *
547.13 * The contents of this file are subject to the terms of either the GNU
547.14 * General Public License Version 2 only ("GPL") or the Common
547.15 @@ -13,9 +16,9 @@
547.16 * specific language governing permissions and limitations under the
547.17 * License. When distributing the software, include this License Header
547.18 * Notice in each file and include the License file at
547.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
547.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
547.21 * particular file as subject to the "Classpath" exception as provided
547.22 - * by Sun in the GPL Version 2 section of the License file that
547.23 + * by Oracle in the GPL Version 2 section of the License file that
547.24 * accompanied this code. If applicable, add the following below the
547.25 * License Header, with the fields enclosed by brackets [] replaced by
547.26 * your own identifying information:
548.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/PageBox.java Fri Jul 16 11:47:36 2010 -0400
548.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/PageBox.java Fri Jul 16 14:21:50 2010 -0400
548.3 @@ -1,7 +1,10 @@
548.4 /*
548.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
548.6 *
548.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
548.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
548.9 + *
548.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
548.11 + * Other names may be trademarks of their respective owners.
548.12 *
548.13 * The contents of this file are subject to the terms of either the GNU
548.14 * General Public License Version 2 only ("GPL") or the Common
548.15 @@ -13,9 +16,9 @@
548.16 * specific language governing permissions and limitations under the
548.17 * License. When distributing the software, include this License Header
548.18 * Notice in each file and include the License file at
548.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
548.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
548.21 * particular file as subject to the "Classpath" exception as provided
548.22 - * by Sun in the GPL Version 2 section of the License file that
548.23 + * by Oracle in the GPL Version 2 section of the License file that
548.24 * accompanied this code. If applicable, add the following below the
548.25 * License Header, with the fields enclosed by brackets [] replaced by
548.26 * your own identifying information:
549.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/SpaceBox.java Fri Jul 16 11:47:36 2010 -0400
549.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/SpaceBox.java Fri Jul 16 14:21:50 2010 -0400
549.3 @@ -1,7 +1,10 @@
549.4 /*
549.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
549.6 *
549.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
549.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
549.9 + *
549.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
549.11 + * Other names may be trademarks of their respective owners.
549.12 *
549.13 * The contents of this file are subject to the terms of either the GNU
549.14 * General Public License Version 2 only ("GPL") or the Common
549.15 @@ -13,9 +16,9 @@
549.16 * specific language governing permissions and limitations under the
549.17 * License. When distributing the software, include this License Header
549.18 * Notice in each file and include the License file at
549.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
549.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
549.21 * particular file as subject to the "Classpath" exception as provided
549.22 - * by Sun in the GPL Version 2 section of the License file that
549.23 + * by Oracle in the GPL Version 2 section of the License file that
549.24 * accompanied this code. If applicable, add the following below the
549.25 * License Header, with the fields enclosed by brackets [] replaced by
549.26 * your own identifying information:
550.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/StringBox.java Fri Jul 16 11:47:36 2010 -0400
550.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/StringBox.java Fri Jul 16 14:21:50 2010 -0400
550.3 @@ -1,7 +1,10 @@
550.4 /*
550.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
550.6 *
550.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
550.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
550.9 + *
550.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
550.11 + * Other names may be trademarks of their respective owners.
550.12 *
550.13 * The contents of this file are subject to the terms of either the GNU
550.14 * General Public License Version 2 only ("GPL") or the Common
550.15 @@ -13,9 +16,9 @@
550.16 * specific language governing permissions and limitations under the
550.17 * License. When distributing the software, include this License Header
550.18 * Notice in each file and include the License file at
550.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
550.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
550.21 * particular file as subject to the "Classpath" exception as provided
550.22 - * by Sun in the GPL Version 2 section of the License file that
550.23 + * by Oracle in the GPL Version 2 section of the License file that
550.24 * accompanied this code. If applicable, add the following below the
550.25 * License Header, with the fields enclosed by brackets [] replaced by
550.26 * your own identifying information:
551.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/TableBox.java Fri Jul 16 11:47:36 2010 -0400
551.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/TableBox.java Fri Jul 16 14:21:50 2010 -0400
551.3 @@ -1,7 +1,10 @@
551.4 /*
551.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
551.6 *
551.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
551.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
551.9 + *
551.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
551.11 + * Other names may be trademarks of their respective owners.
551.12 *
551.13 * The contents of this file are subject to the terms of either the GNU
551.14 * General Public License Version 2 only ("GPL") or the Common
551.15 @@ -13,9 +16,9 @@
551.16 * specific language governing permissions and limitations under the
551.17 * License. When distributing the software, include this License Header
551.18 * Notice in each file and include the License file at
551.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
551.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
551.21 * particular file as subject to the "Classpath" exception as provided
551.22 - * by Sun in the GPL Version 2 section of the License file that
551.23 + * by Oracle in the GPL Version 2 section of the License file that
551.24 * accompanied this code. If applicable, add the following below the
551.25 * License Header, with the fields enclosed by brackets [] replaced by
551.26 * your own identifying information:
552.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/TextBox.java Fri Jul 16 11:47:36 2010 -0400
552.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/TextBox.java Fri Jul 16 14:21:50 2010 -0400
552.3 @@ -1,7 +1,10 @@
552.4 /*
552.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
552.6 *
552.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
552.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
552.9 + *
552.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
552.11 + * Other names may be trademarks of their respective owners.
552.12 *
552.13 * The contents of this file are subject to the terms of either the GNU
552.14 * General Public License Version 2 only ("GPL") or the Common
552.15 @@ -13,9 +16,9 @@
552.16 * specific language governing permissions and limitations under the
552.17 * License. When distributing the software, include this License Header
552.18 * Notice in each file and include the License file at
552.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
552.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
552.21 * particular file as subject to the "Classpath" exception as provided
552.22 - * by Sun in the GPL Version 2 section of the License file that
552.23 + * by Oracle in the GPL Version 2 section of the License file that
552.24 * accompanied this code. If applicable, add the following below the
552.25 * License Header, with the fields enclosed by brackets [] replaced by
552.26 * your own identifying information:
553.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ViewportBox.java Fri Jul 16 11:47:36 2010 -0400
553.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/ViewportBox.java Fri Jul 16 14:21:50 2010 -0400
553.3 @@ -1,7 +1,10 @@
553.4 /*
553.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
553.6 *
553.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
553.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
553.9 + *
553.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
553.11 + * Other names may be trademarks of their respective owners.
553.12 *
553.13 * The contents of this file are subject to the terms of either the GNU
553.14 * General Public License Version 2 only ("GPL") or the Common
553.15 @@ -13,9 +16,9 @@
553.16 * specific language governing permissions and limitations under the
553.17 * License. When distributing the software, include this License Header
553.18 * Notice in each file and include the License file at
553.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
553.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
553.21 * particular file as subject to the "Classpath" exception as provided
553.22 - * by Sun in the GPL Version 2 section of the License file that
553.23 + * by Oracle in the GPL Version 2 section of the License file that
553.24 * accompanied this code. If applicable, add the following below the
553.25 * License Header, with the fields enclosed by brackets [] replaced by
553.26 * your own identifying information:
554.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/AttributeInlineEditor.java Fri Jul 16 11:47:36 2010 -0400
554.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/AttributeInlineEditor.java Fri Jul 16 14:21:50 2010 -0400
554.3 @@ -1,7 +1,10 @@
554.4 /*
554.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
554.6 *
554.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
554.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
554.9 + *
554.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
554.11 + * Other names may be trademarks of their respective owners.
554.12 *
554.13 * The contents of this file are subject to the terms of either the GNU
554.14 * General Public License Version 2 only ("GPL") or the Common
554.15 @@ -13,9 +16,9 @@
554.16 * specific language governing permissions and limitations under the
554.17 * License. When distributing the software, include this License Header
554.18 * Notice in each file and include the License file at
554.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
554.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
554.21 * particular file as subject to the "Classpath" exception as provided
554.22 - * by Sun in the GPL Version 2 section of the License file that
554.23 + * by Oracle in the GPL Version 2 section of the License file that
554.24 * accompanied this code. If applicable, add the following below the
554.25 * License Header, with the fields enclosed by brackets [] replaced by
554.26 * your own identifying information:
555.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/BasicDragGestureRecognizer.java Fri Jul 16 11:47:36 2010 -0400
555.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/BasicDragGestureRecognizer.java Fri Jul 16 14:21:50 2010 -0400
555.3 @@ -1,7 +1,10 @@
555.4 /*
555.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
555.6 *
555.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
555.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
555.9 + *
555.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
555.11 + * Other names may be trademarks of their respective owners.
555.12 *
555.13 * The contents of this file are subject to the terms of either the GNU
555.14 * General Public License Version 2 only ("GPL") or the Common
555.15 @@ -13,9 +16,9 @@
555.16 * specific language governing permissions and limitations under the
555.17 * License. When distributing the software, include this License Header
555.18 * Notice in each file and include the License file at
555.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
555.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
555.21 * particular file as subject to the "Classpath" exception as provided
555.22 - * by Sun in the GPL Version 2 section of the License file that
555.23 + * by Oracle in the GPL Version 2 section of the License file that
555.24 * accompanied this code. If applicable, add the following below the
555.25 * License Header, with the fields enclosed by brackets [] replaced by
555.26 * your own identifying information:
556.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/BasicDropTargetListener.java Fri Jul 16 11:47:36 2010 -0400
556.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/BasicDropTargetListener.java Fri Jul 16 14:21:50 2010 -0400
556.3 @@ -1,7 +1,10 @@
556.4 /*
556.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
556.6 *
556.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
556.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
556.9 + *
556.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
556.11 + * Other names may be trademarks of their respective owners.
556.12 *
556.13 * The contents of this file are subject to the terms of either the GNU
556.14 * General Public License Version 2 only ("GPL") or the Common
556.15 @@ -13,9 +16,9 @@
556.16 * specific language governing permissions and limitations under the
556.17 * License. When distributing the software, include this License Header
556.18 * Notice in each file and include the License file at
556.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
556.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
556.21 * particular file as subject to the "Classpath" exception as provided
556.22 - * by Sun in the GPL Version 2 section of the License file that
556.23 + * by Oracle in the GPL Version 2 section of the License file that
556.24 * accompanied this code. If applicable, add the following below the
556.25 * License Header, with the fields enclosed by brackets [] replaced by
556.26 * your own identifying information:
557.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
557.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
557.3 @@ -1,7 +1,10 @@
557.4 #
557.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
557.6 #
557.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
557.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
557.9 +#
557.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
557.11 +# Other names may be trademarks of their respective owners.
557.12 #
557.13 # The contents of this file are subject to the terms of either the GNU
557.14 # General Public License Version 2 only ("GPL") or the Common
557.15 @@ -13,9 +16,9 @@
557.16 # specific language governing permissions and limitations under the
557.17 # License. When distributing the software, include this License Header
557.18 # Notice in each file and include the License file at
557.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
557.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
557.21 # particular file as subject to the "Classpath" exception as provided
557.22 -# by Sun in the GPL Version 2 section of the License file that
557.23 +# by Oracle in the GPL Version 2 section of the License file that
557.24 # accompanied this code. If applicable, add the following below the
557.25 # License Header, with the fields enclosed by brackets [] replaced by
557.26 # your own identifying information:
558.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/ColorManager.java Fri Jul 16 11:47:36 2010 -0400
558.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/ColorManager.java Fri Jul 16 14:21:50 2010 -0400
558.3 @@ -1,7 +1,10 @@
558.4 /*
558.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
558.6 *
558.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
558.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
558.9 + *
558.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
558.11 + * Other names may be trademarks of their respective owners.
558.12 *
558.13 * The contents of this file are subject to the terms of either the GNU
558.14 * General Public License Version 2 only ("GPL") or the Common
558.15 @@ -13,9 +16,9 @@
558.16 * specific language governing permissions and limitations under the
558.17 * License. When distributing the software, include this License Header
558.18 * Notice in each file and include the License file at
558.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
558.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
558.21 * particular file as subject to the "Classpath" exception as provided
558.22 - * by Sun in the GPL Version 2 section of the License file that
558.23 + * by Oracle in the GPL Version 2 section of the License file that
558.24 * accompanied this code. If applicable, add the following below the
558.25 * License Header, with the fields enclosed by brackets [] replaced by
558.26 * your own identifying information:
559.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/CssUtilities.java Fri Jul 16 11:47:36 2010 -0400
559.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/CssUtilities.java Fri Jul 16 14:21:50 2010 -0400
559.3 @@ -1,7 +1,10 @@
559.4 /*
559.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
559.6 *
559.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
559.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
559.9 + *
559.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
559.11 + * Other names may be trademarks of their respective owners.
559.12 *
559.13 * The contents of this file are subject to the terms of either the GNU
559.14 * General Public License Version 2 only ("GPL") or the Common
559.15 @@ -13,9 +16,9 @@
559.16 * specific language governing permissions and limitations under the
559.17 * License. When distributing the software, include this License Header
559.18 * Notice in each file and include the License file at
559.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
559.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
559.21 * particular file as subject to the "Classpath" exception as provided
559.22 - * by Sun in the GPL Version 2 section of the License file that
559.23 + * by Oracle in the GPL Version 2 section of the License file that
559.24 * accompanied this code. If applicable, add the following below the
559.25 * License Header, with the fields enclosed by brackets [] replaced by
559.26 * your own identifying information:
560.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerPane.java Fri Jul 16 11:47:36 2010 -0400
560.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerPane.java Fri Jul 16 14:21:50 2010 -0400
560.3 @@ -1,7 +1,10 @@
560.4 /*
560.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
560.6 *
560.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
560.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
560.9 + *
560.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
560.11 + * Other names may be trademarks of their respective owners.
560.12 *
560.13 * The contents of this file are subject to the terms of either the GNU
560.14 * General Public License Version 2 only ("GPL") or the Common
560.15 @@ -13,9 +16,9 @@
560.16 * specific language governing permissions and limitations under the
560.17 * License. When distributing the software, include this License Header
560.18 * Notice in each file and include the License file at
560.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
560.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
560.21 * particular file as subject to the "Classpath" exception as provided
560.22 - * by Sun in the GPL Version 2 section of the License file that
560.23 + * by Oracle in the GPL Version 2 section of the License file that
560.24 * accompanied this code. If applicable, add the following below the
560.25 * License Header, with the fields enclosed by brackets [] replaced by
560.26 * your own identifying information:
561.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerPaneDropTarget.java Fri Jul 16 11:47:36 2010 -0400
561.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerPaneDropTarget.java Fri Jul 16 14:21:50 2010 -0400
561.3 @@ -1,7 +1,10 @@
561.4 /*
561.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
561.6 *
561.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
561.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
561.9 + *
561.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
561.11 + * Other names may be trademarks of their respective owners.
561.12 *
561.13 * The contents of this file are subject to the terms of either the GNU
561.14 * General Public License Version 2 only ("GPL") or the Common
561.15 @@ -13,9 +16,9 @@
561.16 * specific language governing permissions and limitations under the
561.17 * License. When distributing the software, include this License Header
561.18 * Notice in each file and include the License file at
561.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
561.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
561.21 * particular file as subject to the "Classpath" exception as provided
561.22 - * by Sun in the GPL Version 2 section of the License file that
561.23 + * by Oracle in the GPL Version 2 section of the License file that
561.24 * accompanied this code. If applicable, add the following below the
561.25 * License Header, with the fields enclosed by brackets [] replaced by
561.26 * your own identifying information:
562.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerPaneUI.java Fri Jul 16 11:47:36 2010 -0400
562.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerPaneUI.java Fri Jul 16 14:21:50 2010 -0400
562.3 @@ -1,7 +1,10 @@
562.4 /*
562.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
562.6 *
562.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
562.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
562.9 + *
562.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
562.11 + * Other names may be trademarks of their respective owners.
562.12 *
562.13 * The contents of this file are subject to the terms of either the GNU
562.14 * General Public License Version 2 only ("GPL") or the Common
562.15 @@ -13,9 +16,9 @@
562.16 * specific language governing permissions and limitations under the
562.17 * License. When distributing the software, include this License Header
562.18 * Notice in each file and include the License file at
562.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
562.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
562.21 * particular file as subject to the "Classpath" exception as provided
562.22 - * by Sun in the GPL Version 2 section of the License file that
562.23 + * by Oracle in the GPL Version 2 section of the License file that
562.24 * accompanied this code. If applicable, add the following below the
562.25 * License Header, with the fields enclosed by brackets [] replaced by
562.26 * your own identifying information:
563.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerServiceHackProviderImpl.java Fri Jul 16 11:47:36 2010 -0400
563.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerServiceHackProviderImpl.java Fri Jul 16 14:21:50 2010 -0400
563.3 @@ -1,7 +1,10 @@
563.4 /*
563.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
563.6 *
563.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
563.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
563.9 + *
563.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
563.11 + * Other names may be trademarks of their respective owners.
563.12 *
563.13 * The contents of this file are subject to the terms of either the GNU
563.14 * General Public License Version 2 only ("GPL") or the Common
563.15 @@ -13,9 +16,9 @@
563.16 * specific language governing permissions and limitations under the
563.17 * License. When distributing the software, include this License Header
563.18 * Notice in each file and include the License file at
563.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
563.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
563.21 * particular file as subject to the "Classpath" exception as provided
563.22 - * by Sun in the GPL Version 2 section of the License file that
563.23 + * by Oracle in the GPL Version 2 section of the License file that
563.24 * accompanied this code. If applicable, add the following below the
563.25 * License Header, with the fields enclosed by brackets [] replaced by
563.26 * your own identifying information:
564.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerTransferHandler.java Fri Jul 16 11:47:36 2010 -0400
564.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerTransferHandler.java Fri Jul 16 14:21:50 2010 -0400
564.3 @@ -1,7 +1,10 @@
564.4 /*
564.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
564.6 *
564.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
564.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
564.9 + *
564.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
564.11 + * Other names may be trademarks of their respective owners.
564.12 *
564.13 * The contents of this file are subject to the terms of either the GNU
564.14 * General Public License Version 2 only ("GPL") or the Common
564.15 @@ -13,9 +16,9 @@
564.16 * specific language governing permissions and limitations under the
564.17 * License. When distributing the software, include this License Header
564.18 * Notice in each file and include the License file at
564.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
564.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
564.21 * particular file as subject to the "Classpath" exception as provided
564.22 - * by Sun in the GPL Version 2 section of the License file that
564.23 + * by Oracle in the GPL Version 2 section of the License file that
564.24 * accompanied this code. If applicable, add the following below the
564.25 * License Header, with the fields enclosed by brackets [] replaced by
564.26 * your own identifying information:
565.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerUtils.java Fri Jul 16 11:47:36 2010 -0400
565.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerUtils.java Fri Jul 16 14:21:50 2010 -0400
565.3 @@ -1,7 +1,10 @@
565.4 /*
565.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
565.6 *
565.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
565.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
565.9 + *
565.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
565.11 + * Other names may be trademarks of their respective owners.
565.12 *
565.13 * The contents of this file are subject to the terms of either the GNU
565.14 * General Public License Version 2 only ("GPL") or the Common
565.15 @@ -13,9 +16,9 @@
565.16 * specific language governing permissions and limitations under the
565.17 * License. When distributing the software, include this License Header
565.18 * Notice in each file and include the License file at
565.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
565.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
565.21 * particular file as subject to the "Classpath" exception as provided
565.22 - * by Sun in the GPL Version 2 section of the License file that
565.23 + * by Oracle in the GPL Version 2 section of the License file that
565.24 * accompanied this code. If applicable, add the following below the
565.25 * License Header, with the fields enclosed by brackets [] replaced by
565.26 * your own identifying information:
566.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DndHandler.java Fri Jul 16 11:47:36 2010 -0400
566.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DndHandler.java Fri Jul 16 14:21:50 2010 -0400
566.3 @@ -1,7 +1,10 @@
566.4 /*
566.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
566.6 *
566.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
566.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
566.9 + *
566.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
566.11 + * Other names may be trademarks of their respective owners.
566.12 *
566.13 * The contents of this file are subject to the terms of either the GNU
566.14 * General Public License Version 2 only ("GPL") or the Common
566.15 @@ -13,9 +16,9 @@
566.16 * specific language governing permissions and limitations under the
566.17 * License. When distributing the software, include this License Header
566.18 * Notice in each file and include the License file at
566.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
566.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
566.21 * particular file as subject to the "Classpath" exception as provided
566.22 - * by Sun in the GPL Version 2 section of the License file that
566.23 + * by Oracle in the GPL Version 2 section of the License file that
566.24 * accompanied this code. If applicable, add the following below the
566.25 * License Header, with the fields enclosed by brackets [] replaced by
566.26 * your own identifying information:
567.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Dragger.java Fri Jul 16 11:47:36 2010 -0400
567.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Dragger.java Fri Jul 16 14:21:50 2010 -0400
567.3 @@ -1,7 +1,10 @@
567.4 /*
567.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
567.6 *
567.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
567.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
567.9 + *
567.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
567.11 + * Other names may be trademarks of their respective owners.
567.12 *
567.13 * The contents of this file are subject to the terms of either the GNU
567.14 * General Public License Version 2 only ("GPL") or the Common
567.15 @@ -13,9 +16,9 @@
567.16 * specific language governing permissions and limitations under the
567.17 * License. When distributing the software, include this License Header
567.18 * Notice in each file and include the License file at
567.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
567.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
567.21 * particular file as subject to the "Classpath" exception as provided
567.22 - * by Sun in the GPL Version 2 section of the License file that
567.23 + * by Oracle in the GPL Version 2 section of the License file that
567.24 * accompanied this code. If applicable, add the following below the
567.25 * License Header, with the fields enclosed by brackets [] replaced by
567.26 * your own identifying information:
568.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/FormComponentEditor.java Fri Jul 16 11:47:36 2010 -0400
568.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/FormComponentEditor.java Fri Jul 16 14:21:50 2010 -0400
568.3 @@ -1,7 +1,10 @@
568.4 /*
568.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
568.6 *
568.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
568.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
568.9 + *
568.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
568.11 + * Other names may be trademarks of their respective owners.
568.12 *
568.13 * The contents of this file are subject to the terms of either the GNU
568.14 * General Public License Version 2 only ("GPL") or the Common
568.15 @@ -13,9 +16,9 @@
568.16 * specific language governing permissions and limitations under the
568.17 * License. When distributing the software, include this License Header
568.18 * Notice in each file and include the License file at
568.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
568.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
568.21 * particular file as subject to the "Classpath" exception as provided
568.22 - * by Sun in the GPL Version 2 section of the License file that
568.23 + * by Oracle in the GPL Version 2 section of the License file that
568.24 * accompanied this code. If applicable, add the following below the
568.25 * License Header, with the fields enclosed by brackets [] replaced by
568.26 * your own identifying information:
569.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/ImageCache.java Fri Jul 16 11:47:36 2010 -0400
569.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/ImageCache.java Fri Jul 16 14:21:50 2010 -0400
569.3 @@ -1,7 +1,10 @@
569.4 /*
569.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
569.6 *
569.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
569.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
569.9 + *
569.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
569.11 + * Other names may be trademarks of their respective owners.
569.12 *
569.13 * The contents of this file are subject to the terms of either the GNU
569.14 * General Public License Version 2 only ("GPL") or the Common
569.15 @@ -13,9 +16,9 @@
569.16 * specific language governing permissions and limitations under the
569.17 * License. When distributing the software, include this License Header
569.18 * Notice in each file and include the License file at
569.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
569.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
569.21 * particular file as subject to the "Classpath" exception as provided
569.22 - * by Sun in the GPL Version 2 section of the License file that
569.23 + * by Oracle in the GPL Version 2 section of the License file that
569.24 * accompanied this code. If applicable, add the following below the
569.25 * License Header, with the fields enclosed by brackets [] replaced by
569.26 * your own identifying information:
570.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/InlineEditor.java Fri Jul 16 11:47:36 2010 -0400
570.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/InlineEditor.java Fri Jul 16 14:21:50 2010 -0400
570.3 @@ -1,7 +1,10 @@
570.4 /*
570.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
570.6 *
570.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
570.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
570.9 + *
570.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
570.11 + * Other names may be trademarks of their respective owners.
570.12 *
570.13 * The contents of this file are subject to the terms of either the GNU
570.14 * General Public License Version 2 only ("GPL") or the Common
570.15 @@ -13,9 +16,9 @@
570.16 * specific language governing permissions and limitations under the
570.17 * License. When distributing the software, include this License Header
570.18 * Notice in each file and include the License file at
570.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
570.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
570.21 * particular file as subject to the "Classpath" exception as provided
570.22 - * by Sun in the GPL Version 2 section of the License file that
570.23 + * by Oracle in the GPL Version 2 section of the License file that
570.24 * accompanied this code. If applicable, add the following below the
570.25 * License Header, with the fields enclosed by brackets [] replaced by
570.26 * your own identifying information:
571.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Interaction.java Fri Jul 16 11:47:36 2010 -0400
571.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Interaction.java Fri Jul 16 14:21:50 2010 -0400
571.3 @@ -1,7 +1,10 @@
571.4 /*
571.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
571.6 *
571.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
571.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
571.9 + *
571.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
571.11 + * Other names may be trademarks of their respective owners.
571.12 *
571.13 * The contents of this file are subject to the terms of either the GNU
571.14 * General Public License Version 2 only ("GPL") or the Common
571.15 @@ -13,9 +16,9 @@
571.16 * specific language governing permissions and limitations under the
571.17 * License. When distributing the software, include this License Header
571.18 * Notice in each file and include the License file at
571.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
571.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
571.21 * particular file as subject to the "Classpath" exception as provided
571.22 - * by Sun in the GPL Version 2 section of the License file that
571.23 + * by Oracle in the GPL Version 2 section of the License file that
571.24 * accompanied this code. If applicable, add the following below the
571.25 * License Header, with the fields enclosed by brackets [] replaced by
571.26 * your own identifying information:
572.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/InteractionManager.java Fri Jul 16 11:47:36 2010 -0400
572.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/InteractionManager.java Fri Jul 16 14:21:50 2010 -0400
572.3 @@ -1,7 +1,10 @@
572.4 /*
572.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
572.6 *
572.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
572.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
572.9 + *
572.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
572.11 + * Other names may be trademarks of their respective owners.
572.12 *
572.13 * The contents of this file are subject to the terms of either the GNU
572.14 * General Public License Version 2 only ("GPL") or the Common
572.15 @@ -13,9 +16,9 @@
572.16 * specific language governing permissions and limitations under the
572.17 * License. When distributing the software, include this License Header
572.18 * Notice in each file and include the License file at
572.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
572.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
572.21 * particular file as subject to the "Classpath" exception as provided
572.22 - * by Sun in the GPL Version 2 section of the License file that
572.23 + * by Oracle in the GPL Version 2 section of the License file that
572.24 * accompanied this code. If applicable, add the following below the
572.25 * License Header, with the fields enclosed by brackets [] replaced by
572.26 * your own identifying information:
573.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Marquee.java Fri Jul 16 11:47:36 2010 -0400
573.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Marquee.java Fri Jul 16 14:21:50 2010 -0400
573.3 @@ -1,7 +1,10 @@
573.4 /*
573.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
573.6 *
573.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
573.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
573.9 + *
573.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
573.11 + * Other names may be trademarks of their respective owners.
573.12 *
573.13 * The contents of this file are subject to the terms of either the GNU
573.14 * General Public License Version 2 only ("GPL") or the Common
573.15 @@ -13,9 +16,9 @@
573.16 * specific language governing permissions and limitations under the
573.17 * License. When distributing the software, include this License Header
573.18 * Notice in each file and include the License file at
573.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
573.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
573.21 * particular file as subject to the "Classpath" exception as provided
573.22 - * by Sun in the GPL Version 2 section of the License file that
573.23 + * by Oracle in the GPL Version 2 section of the License file that
573.24 * accompanied this code. If applicable, add the following below the
573.25 * License Header, with the fields enclosed by brackets [] replaced by
573.26 * your own identifying information:
574.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Resizer.java Fri Jul 16 11:47:36 2010 -0400
574.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/Resizer.java Fri Jul 16 14:21:50 2010 -0400
574.3 @@ -1,7 +1,10 @@
574.4 /*
574.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
574.6 *
574.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
574.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
574.9 + *
574.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
574.11 + * Other names may be trademarks of their respective owners.
574.12 *
574.13 * The contents of this file are subject to the terms of either the GNU
574.14 * General Public License Version 2 only ("GPL") or the Common
574.15 @@ -13,9 +16,9 @@
574.16 * specific language governing permissions and limitations under the
574.17 * License. When distributing the software, include this License Header
574.18 * Notice in each file and include the License file at
574.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
574.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
574.21 * particular file as subject to the "Classpath" exception as provided
574.22 - * by Sun in the GPL Version 2 section of the License file that
574.23 + * by Oracle in the GPL Version 2 section of the License file that
574.24 * accompanied this code. If applicable, add the following below the
574.25 * License Header, with the fields enclosed by brackets [] replaced by
574.26 * your own identifying information:
575.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/SelectionManager.java Fri Jul 16 11:47:36 2010 -0400
575.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/SelectionManager.java Fri Jul 16 14:21:50 2010 -0400
575.3 @@ -1,7 +1,10 @@
575.4 /*
575.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
575.6 *
575.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
575.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
575.9 + *
575.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
575.11 + * Other names may be trademarks of their respective owners.
575.12 *
575.13 * The contents of this file are subject to the terms of either the GNU
575.14 * General Public License Version 2 only ("GPL") or the Common
575.15 @@ -13,9 +16,9 @@
575.16 * specific language governing permissions and limitations under the
575.17 * License. When distributing the software, include this License Header
575.18 * Notice in each file and include the License file at
575.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
575.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
575.21 * particular file as subject to the "Classpath" exception as provided
575.22 - * by Sun in the GPL Version 2 section of the License file that
575.23 + * by Oracle in the GPL Version 2 section of the License file that
575.24 * accompanied this code. If applicable, add the following below the
575.25 * License Header, with the fields enclosed by brackets [] replaced by
575.26 * your own identifying information:
576.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/TableResizer.java Fri Jul 16 11:47:36 2010 -0400
576.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/TableResizer.java Fri Jul 16 14:21:50 2010 -0400
576.3 @@ -1,7 +1,10 @@
576.4 /*
576.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
576.6 *
576.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
576.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
576.9 + *
576.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
576.11 + * Other names may be trademarks of their respective owners.
576.12 *
576.13 * The contents of this file are subject to the terms of either the GNU
576.14 * General Public License Version 2 only ("GPL") or the Common
576.15 @@ -13,9 +16,9 @@
576.16 * specific language governing permissions and limitations under the
576.17 * License. When distributing the software, include this License Header
576.18 * Notice in each file and include the License file at
576.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
576.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
576.21 * particular file as subject to the "Classpath" exception as provided
576.22 - * by Sun in the GPL Version 2 section of the License file that
576.23 + * by Oracle in the GPL Version 2 section of the License file that
576.24 * accompanied this code. If applicable, add the following below the
576.25 * License Header, with the fields enclosed by brackets [] replaced by
576.26 * your own identifying information:
577.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/WebForm.java Fri Jul 16 11:47:36 2010 -0400
577.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/WebForm.java Fri Jul 16 14:21:50 2010 -0400
577.3 @@ -1,7 +1,10 @@
577.4 /*
577.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
577.6 *
577.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
577.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
577.9 + *
577.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
577.11 + * Other names may be trademarks of their respective owners.
577.12 *
577.13 * The contents of this file are subject to the terms of either the GNU
577.14 * General Public License Version 2 only ("GPL") or the Common
577.15 @@ -13,9 +16,9 @@
577.16 * specific language governing permissions and limitations under the
577.17 * License. When distributing the software, include this License Header
577.18 * Notice in each file and include the License file at
577.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
577.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
577.21 * particular file as subject to the "Classpath" exception as provided
577.22 - * by Sun in the GPL Version 2 section of the License file that
577.23 + * by Oracle in the GPL Version 2 section of the License file that
577.24 * accompanied this code. If applicable, add the following below the
577.25 * License Header, with the fields enclosed by brackets [] replaced by
577.26 * your own identifying information:
578.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
578.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
578.3 @@ -1,7 +1,10 @@
578.4 #
578.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
578.6 #
578.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
578.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
578.9 +#
578.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
578.11 +# Other names may be trademarks of their respective owners.
578.12 #
578.13 # The contents of this file are subject to the terms of either the GNU
578.14 # General Public License Version 2 only ("GPL") or the Common
578.15 @@ -13,9 +16,9 @@
578.16 # specific language governing permissions and limitations under the
578.17 # License. When distributing the software, include this License Header
578.18 # Notice in each file and include the License file at
578.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
578.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
578.21 # particular file as subject to the "Classpath" exception as provided
578.22 -# by Sun in the GPL Version 2 section of the License file that
578.23 +# by Oracle in the GPL Version 2 section of the License file that
578.24 # accompanied this code. If applicable, add the following below the
578.25 # License Header, with the fields enclosed by brackets [] replaced by
578.26 # your own identifying information:
579.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
579.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
579.3 @@ -2,7 +2,10 @@
579.4 <!--
579.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
579.6
579.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
579.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
579.9 +
579.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
579.11 +Other names may be trademarks of their respective owners.
579.12
579.13
579.14 The contents of this file are subject to the terms of either the GNU
579.15 @@ -15,9 +18,9 @@
579.16 specific language governing permissions and limitations under the
579.17 License. When distributing the software, include this License Header
579.18 Notice in each file and include the License file at
579.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
579.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
579.21 particular file as subject to the "Classpath" exception as provided
579.22 -by Sun in the GPL Version 2 section of the License file that
579.23 +by Oracle in the GPL Version 2 section of the License file that
579.24 accompanied this code. If applicable, add the following below the
579.25 License Header, with the fields enclosed by brackets [] replaced by
579.26 your own identifying information:
580.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/spi/designer/Decoration.java Fri Jul 16 11:47:36 2010 -0400
580.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/spi/designer/Decoration.java Fri Jul 16 14:21:50 2010 -0400
580.3 @@ -1,7 +1,10 @@
580.4 /*
580.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
580.6 *
580.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
580.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
580.9 + *
580.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
580.11 + * Other names may be trademarks of their respective owners.
580.12 *
580.13 * The contents of this file are subject to the terms of either the GNU
580.14 * General Public License Version 2 only ("GPL") or the Common
580.15 @@ -13,9 +16,9 @@
580.16 * specific language governing permissions and limitations under the
580.17 * License. When distributing the software, include this License Header
580.18 * Notice in each file and include the License file at
580.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
580.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
580.21 * particular file as subject to the "Classpath" exception as provided
580.22 - * by Sun in the GPL Version 2 section of the License file that
580.23 + * by Oracle in the GPL Version 2 section of the License file that
580.24 * accompanied this code. If applicable, add the following below the
580.25 * License Header, with the fields enclosed by brackets [] replaced by
580.26 * your own identifying information:
581.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/spi/designer/DecorationProvider.java Fri Jul 16 11:47:36 2010 -0400
581.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/spi/designer/DecorationProvider.java Fri Jul 16 14:21:50 2010 -0400
581.3 @@ -1,7 +1,10 @@
581.4 /*
581.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
581.6 *
581.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
581.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
581.9 + *
581.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
581.11 + * Other names may be trademarks of their respective owners.
581.12 *
581.13 * The contents of this file are subject to the terms of either the GNU
581.14 * General Public License Version 2 only ("GPL") or the Common
581.15 @@ -13,9 +16,9 @@
581.16 * specific language governing permissions and limitations under the
581.17 * License. When distributing the software, include this License Header
581.18 * Notice in each file and include the License file at
581.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
581.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
581.21 * particular file as subject to the "Classpath" exception as provided
581.22 - * by Sun in the GPL Version 2 section of the License file that
581.23 + * by Oracle in the GPL Version 2 section of the License file that
581.24 * accompanied this code. If applicable, add the following below the
581.25 * License Header, with the fields enclosed by brackets [] replaced by
581.26 * your own identifying information:
582.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/DesignerCaret.java Fri Jul 16 11:47:36 2010 -0400
582.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/DesignerCaret.java Fri Jul 16 14:21:50 2010 -0400
582.3 @@ -1,7 +1,10 @@
582.4 /*
582.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
582.6 *
582.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
582.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
582.9 + *
582.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
582.11 + * Other names may be trademarks of their respective owners.
582.12 *
582.13 * The contents of this file are subject to the terms of either the GNU
582.14 * General Public License Version 2 only ("GPL") or the Common
582.15 @@ -13,9 +16,9 @@
582.16 * specific language governing permissions and limitations under the
582.17 * License. When distributing the software, include this License Header
582.18 * Notice in each file and include the License file at
582.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
582.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
582.21 * particular file as subject to the "Classpath" exception as provided
582.22 - * by Sun in the GPL Version 2 section of the License file that
582.23 + * by Oracle in the GPL Version 2 section of the License file that
582.24 * accompanied this code. If applicable, add the following below the
582.25 * License Header, with the fields enclosed by brackets [] replaced by
582.26 * your own identifying information:
583.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/DesignerPaneBase.java Fri Jul 16 11:47:36 2010 -0400
583.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/DesignerPaneBase.java Fri Jul 16 14:21:50 2010 -0400
583.3 @@ -1,7 +1,10 @@
583.4 /*
583.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
583.6 *
583.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
583.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
583.9 + *
583.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
583.11 + * Other names may be trademarks of their respective owners.
583.12 *
583.13 * The contents of this file are subject to the terms of either the GNU
583.14 * General Public License Version 2 only ("GPL") or the Common
583.15 @@ -13,9 +16,9 @@
583.16 * specific language governing permissions and limitations under the
583.17 * License. When distributing the software, include this License Header
583.18 * Notice in each file and include the License file at
583.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
583.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
583.21 * particular file as subject to the "Classpath" exception as provided
583.22 - * by Sun in the GPL Version 2 section of the License file that
583.23 + * by Oracle in the GPL Version 2 section of the License file that
583.24 * accompanied this code. If applicable, add the following below the
583.25 * License Header, with the fields enclosed by brackets [] replaced by
583.26 * your own identifying information:
584.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/DesignerPaneBaseUI.java Fri Jul 16 11:47:36 2010 -0400
584.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/DesignerPaneBaseUI.java Fri Jul 16 14:21:50 2010 -0400
584.3 @@ -1,7 +1,10 @@
584.4 /*
584.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
584.6 *
584.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
584.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
584.9 + *
584.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
584.11 + * Other names may be trademarks of their respective owners.
584.12 *
584.13 * The contents of this file are subject to the terms of either the GNU
584.14 * General Public License Version 2 only ("GPL") or the Common
584.15 @@ -13,9 +16,9 @@
584.16 * specific language governing permissions and limitations under the
584.17 * License. When distributing the software, include this License Header
584.18 * Notice in each file and include the License file at
584.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
584.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
584.21 * particular file as subject to the "Classpath" exception as provided
584.22 - * by Sun in the GPL Version 2 section of the License file that
584.23 + * by Oracle in the GPL Version 2 section of the License file that
584.24 * accompanied this code. If applicable, add the following below the
584.25 * License Header, with the fields enclosed by brackets [] replaced by
584.26 * your own identifying information:
585.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/BeginLineAction.java Fri Jul 16 11:47:36 2010 -0400
585.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/BeginLineAction.java Fri Jul 16 14:21:50 2010 -0400
585.3 @@ -1,7 +1,10 @@
585.4 /*
585.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
585.6 *
585.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
585.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
585.9 + *
585.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
585.11 + * Other names may be trademarks of their respective owners.
585.12 *
585.13 * The contents of this file are subject to the terms of either the GNU
585.14 * General Public License Version 2 only ("GPL") or the Common
585.15 @@ -13,9 +16,9 @@
585.16 * specific language governing permissions and limitations under the
585.17 * License. When distributing the software, include this License Header
585.18 * Notice in each file and include the License file at
585.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
585.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
585.21 * particular file as subject to the "Classpath" exception as provided
585.22 - * by Sun in the GPL Version 2 section of the License file that
585.23 + * by Oracle in the GPL Version 2 section of the License file that
585.24 * accompanied this code. If applicable, add the following below the
585.25 * License Header, with the fields enclosed by brackets [] replaced by
585.26 * your own identifying information:
586.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/BeginWordAction.java Fri Jul 16 11:47:36 2010 -0400
586.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/BeginWordAction.java Fri Jul 16 14:21:50 2010 -0400
586.3 @@ -1,7 +1,10 @@
586.4 /*
586.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
586.6 *
586.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
586.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
586.9 + *
586.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
586.11 + * Other names may be trademarks of their respective owners.
586.12 *
586.13 * The contents of this file are subject to the terms of either the GNU
586.14 * General Public License Version 2 only ("GPL") or the Common
586.15 @@ -13,9 +16,9 @@
586.16 * specific language governing permissions and limitations under the
586.17 * License. When distributing the software, include this License Header
586.18 * Notice in each file and include the License file at
586.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
586.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
586.21 * particular file as subject to the "Classpath" exception as provided
586.22 - * by Sun in the GPL Version 2 section of the License file that
586.23 + * by Oracle in the GPL Version 2 section of the License file that
586.24 * accompanied this code. If applicable, add the following below the
586.25 * License Header, with the fields enclosed by brackets [] replaced by
586.26 * your own identifying information:
587.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/DefaultKeyTypedAction.java Fri Jul 16 11:47:36 2010 -0400
587.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/DefaultKeyTypedAction.java Fri Jul 16 14:21:50 2010 -0400
587.3 @@ -1,7 +1,10 @@
587.4 /*
587.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
587.6 *
587.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
587.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
587.9 + *
587.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
587.11 + * Other names may be trademarks of their respective owners.
587.12 *
587.13 * The contents of this file are subject to the terms of either the GNU
587.14 * General Public License Version 2 only ("GPL") or the Common
587.15 @@ -13,9 +16,9 @@
587.16 * specific language governing permissions and limitations under the
587.17 * License. When distributing the software, include this License Header
587.18 * Notice in each file and include the License file at
587.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
587.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
587.21 * particular file as subject to the "Classpath" exception as provided
587.22 - * by Sun in the GPL Version 2 section of the License file that
587.23 + * by Oracle in the GPL Version 2 section of the License file that
587.24 * accompanied this code. If applicable, add the following below the
587.25 * License Header, with the fields enclosed by brackets [] replaced by
587.26 * your own identifying information:
588.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/DeleteNextCharAction.java Fri Jul 16 11:47:36 2010 -0400
588.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/DeleteNextCharAction.java Fri Jul 16 14:21:50 2010 -0400
588.3 @@ -1,7 +1,10 @@
588.4 /*
588.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
588.6 *
588.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
588.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
588.9 + *
588.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
588.11 + * Other names may be trademarks of their respective owners.
588.12 *
588.13 * The contents of this file are subject to the terms of either the GNU
588.14 * General Public License Version 2 only ("GPL") or the Common
588.15 @@ -13,9 +16,9 @@
588.16 * specific language governing permissions and limitations under the
588.17 * License. When distributing the software, include this License Header
588.18 * Notice in each file and include the License file at
588.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
588.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
588.21 * particular file as subject to the "Classpath" exception as provided
588.22 - * by Sun in the GPL Version 2 section of the License file that
588.23 + * by Oracle in the GPL Version 2 section of the License file that
588.24 * accompanied this code. If applicable, add the following below the
588.25 * License Header, with the fields enclosed by brackets [] replaced by
588.26 * your own identifying information:
589.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/DeletePrevCharAction.java Fri Jul 16 11:47:36 2010 -0400
589.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/DeletePrevCharAction.java Fri Jul 16 14:21:50 2010 -0400
589.3 @@ -1,7 +1,10 @@
589.4 /*
589.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
589.6 *
589.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
589.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
589.9 + *
589.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
589.11 + * Other names may be trademarks of their respective owners.
589.12 *
589.13 * The contents of this file are subject to the terms of either the GNU
589.14 * General Public License Version 2 only ("GPL") or the Common
589.15 @@ -13,9 +16,9 @@
589.16 * specific language governing permissions and limitations under the
589.17 * License. When distributing the software, include this License Header
589.18 * Notice in each file and include the License file at
589.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
589.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
589.21 * particular file as subject to the "Classpath" exception as provided
589.22 - * by Sun in the GPL Version 2 section of the License file that
589.23 + * by Oracle in the GPL Version 2 section of the License file that
589.24 * accompanied this code. If applicable, add the following below the
589.25 * License Header, with the fields enclosed by brackets [] replaced by
589.26 * your own identifying information:
590.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/EndLineAction.java Fri Jul 16 11:47:36 2010 -0400
590.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/EndLineAction.java Fri Jul 16 14:21:50 2010 -0400
590.3 @@ -1,7 +1,10 @@
590.4 /*
590.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
590.6 *
590.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
590.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
590.9 + *
590.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
590.11 + * Other names may be trademarks of their respective owners.
590.12 *
590.13 * The contents of this file are subject to the terms of either the GNU
590.14 * General Public License Version 2 only ("GPL") or the Common
590.15 @@ -13,9 +16,9 @@
590.16 * specific language governing permissions and limitations under the
590.17 * License. When distributing the software, include this License Header
590.18 * Notice in each file and include the License file at
590.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
590.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
590.21 * particular file as subject to the "Classpath" exception as provided
590.22 - * by Sun in the GPL Version 2 section of the License file that
590.23 + * by Oracle in the GPL Version 2 section of the License file that
590.24 * accompanied this code. If applicable, add the following below the
590.25 * License Header, with the fields enclosed by brackets [] replaced by
590.26 * your own identifying information:
591.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/EndWordAction.java Fri Jul 16 11:47:36 2010 -0400
591.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/EndWordAction.java Fri Jul 16 14:21:50 2010 -0400
591.3 @@ -1,7 +1,10 @@
591.4 /*
591.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
591.6 *
591.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
591.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
591.9 + *
591.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
591.11 + * Other names may be trademarks of their respective owners.
591.12 *
591.13 * The contents of this file are subject to the terms of either the GNU
591.14 * General Public License Version 2 only ("GPL") or the Common
591.15 @@ -13,9 +16,9 @@
591.16 * specific language governing permissions and limitations under the
591.17 * License. When distributing the software, include this License Header
591.18 * Notice in each file and include the License file at
591.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
591.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
591.21 * particular file as subject to the "Classpath" exception as provided
591.22 - * by Sun in the GPL Version 2 section of the License file that
591.23 + * by Oracle in the GPL Version 2 section of the License file that
591.24 * accompanied this code. If applicable, add the following below the
591.25 * License Header, with the fields enclosed by brackets [] replaced by
591.26 * your own identifying information:
592.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/NextVisualPositionAction.java Fri Jul 16 11:47:36 2010 -0400
592.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/NextVisualPositionAction.java Fri Jul 16 14:21:50 2010 -0400
592.3 @@ -1,7 +1,10 @@
592.4 /*
592.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
592.6 *
592.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
592.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
592.9 + *
592.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
592.11 + * Other names may be trademarks of their respective owners.
592.12 *
592.13 * The contents of this file are subject to the terms of either the GNU
592.14 * General Public License Version 2 only ("GPL") or the Common
592.15 @@ -13,9 +16,9 @@
592.16 * specific language governing permissions and limitations under the
592.17 * License. When distributing the software, include this License Header
592.18 * Notice in each file and include the License file at
592.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
592.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
592.21 * particular file as subject to the "Classpath" exception as provided
592.22 - * by Sun in the GPL Version 2 section of the License file that
592.23 + * by Oracle in the GPL Version 2 section of the License file that
592.24 * accompanied this code. If applicable, add the following below the
592.25 * License Header, with the fields enclosed by brackets [] replaced by
592.26 * your own identifying information:
593.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/SelectAllAction.java Fri Jul 16 11:47:36 2010 -0400
593.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/SelectAllAction.java Fri Jul 16 14:21:50 2010 -0400
593.3 @@ -1,7 +1,10 @@
593.4 /*
593.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
593.6 *
593.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
593.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
593.9 + *
593.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
593.11 + * Other names may be trademarks of their respective owners.
593.12 *
593.13 * The contents of this file are subject to the terms of either the GNU
593.14 * General Public License Version 2 only ("GPL") or the Common
593.15 @@ -13,9 +16,9 @@
593.16 * specific language governing permissions and limitations under the
593.17 * License. When distributing the software, include this License Header
593.18 * Notice in each file and include the License file at
593.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
593.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
593.21 * particular file as subject to the "Classpath" exception as provided
593.22 - * by Sun in the GPL Version 2 section of the License file that
593.23 + * by Oracle in the GPL Version 2 section of the License file that
593.24 * accompanied this code. If applicable, add the following below the
593.25 * License Header, with the fields enclosed by brackets [] replaced by
593.26 * your own identifying information:
594.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/SelectLineAction.java Fri Jul 16 11:47:36 2010 -0400
594.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/SelectLineAction.java Fri Jul 16 14:21:50 2010 -0400
594.3 @@ -1,7 +1,10 @@
594.4 /*
594.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
594.6 *
594.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
594.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
594.9 + *
594.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
594.11 + * Other names may be trademarks of their respective owners.
594.12 *
594.13 * The contents of this file are subject to the terms of either the GNU
594.14 * General Public License Version 2 only ("GPL") or the Common
594.15 @@ -13,9 +16,9 @@
594.16 * specific language governing permissions and limitations under the
594.17 * License. When distributing the software, include this License Header
594.18 * Notice in each file and include the License file at
594.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
594.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
594.21 * particular file as subject to the "Classpath" exception as provided
594.22 - * by Sun in the GPL Version 2 section of the License file that
594.23 + * by Oracle in the GPL Version 2 section of the License file that
594.24 * accompanied this code. If applicable, add the following below the
594.25 * License Header, with the fields enclosed by brackets [] replaced by
594.26 * your own identifying information:
595.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/SelectWordAction.java Fri Jul 16 11:47:36 2010 -0400
595.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/SelectWordAction.java Fri Jul 16 14:21:50 2010 -0400
595.3 @@ -1,7 +1,10 @@
595.4 /*
595.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
595.6 *
595.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
595.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
595.9 + *
595.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
595.11 + * Other names may be trademarks of their respective owners.
595.12 *
595.13 * The contents of this file are subject to the terms of either the GNU
595.14 * General Public License Version 2 only ("GPL") or the Common
595.15 @@ -13,9 +16,9 @@
595.16 * specific language governing permissions and limitations under the
595.17 * License. When distributing the software, include this License Header
595.18 * Notice in each file and include the License file at
595.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
595.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
595.21 * particular file as subject to the "Classpath" exception as provided
595.22 - * by Sun in the GPL Version 2 section of the License file that
595.23 + * by Oracle in the GPL Version 2 section of the License file that
595.24 * accompanied this code. If applicable, add the following below the
595.25 * License Header, with the fields enclosed by brackets [] replaced by
595.26 * your own identifying information:
596.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/TextAction.java Fri Jul 16 11:47:36 2010 -0400
596.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/text/actions/TextAction.java Fri Jul 16 14:21:50 2010 -0400
596.3 @@ -1,7 +1,10 @@
596.4 /*
596.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
596.6 *
596.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
596.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
596.9 + *
596.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
596.11 + * Other names may be trademarks of their respective owners.
596.12 *
596.13 * The contents of this file are subject to the terms of either the GNU
596.14 * General Public License Version 2 only ("GPL") or the Common
596.15 @@ -13,9 +16,9 @@
596.16 * specific language governing permissions and limitations under the
596.17 * License. When distributing the software, include this License Header
596.18 * Notice in each file and include the License file at
596.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
596.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
596.21 * particular file as subject to the "Classpath" exception as provided
596.22 - * by Sun in the GPL Version 2 section of the License file that
596.23 + * by Oracle in the GPL Version 2 section of the License file that
596.24 * accompanied this code. If applicable, add the following below the
596.25 * License Header, with the fields enclosed by brackets [] replaced by
596.26 * your own identifying information:
597.1 --- a/visualweb.designer/test/unit/src/org/netbeans/modules/visualweb/designer/Util.java Fri Jul 16 11:47:36 2010 -0400
597.2 +++ b/visualweb.designer/test/unit/src/org/netbeans/modules/visualweb/designer/Util.java Fri Jul 16 14:21:50 2010 -0400
597.3 @@ -1,8 +1,11 @@
597.4 /*
597.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
597.6 - *
597.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
597.8 - *
597.9 + *
597.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
597.11 + *
597.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
597.13 + * Other names may be trademarks of their respective owners.
597.14 + *
597.15 * The contents of this file are subject to the terms of either the GNU
597.16 * General Public License Version 2 only ("GPL") or the Common
597.17 * Development and Distribution License("CDDL") (collectively, the
597.18 @@ -13,9 +16,9 @@
597.19 * specific language governing permissions and limitations under the
597.20 * License. When distributing the software, include this License Header
597.21 * Notice in each file and include the License file at
597.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
597.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
597.24 * particular file as subject to the "Classpath" exception as provided
597.25 - * by Sun in the GPL Version 2 section of the License file that
597.26 + * by Oracle in the GPL Version 2 section of the License file that
597.27 * accompanied this code. If applicable, add the following below the
597.28 * License Header, with the fields enclosed by brackets [] replaced by
597.29 * your own identifying information:
598.1 --- a/visualweb.designer/test/unit/src/org/netbeans/modules/visualweb/designer/WebFormTest.java Fri Jul 16 11:47:36 2010 -0400
598.2 +++ b/visualweb.designer/test/unit/src/org/netbeans/modules/visualweb/designer/WebFormTest.java Fri Jul 16 14:21:50 2010 -0400
598.3 @@ -1,8 +1,11 @@
598.4 /*
598.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
598.6 - *
598.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
598.8 - *
598.9 + *
598.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
598.11 + *
598.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
598.13 + * Other names may be trademarks of their respective owners.
598.14 + *
598.15 * The contents of this file are subject to the terms of either the GNU
598.16 * General Public License Version 2 only ("GPL") or the Common
598.17 * Development and Distribution License("CDDL") (collectively, the
598.18 @@ -13,9 +16,9 @@
598.19 * specific language governing permissions and limitations under the
598.20 * License. When distributing the software, include this License Header
598.21 * Notice in each file and include the License file at
598.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
598.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
598.24 * particular file as subject to the "Classpath" exception as provided
598.25 - * by Sun in the GPL Version 2 section of the License file that
598.26 + * by Oracle in the GPL Version 2 section of the License file that
598.27 * accompanied this code. If applicable, add the following below the
598.28 * License Header, with the fields enclosed by brackets [] replaced by
598.29 * your own identifying information:
599.1 --- a/visualweb.designtime.base/build.xml Fri Jul 16 11:47:36 2010 -0400
599.2 +++ b/visualweb.designtime.base/build.xml Fri Jul 16 14:21:50 2010 -0400
599.3 @@ -2,7 +2,10 @@
599.4 <!--
599.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
599.6
599.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
599.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
599.9 +
599.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
599.11 +Other names may be trademarks of their respective owners.
599.12
599.13
599.14 The contents of this file are subject to the terms of either the GNU
599.15 @@ -15,9 +18,9 @@
599.16 specific language governing permissions and limitations under the
599.17 License. When distributing the software, include this License Header
599.18 Notice in each file and include the License file at
599.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
599.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
599.21 particular file as subject to the "Classpath" exception as provided
599.22 -by Sun in the GPL Version 2 section of the License file that
599.23 +by Oracle in the GPL Version 2 section of the License file that
599.24 accompanied this code. If applicable, add the following below the
599.25 License Header, with the fields enclosed by brackets [] replaced by
599.26 your own identifying information:
600.1 --- a/visualweb.designtime.base/library/build.xml Fri Jul 16 11:47:36 2010 -0400
600.2 +++ b/visualweb.designtime.base/library/build.xml Fri Jul 16 14:21:50 2010 -0400
600.3 @@ -2,7 +2,10 @@
600.4 <!--
600.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
600.6
600.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
600.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
600.9 +
600.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
600.11 +Other names may be trademarks of their respective owners.
600.12
600.13
600.14 The contents of this file are subject to the terms of either the GNU
600.15 @@ -15,9 +18,9 @@
600.16 specific language governing permissions and limitations under the
600.17 License. When distributing the software, include this License Header
600.18 Notice in each file and include the License file at
600.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
600.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
600.21 particular file as subject to the "Classpath" exception as provided
600.22 -by Sun in the GPL Version 2 section of the License file that
600.23 +by Oracle in the GPL Version 2 section of the License file that
600.24 accompanied this code. If applicable, add the following below the
600.25 License Header, with the fields enclosed by brackets [] replaced by
600.26 your own identifying information:
601.1 --- a/visualweb.designtime.base/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
601.2 +++ b/visualweb.designtime.base/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
601.3 @@ -1,6 +1,9 @@
601.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
601.5 #
601.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
601.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
601.8 +#
601.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
601.10 +# Other names may be trademarks of their respective owners.
601.11 #
601.12 # The contents of this file are subject to the terms of either the GNU
601.13 # General Public License Version 2 only ("GPL") or the Common
601.14 @@ -12,9 +15,9 @@
601.15 # specific language governing permissions and limitations under the
601.16 # License. When distributing the software, include this License Header
601.17 # Notice in each file and include the License file at
601.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
601.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
601.20 # particular file as subject to the "Classpath" exception as provided
601.21 -# by Sun in the GPL Version 2 section of the License file that
601.22 +# by Oracle in the GPL Version 2 section of the License file that
601.23 # accompanied this code. If applicable, add the following below the
601.24 # License Header, with the fields enclosed by brackets [] replaced by
601.25 # your own identifying information:
601.26 @@ -62,13 +65,13 @@
601.27 #file.reference.jsf-api.jar=../../../ravelibs/jsf-api/release/modules/ext/jsf-api.jar
601.28
601.29 # Have JSF1.2 API, JSP & Servlet API
601.30 -file.reference.servlet2.5-jsp2.1-api.jar=../../servletjspapi/external/servlet2.5-jsp2.1-api.jar
601.31 -file.reference.jsf-api.jar=../../nbbuild/netbeans/enterprise6/modules/ext/jsf-1_2/jsf-api.jar
601.32 +file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
601.33 +file.reference.jsf-api.jar=../../nbbuild/netbeans/enterprise/modules/ext/jsf-1_2/jsf-api.jar
601.34
601.35 includes=**
601.36 jar.compress=false
601.37 javac.classpath=\
601.38 - ${file.reference.servlet2.5-jsp2.1-api.jar}:\
601.39 + ${file.reference.servlet3.0-jsp2.2-api.jar}:\
601.40 ${file.reference.jsf-api.jar}:\
601.41 ${file.reference.designtime.jar}
601.42
601.43 @@ -87,7 +90,7 @@
601.44 javadoc.author=false
601.45 javadoc.encoding=
601.46 javadoc.noindex=false
601.47 -javadoc.nonavbar=false
601.48 +javadoc.nonavbar=fals
601.49 javadoc.notree=false
601.50 javadoc.private=false
601.51 javadoc.splitindex=true
602.1 --- a/visualweb.designtime.base/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
602.2 +++ b/visualweb.designtime.base/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
602.3 @@ -2,7 +2,10 @@
602.4 <!--
602.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
602.6
602.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
602.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
602.9 +
602.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
602.11 +Other names may be trademarks of their respective owners.
602.12
602.13
602.14 The contents of this file are subject to the terms of either the GNU
602.15 @@ -15,9 +18,9 @@
602.16 specific language governing permissions and limitations under the
602.17 License. When distributing the software, include this License Header
602.18 Notice in each file and include the License file at
602.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
602.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
602.21 particular file as subject to the "Classpath" exception as provided
602.22 -by Sun in the GPL Version 2 section of the License file that
602.23 +by Oracle in the GPL Version 2 section of the License file that
602.24 accompanied this code. If applicable, add the following below the
602.25 License Header, with the fields enclosed by brackets [] replaced by
602.26 your own identifying information:
603.1 --- a/visualweb.designtime.base/library/src/com/sun/rave/designtime/base/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
603.2 +++ b/visualweb.designtime.base/library/src/com/sun/rave/designtime/base/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
603.3 @@ -1,6 +1,9 @@
603.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
603.5 #
603.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
603.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
603.8 +#
603.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
603.10 +# Other names may be trademarks of their respective owners.
603.11 #
603.12 # The contents of this file are subject to the terms of either the GNU
603.13 # General Public License Version 2 only ("GPL") or the Common
603.14 @@ -12,9 +15,9 @@
603.15 # specific language governing permissions and limitations under the
603.16 # License. When distributing the software, include this License Header
603.17 # Notice in each file and include the License file at
603.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
603.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
603.20 # particular file as subject to the "Classpath" exception as provided
603.21 -# by Sun in the GPL Version 2 section of the License file that
603.22 +# by Oracle in the GPL Version 2 section of the License file that
603.23 # accompanied this code. If applicable, add the following below the
603.24 # License Header, with the fields enclosed by brackets [] replaced by
603.25 # your own identifying information:
604.1 --- a/visualweb.designtime.base/library/src/com/sun/rave/designtime/base/CategoryDescriptors.java Fri Jul 16 11:47:36 2010 -0400
604.2 +++ b/visualweb.designtime.base/library/src/com/sun/rave/designtime/base/CategoryDescriptors.java Fri Jul 16 14:21:50 2010 -0400
604.3 @@ -1,7 +1,10 @@
604.4 /*
604.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
604.6 *
604.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
604.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
604.9 + *
604.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
604.11 + * Other names may be trademarks of their respective owners.
604.12 *
604.13 * The contents of this file are subject to the terms of either the GNU
604.14 * General Public License Version 2 only ("GPL") or the Common
604.15 @@ -13,9 +16,9 @@
604.16 * specific language governing permissions and limitations under the
604.17 * License. When distributing the software, include this License Header
604.18 * Notice in each file and include the License file at
604.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
604.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
604.21 * particular file as subject to the "Classpath" exception as provided
604.22 - * by Sun in the GPL Version 2 section of the License file that
604.23 + * by Oracle in the GPL Version 2 section of the License file that
604.24 * accompanied this code. If applicable, add the following below the
604.25 * License Header, with the fields enclosed by brackets [] replaced by
604.26 * your own identifying information:
605.1 --- a/visualweb.designtime.base/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
605.2 +++ b/visualweb.designtime.base/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
605.3 @@ -1,6 +1,9 @@
605.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
605.5 #
605.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
605.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
605.8 +#
605.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
605.10 +# Other names may be trademarks of their respective owners.
605.11 #
605.12 # The contents of this file are subject to the terms of either the GNU
605.13 # General Public License Version 2 only ("GPL") or the Common
605.14 @@ -12,9 +15,9 @@
605.15 # specific language governing permissions and limitations under the
605.16 # License. When distributing the software, include this License Header
605.17 # Notice in each file and include the License file at
605.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
605.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
605.20 # particular file as subject to the "Classpath" exception as provided
605.21 -# by Sun in the GPL Version 2 section of the License file that
605.22 +# by Oracle in the GPL Version 2 section of the License file that
605.23 # accompanied this code. If applicable, add the following below the
605.24 # License Header, with the fields enclosed by brackets [] replaced by
605.25 # your own identifying information:
606.1 --- a/visualweb.designtime.base/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
606.2 +++ b/visualweb.designtime.base/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
606.3 @@ -2,7 +2,10 @@
606.4 <!--
606.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
606.6
606.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
606.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
606.9 +
606.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
606.11 +Other names may be trademarks of their respective owners.
606.12
606.13
606.14 The contents of this file are subject to the terms of either the GNU
606.15 @@ -15,9 +18,9 @@
606.16 specific language governing permissions and limitations under the
606.17 License. When distributing the software, include this License Header
606.18 Notice in each file and include the License file at
606.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
606.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
606.21 particular file as subject to the "Classpath" exception as provided
606.22 -by Sun in the GPL Version 2 section of the License file that
606.23 +by Oracle in the GPL Version 2 section of the License file that
606.24 accompanied this code. If applicable, add the following below the
606.25 License Header, with the fields enclosed by brackets [] replaced by
606.26 your own identifying information:
607.1 --- a/visualweb.designtime.base/src/org/netbeans/modules/visualweb/designtime/base/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
607.2 +++ b/visualweb.designtime.base/src/org/netbeans/modules/visualweb/designtime/base/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
607.3 @@ -1,6 +1,9 @@
607.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
607.5 #
607.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
607.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
607.8 +#
607.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
607.10 +# Other names may be trademarks of their respective owners.
607.11 #
607.12 # The contents of this file are subject to the terms of either the GNU
607.13 # General Public License Version 2 only ("GPL") or the Common
607.14 @@ -12,9 +15,9 @@
607.15 # specific language governing permissions and limitations under the
607.16 # License. When distributing the software, include this License Header
607.17 # Notice in each file and include the License file at
607.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
607.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
607.20 # particular file as subject to the "Classpath" exception as provided
607.21 -# by Sun in the GPL Version 2 section of the License file that
607.22 +# by Oracle in the GPL Version 2 section of the License file that
607.23 # accompanied this code. If applicable, add the following below the
607.24 # License Header, with the fields enclosed by brackets [] replaced by
607.25 # your own identifying information:
608.1 --- a/visualweb.designtime.idebridge/build.xml Fri Jul 16 11:47:36 2010 -0400
608.2 +++ b/visualweb.designtime.idebridge/build.xml Fri Jul 16 14:21:50 2010 -0400
608.3 @@ -2,7 +2,10 @@
608.4 <!--
608.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
608.6
608.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
608.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
608.9 +
608.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
608.11 +Other names may be trademarks of their respective owners.
608.12
608.13
608.14 The contents of this file are subject to the terms of either the GNU
608.15 @@ -15,9 +18,9 @@
608.16 specific language governing permissions and limitations under the
608.17 License. When distributing the software, include this License Header
608.18 Notice in each file and include the License file at
608.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
608.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
608.21 particular file as subject to the "Classpath" exception as provided
608.22 -by Sun in the GPL Version 2 section of the License file that
608.23 +by Oracle in the GPL Version 2 section of the License file that
608.24 accompanied this code. If applicable, add the following below the
608.25 License Header, with the fields enclosed by brackets [] replaced by
608.26 your own identifying information:
609.1 --- a/visualweb.designtime.idebridge/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
609.2 +++ b/visualweb.designtime.idebridge/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
609.3 @@ -1,6 +1,9 @@
609.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
609.5 #
609.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
609.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
609.8 +#
609.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
609.10 +# Other names may be trademarks of their respective owners.
609.11 #
609.12 # The contents of this file are subject to the terms of either the GNU
609.13 # General Public License Version 2 only ("GPL") or the Common
609.14 @@ -12,9 +15,9 @@
609.15 # specific language governing permissions and limitations under the
609.16 # License. When distributing the software, include this License Header
609.17 # Notice in each file and include the License file at
609.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
609.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
609.20 # particular file as subject to the "Classpath" exception as provided
609.21 -# by Sun in the GPL Version 2 section of the License file that
609.22 +# by Oracle in the GPL Version 2 section of the License file that
609.23 # accompanied this code. If applicable, add the following below the
609.24 # License Header, with the fields enclosed by brackets [] replaced by
609.25 # your own identifying information:
609.26 @@ -38,4 +41,4 @@
609.27 # made subject to such option by the copyright holder.
609.28
609.29 javac.compilerargs=-Xlint:unchecked
609.30 -javac.source=1.5
609.31 +javac.source=1.6
610.1 --- a/visualweb.designtime.idebridge/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
610.2 +++ b/visualweb.designtime.idebridge/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
610.3 @@ -2,7 +2,10 @@
610.4 <!--
610.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
610.6
610.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
610.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
610.9 +
610.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
610.11 +Other names may be trademarks of their respective owners.
610.12
610.13
610.14 The contents of this file are subject to the terms of either the GNU
610.15 @@ -15,9 +18,9 @@
610.16 specific language governing permissions and limitations under the
610.17 License. When distributing the software, include this License Header
610.18 Notice in each file and include the License file at
610.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
610.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
610.21 particular file as subject to the "Classpath" exception as provided
610.22 -by Sun in the GPL Version 2 section of the License file that
610.23 +by Oracle in the GPL Version 2 section of the License file that
610.24 accompanied this code. If applicable, add the following below the
610.25 License Header, with the fields enclosed by brackets [] replaced by
610.26 your own identifying information:
610.27 @@ -77,7 +80,15 @@
610.28 <build-prerequisite/>
610.29 <compile-dependency/>
610.30 <run-dependency>
610.31 - <specification-version>6.8</specification-version>
610.32 + <specification-version>8.0</specification-version>
610.33 + </run-dependency>
610.34 + </dependency>
610.35 + <dependency>
610.36 + <code-name-base>org.openide.util.lookup</code-name-base>
610.37 + <build-prerequisite/>
610.38 + <compile-dependency/>
610.39 + <run-dependency>
610.40 + <specification-version>8.0</specification-version>
610.41 </run-dependency>
610.42 </dependency>
610.43 </module-dependencies>
611.1 --- a/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/api/designtime/idebridge/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
611.2 +++ b/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/api/designtime/idebridge/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
611.3 @@ -1,7 +1,10 @@
611.4 #
611.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
611.6 #
611.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
611.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
611.9 +#
611.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
611.11 +# Other names may be trademarks of their respective owners.
611.12 #
611.13 # The contents of this file are subject to the terms of either the GNU
611.14 # General Public License Version 2 only ("GPL") or the Common
611.15 @@ -13,9 +16,9 @@
611.16 # specific language governing permissions and limitations under the
611.17 # License. When distributing the software, include this License Header
611.18 # Notice in each file and include the License file at
611.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
611.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
611.21 # particular file as subject to the "Classpath" exception as provided
611.22 -# by Sun in the GPL Version 2 section of the License file that
611.23 +# by Oracle in the GPL Version 2 section of the License file that
611.24 # accompanied this code. If applicable, add the following below the
611.25 # License Header, with the fields enclosed by brackets [] replaced by
611.26 # your own identifying information:
612.1 --- a/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/api/designtime/idebridge/DesigntimeIdeBridge.java Fri Jul 16 11:47:36 2010 -0400
612.2 +++ b/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/api/designtime/idebridge/DesigntimeIdeBridge.java Fri Jul 16 14:21:50 2010 -0400
612.3 @@ -1,7 +1,10 @@
612.4 /*
612.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
612.6 *
612.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
612.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
612.9 + *
612.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
612.11 + * Other names may be trademarks of their respective owners.
612.12 *
612.13 * The contents of this file are subject to the terms of either the GNU
612.14 * General Public License Version 2 only ("GPL") or the Common
612.15 @@ -13,9 +16,9 @@
612.16 * specific language governing permissions and limitations under the
612.17 * License. When distributing the software, include this License Header
612.18 * Notice in each file and include the License file at
612.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
612.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
612.21 * particular file as subject to the "Classpath" exception as provided
612.22 - * by Sun in the GPL Version 2 section of the License file that
612.23 + * by Oracle in the GPL Version 2 section of the License file that
612.24 * accompanied this code. If applicable, add the following below the
612.25 * License Header, with the fields enclosed by brackets [] replaced by
612.26 * your own identifying information:
613.1 --- a/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/api/designtime/idebridge/DesigntimeIdeBridgeProvider.java Fri Jul 16 11:47:36 2010 -0400
613.2 +++ b/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/api/designtime/idebridge/DesigntimeIdeBridgeProvider.java Fri Jul 16 14:21:50 2010 -0400
613.3 @@ -1,7 +1,10 @@
613.4 /*
613.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
613.6 *
613.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
613.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
613.9 + *
613.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
613.11 + * Other names may be trademarks of their respective owners.
613.12 *
613.13 * The contents of this file are subject to the terms of either the GNU
613.14 * General Public License Version 2 only ("GPL") or the Common
613.15 @@ -13,9 +16,9 @@
613.16 * specific language governing permissions and limitations under the
613.17 * License. When distributing the software, include this License Header
613.18 * Notice in each file and include the License file at
613.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
613.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
613.21 * particular file as subject to the "Classpath" exception as provided
613.22 - * by Sun in the GPL Version 2 section of the License file that
613.23 + * by Oracle in the GPL Version 2 section of the License file that
613.24 * accompanied this code. If applicable, add the following below the
613.25 * License Header, with the fields enclosed by brackets [] replaced by
613.26 * your own identifying information:
614.1 --- a/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/designtime/idebridge/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
614.2 +++ b/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/designtime/idebridge/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
614.3 @@ -1,6 +1,9 @@
614.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
614.5 #
614.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
614.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
614.8 +#
614.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
614.10 +# Other names may be trademarks of their respective owners.
614.11 #
614.12 # The contents of this file are subject to the terms of either the GNU
614.13 # General Public License Version 2 only ("GPL") or the Common
614.14 @@ -12,9 +15,9 @@
614.15 # specific language governing permissions and limitations under the
614.16 # License. When distributing the software, include this License Header
614.17 # Notice in each file and include the License file at
614.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
614.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
614.20 # particular file as subject to the "Classpath" exception as provided
614.21 -# by Sun in the GPL Version 2 section of the License file that
614.22 +# by Oracle in the GPL Version 2 section of the License file that
614.23 # accompanied this code. If applicable, add the following below the
614.24 # License Header, with the fields enclosed by brackets [] replaced by
614.25 # your own identifying information:
615.1 --- a/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/spi/designtime/idebridge/action/AbstractDesignBeanAction.java Fri Jul 16 11:47:36 2010 -0400
615.2 +++ b/visualweb.designtime.idebridge/src/org/netbeans/modules/visualweb/spi/designtime/idebridge/action/AbstractDesignBeanAction.java Fri Jul 16 14:21:50 2010 -0400
615.3 @@ -1,7 +1,10 @@
615.4 /*
615.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
615.6 *
615.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
615.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
615.9 + *
615.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
615.11 + * Other names may be trademarks of their respective owners.
615.12 *
615.13 * The contents of this file are subject to the terms of either the GNU
615.14 * General Public License Version 2 only ("GPL") or the Common
615.15 @@ -13,9 +16,9 @@
615.16 * specific language governing permissions and limitations under the
615.17 * License. When distributing the software, include this License Header
615.18 * Notice in each file and include the License file at
615.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
615.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
615.21 * particular file as subject to the "Classpath" exception as provided
615.22 - * by Sun in the GPL Version 2 section of the License file that
615.23 + * by Oracle in the GPL Version 2 section of the License file that
615.24 * accompanied this code. If applicable, add the following below the
615.25 * License Header, with the fields enclosed by brackets [] replaced by
615.26 * your own identifying information:
616.1 --- a/visualweb.designtime/build.xml Fri Jul 16 11:47:36 2010 -0400
616.2 +++ b/visualweb.designtime/build.xml Fri Jul 16 14:21:50 2010 -0400
616.3 @@ -2,7 +2,10 @@
616.4 <!--
616.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
616.6
616.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
616.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
616.9 +
616.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
616.11 +Other names may be trademarks of their respective owners.
616.12
616.13
616.14 The contents of this file are subject to the terms of either the GNU
616.15 @@ -15,9 +18,9 @@
616.16 specific language governing permissions and limitations under the
616.17 License. When distributing the software, include this License Header
616.18 Notice in each file and include the License file at
616.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
616.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
616.21 particular file as subject to the "Classpath" exception as provided
616.22 -by Sun in the GPL Version 2 section of the License file that
616.23 +by Oracle in the GPL Version 2 section of the License file that
616.24 accompanied this code. If applicable, add the following below the
616.25 License Header, with the fields enclosed by brackets [] replaced by
616.26 your own identifying information:
617.1 --- a/visualweb.designtime/library/build.xml Fri Jul 16 11:47:36 2010 -0400
617.2 +++ b/visualweb.designtime/library/build.xml Fri Jul 16 14:21:50 2010 -0400
617.3 @@ -2,7 +2,10 @@
617.4 <!--
617.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
617.6
617.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
617.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
617.9 +
617.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
617.11 +Other names may be trademarks of their respective owners.
617.12
617.13
617.14 The contents of this file are subject to the terms of either the GNU
617.15 @@ -15,9 +18,9 @@
617.16 specific language governing permissions and limitations under the
617.17 License. When distributing the software, include this License Header
617.18 Notice in each file and include the License file at
617.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
617.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
617.21 particular file as subject to the "Classpath" exception as provided
617.22 -by Sun in the GPL Version 2 section of the License file that
617.23 +by Oracle in the GPL Version 2 section of the License file that
617.24 accompanied this code. If applicable, add the following below the
617.25 License Header, with the fields enclosed by brackets [] replaced by
617.26 your own identifying information:
618.1 --- a/visualweb.designtime/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
618.2 +++ b/visualweb.designtime/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
618.3 @@ -1,6 +1,9 @@
618.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
618.5 #
618.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
618.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
618.8 +#
618.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
618.10 +# Other names may be trademarks of their respective owners.
618.11 #
618.12 # The contents of this file are subject to the terms of either the GNU
618.13 # General Public License Version 2 only ("GPL") or the Common
618.14 @@ -12,9 +15,9 @@
618.15 # specific language governing permissions and limitations under the
618.16 # License. When distributing the software, include this License Header
618.17 # Notice in each file and include the License file at
618.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
618.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
618.20 # particular file as subject to the "Classpath" exception as provided
618.21 -# by Sun in the GPL Version 2 section of the License file that
618.22 +# by Oracle in the GPL Version 2 section of the License file that
618.23 # accompanied this code. If applicable, add the following below the
618.24 # License Header, with the fields enclosed by brackets [] replaced by
618.25 # your own identifying information:
618.26 @@ -62,14 +65,14 @@
618.27 excludes=
618.28
618.29 # Have JSF1.2 API, JSP & Servlet API
618.30 -file.reference.servlet2.5-jsp2.1-api.jar=../../servletjspapi/external/servlet2.5-jsp2.1-api.jar
618.31 +file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
618.32 file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
618.33
618.34 includes=**
618.35 jar.compress=false
618.36
618.37 javac.classpath=\
618.38 - ${file.reference.servlet2.5-jsp2.1-api.jar}:\
618.39 + ${file.reference.servlet3.0-jsp2.2-api.jar}:\
618.40 ${file.reference.jsf-api.jar}
618.41
618.42 # ${file.reference.jsf-api.jar}
619.1 --- a/visualweb.designtime/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
619.2 +++ b/visualweb.designtime/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
619.3 @@ -2,7 +2,10 @@
619.4 <!--
619.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
619.6
619.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
619.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
619.9 +
619.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
619.11 +Other names may be trademarks of their respective owners.
619.12
619.13
619.14 The contents of this file are subject to the terms of either the GNU
619.15 @@ -15,9 +18,9 @@
619.16 specific language governing permissions and limitations under the
619.17 License. When distributing the software, include this License Header
619.18 Notice in each file and include the License file at
619.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
619.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
619.21 particular file as subject to the "Classpath" exception as provided
619.22 -by Sun in the GPL Version 2 section of the License file that
619.23 +by Oracle in the GPL Version 2 section of the License file that
619.24 accompanied this code. If applicable, add the following below the
619.25 License Header, with the fields enclosed by brackets [] replaced by
619.26 your own identifying information:
620.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/BeanCreateInfo.java Fri Jul 16 11:47:36 2010 -0400
620.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/BeanCreateInfo.java Fri Jul 16 14:21:50 2010 -0400
620.3 @@ -1,7 +1,10 @@
620.4 /*
620.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
620.6 *
620.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
620.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
620.9 + *
620.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
620.11 + * Other names may be trademarks of their respective owners.
620.12 *
620.13 * The contents of this file are subject to the terms of either the GNU
620.14 * General Public License Version 2 only ("GPL") or the Common
620.15 @@ -13,9 +16,9 @@
620.16 * specific language governing permissions and limitations under the
620.17 * License. When distributing the software, include this License Header
620.18 * Notice in each file and include the License file at
620.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
620.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
620.21 * particular file as subject to the "Classpath" exception as provided
620.22 - * by Sun in the GPL Version 2 section of the License file that
620.23 + * by Oracle in the GPL Version 2 section of the License file that
620.24 * accompanied this code. If applicable, add the following below the
620.25 * License Header, with the fields enclosed by brackets [] replaced by
620.26 * your own identifying information:
621.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/BeanCreateInfoSet.java Fri Jul 16 11:47:36 2010 -0400
621.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/BeanCreateInfoSet.java Fri Jul 16 14:21:50 2010 -0400
621.3 @@ -1,7 +1,10 @@
621.4 /*
621.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
621.6 *
621.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
621.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
621.9 + *
621.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
621.11 + * Other names may be trademarks of their respective owners.
621.12 *
621.13 * The contents of this file are subject to the terms of either the GNU
621.14 * General Public License Version 2 only ("GPL") or the Common
621.15 @@ -13,9 +16,9 @@
621.16 * specific language governing permissions and limitations under the
621.17 * License. When distributing the software, include this License Header
621.18 * Notice in each file and include the License file at
621.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
621.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
621.21 * particular file as subject to the "Classpath" exception as provided
621.22 - * by Sun in the GPL Version 2 section of the License file that
621.23 + * by Oracle in the GPL Version 2 section of the License file that
621.24 * accompanied this code. If applicable, add the following below the
621.25 * License Header, with the fields enclosed by brackets [] replaced by
621.26 * your own identifying information:
622.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/CategoryDescriptor.java Fri Jul 16 11:47:36 2010 -0400
622.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/CategoryDescriptor.java Fri Jul 16 14:21:50 2010 -0400
622.3 @@ -1,7 +1,10 @@
622.4 /*
622.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
622.6 *
622.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
622.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
622.9 + *
622.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
622.11 + * Other names may be trademarks of their respective owners.
622.12 *
622.13 * The contents of this file are subject to the terms of either the GNU
622.14 * General Public License Version 2 only ("GPL") or the Common
622.15 @@ -13,9 +16,9 @@
622.16 * specific language governing permissions and limitations under the
622.17 * License. When distributing the software, include this License Header
622.18 * Notice in each file and include the License file at
622.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
622.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
622.21 * particular file as subject to the "Classpath" exception as provided
622.22 - * by Sun in the GPL Version 2 section of the License file that
622.23 + * by Oracle in the GPL Version 2 section of the License file that
622.24 * accompanied this code. If applicable, add the following below the
622.25 * License Header, with the fields enclosed by brackets [] replaced by
622.26 * your own identifying information:
623.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/CheckedDisplayAction.java Fri Jul 16 11:47:36 2010 -0400
623.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/CheckedDisplayAction.java Fri Jul 16 14:21:50 2010 -0400
623.3 @@ -1,7 +1,10 @@
623.4 /*
623.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
623.6 *
623.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
623.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
623.9 + *
623.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
623.11 + * Other names may be trademarks of their respective owners.
623.12 *
623.13 * The contents of this file are subject to the terms of either the GNU
623.14 * General Public License Version 2 only ("GPL") or the Common
623.15 @@ -13,9 +16,9 @@
623.16 * specific language governing permissions and limitations under the
623.17 * License. When distributing the software, include this License Header
623.18 * Notice in each file and include the License file at
623.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
623.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
623.21 * particular file as subject to the "Classpath" exception as provided
623.22 - * by Sun in the GPL Version 2 section of the License file that
623.23 + * by Oracle in the GPL Version 2 section of the License file that
623.24 * accompanied this code. If applicable, add the following below the
623.25 * License Header, with the fields enclosed by brackets [] replaced by
623.26 * your own identifying information:
624.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/Constants.java Fri Jul 16 11:47:36 2010 -0400
624.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/Constants.java Fri Jul 16 14:21:50 2010 -0400
624.3 @@ -1,7 +1,10 @@
624.4 /*
624.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
624.6 *
624.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
624.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
624.9 + *
624.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
624.11 + * Other names may be trademarks of their respective owners.
624.12 *
624.13 * The contents of this file are subject to the terms of either the GNU
624.14 * General Public License Version 2 only ("GPL") or the Common
624.15 @@ -13,9 +16,9 @@
624.16 * specific language governing permissions and limitations under the
624.17 * License. When distributing the software, include this License Header
624.18 * Notice in each file and include the License file at
624.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
624.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
624.21 * particular file as subject to the "Classpath" exception as provided
624.22 - * by Sun in the GPL Version 2 section of the License file that
624.23 + * by Oracle in the GPL Version 2 section of the License file that
624.24 * accompanied this code. If applicable, add the following below the
624.25 * License Header, with the fields enclosed by brackets [] replaced by
624.26 * your own identifying information:
625.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/ContextMethod.java Fri Jul 16 11:47:36 2010 -0400
625.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/ContextMethod.java Fri Jul 16 14:21:50 2010 -0400
625.3 @@ -1,7 +1,10 @@
625.4 /*
625.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
625.6 *
625.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
625.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
625.9 + *
625.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
625.11 + * Other names may be trademarks of their respective owners.
625.12 *
625.13 * The contents of this file are subject to the terms of either the GNU
625.14 * General Public License Version 2 only ("GPL") or the Common
625.15 @@ -13,9 +16,9 @@
625.16 * specific language governing permissions and limitations under the
625.17 * License. When distributing the software, include this License Header
625.18 * Notice in each file and include the License file at
625.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
625.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
625.21 * particular file as subject to the "Classpath" exception as provided
625.22 - * by Sun in the GPL Version 2 section of the License file that
625.23 + * by Oracle in the GPL Version 2 section of the License file that
625.24 * accompanied this code. If applicable, add the following below the
625.25 * License Header, with the fields enclosed by brackets [] replaced by
625.26 * your own identifying information:
626.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/Customizer2.java Fri Jul 16 11:47:36 2010 -0400
626.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/Customizer2.java Fri Jul 16 14:21:50 2010 -0400
626.3 @@ -1,7 +1,10 @@
626.4 /*
626.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
626.6 *
626.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
626.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
626.9 + *
626.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
626.11 + * Other names may be trademarks of their respective owners.
626.12 *
626.13 * The contents of this file are subject to the terms of either the GNU
626.14 * General Public License Version 2 only ("GPL") or the Common
626.15 @@ -13,9 +16,9 @@
626.16 * specific language governing permissions and limitations under the
626.17 * License. When distributing the software, include this License Header
626.18 * Notice in each file and include the License file at
626.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
626.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
626.21 * particular file as subject to the "Classpath" exception as provided
626.22 - * by Sun in the GPL Version 2 section of the License file that
626.23 + * by Oracle in the GPL Version 2 section of the License file that
626.24 * accompanied this code. If applicable, add the following below the
626.25 * License Header, with the fields enclosed by brackets [] replaced by
626.26 * your own identifying information:
627.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/CustomizerResult.java Fri Jul 16 11:47:36 2010 -0400
627.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/CustomizerResult.java Fri Jul 16 14:21:50 2010 -0400
627.3 @@ -1,7 +1,10 @@
627.4 /*
627.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
627.6 *
627.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
627.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
627.9 + *
627.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
627.11 + * Other names may be trademarks of their respective owners.
627.12 *
627.13 * The contents of this file are subject to the terms of either the GNU
627.14 * General Public License Version 2 only ("GPL") or the Common
627.15 @@ -13,9 +16,9 @@
627.16 * specific language governing permissions and limitations under the
627.17 * License. When distributing the software, include this License Header
627.18 * Notice in each file and include the License file at
627.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
627.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
627.21 * particular file as subject to the "Classpath" exception as provided
627.22 - * by Sun in the GPL Version 2 section of the License file that
627.23 + * by Oracle in the GPL Version 2 section of the License file that
627.24 * accompanied this code. If applicable, add the following below the
627.25 * License Header, with the fields enclosed by brackets [] replaced by
627.26 * your own identifying information:
628.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DesignBean.java Fri Jul 16 11:47:36 2010 -0400
628.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DesignBean.java Fri Jul 16 14:21:50 2010 -0400
628.3 @@ -1,7 +1,10 @@
628.4 /*
628.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
628.6 *
628.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
628.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
628.9 + *
628.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
628.11 + * Other names may be trademarks of their respective owners.
628.12 *
628.13 * The contents of this file are subject to the terms of either the GNU
628.14 * General Public License Version 2 only ("GPL") or the Common
628.15 @@ -13,9 +16,9 @@
628.16 * specific language governing permissions and limitations under the
628.17 * License. When distributing the software, include this License Header
628.18 * Notice in each file and include the License file at
628.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
628.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
628.21 * particular file as subject to the "Classpath" exception as provided
628.22 - * by Sun in the GPL Version 2 section of the License file that
628.23 + * by Oracle in the GPL Version 2 section of the License file that
628.24 * accompanied this code. If applicable, add the following below the
628.25 * License Header, with the fields enclosed by brackets [] replaced by
628.26 * your own identifying information:
629.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DesignContext.java Fri Jul 16 11:47:36 2010 -0400
629.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DesignContext.java Fri Jul 16 14:21:50 2010 -0400
629.3 @@ -1,7 +1,10 @@
629.4 /*
629.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
629.6 *
629.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
629.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
629.9 + *
629.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
629.11 + * Other names may be trademarks of their respective owners.
629.12 *
629.13 * The contents of this file are subject to the terms of either the GNU
629.14 * General Public License Version 2 only ("GPL") or the Common
629.15 @@ -13,9 +16,9 @@
629.16 * specific language governing permissions and limitations under the
629.17 * License. When distributing the software, include this License Header
629.18 * Notice in each file and include the License file at
629.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
629.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
629.21 * particular file as subject to the "Classpath" exception as provided
629.22 - * by Sun in the GPL Version 2 section of the License file that
629.23 + * by Oracle in the GPL Version 2 section of the License file that
629.24 * accompanied this code. If applicable, add the following below the
629.25 * License Header, with the fields enclosed by brackets [] replaced by
629.26 * your own identifying information:
630.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DesignEvent.java Fri Jul 16 11:47:36 2010 -0400
630.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DesignEvent.java Fri Jul 16 14:21:50 2010 -0400
630.3 @@ -1,7 +1,10 @@
630.4 /*
630.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
630.6 *
630.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
630.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
630.9 + *
630.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
630.11 + * Other names may be trademarks of their respective owners.
630.12 *
630.13 * The contents of this file are subject to the terms of either the GNU
630.14 * General Public License Version 2 only ("GPL") or the Common
630.15 @@ -13,9 +16,9 @@
630.16 * specific language governing permissions and limitations under the
630.17 * License. When distributing the software, include this License Header
630.18 * Notice in each file and include the License file at
630.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
630.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
630.21 * particular file as subject to the "Classpath" exception as provided
630.22 - * by Sun in the GPL Version 2 section of the License file that
630.23 + * by Oracle in the GPL Version 2 section of the License file that
630.24 * accompanied this code. If applicable, add the following below the
630.25 * License Header, with the fields enclosed by brackets [] replaced by
630.26 * your own identifying information:
631.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DesignIde.java Fri Jul 16 11:47:36 2010 -0400
631.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DesignIde.java Fri Jul 16 14:21:50 2010 -0400
631.3 @@ -1,7 +1,10 @@
631.4 /*
631.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
631.6 *
631.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
631.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
631.9 + *
631.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
631.11 + * Other names may be trademarks of their respective owners.
631.12 *
631.13 * The contents of this file are subject to the terms of either the GNU
631.14 * General Public License Version 2 only ("GPL") or the Common
631.15 @@ -13,9 +16,9 @@
631.16 * specific language governing permissions and limitations under the
631.17 * License. When distributing the software, include this License Header
631.18 * Notice in each file and include the License file at
631.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
631.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
631.21 * particular file as subject to the "Classpath" exception as provided
631.22 - * by Sun in the GPL Version 2 section of the License file that
631.23 + * by Oracle in the GPL Version 2 section of the License file that
631.24 * accompanied this code. If applicable, add the following below the
631.25 * License Header, with the fields enclosed by brackets [] replaced by
631.26 * your own identifying information:
632.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DesignIdeFactory.java Fri Jul 16 11:47:36 2010 -0400
632.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DesignIdeFactory.java Fri Jul 16 14:21:50 2010 -0400
632.3 @@ -1,7 +1,10 @@
632.4 /*
632.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
632.6 *
632.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
632.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
632.9 + *
632.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
632.11 + * Other names may be trademarks of their respective owners.
632.12 *
632.13 * The contents of this file are subject to the terms of either the GNU
632.14 * General Public License Version 2 only ("GPL") or the Common
632.15 @@ -13,9 +16,9 @@
632.16 * specific language governing permissions and limitations under the
632.17 * License. When distributing the software, include this License Header
632.18 * Notice in each file and include the License file at
632.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
632.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
632.21 * particular file as subject to the "Classpath" exception as provided
632.22 - * by Sun in the GPL Version 2 section of the License file that
632.23 + * by Oracle in the GPL Version 2 section of the License file that
632.24 * accompanied this code. If applicable, add the following below the
632.25 * License Header, with the fields enclosed by brackets [] replaced by
632.26 * your own identifying information:
633.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DesignInfo.java Fri Jul 16 11:47:36 2010 -0400
633.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DesignInfo.java Fri Jul 16 14:21:50 2010 -0400
633.3 @@ -1,7 +1,10 @@
633.4 /*
633.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
633.6 *
633.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
633.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
633.9 + *
633.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
633.11 + * Other names may be trademarks of their respective owners.
633.12 *
633.13 * The contents of this file are subject to the terms of either the GNU
633.14 * General Public License Version 2 only ("GPL") or the Common
633.15 @@ -13,9 +16,9 @@
633.16 * specific language governing permissions and limitations under the
633.17 * License. When distributing the software, include this License Header
633.18 * Notice in each file and include the License file at
633.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
633.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
633.21 * particular file as subject to the "Classpath" exception as provided
633.22 - * by Sun in the GPL Version 2 section of the License file that
633.23 + * by Oracle in the GPL Version 2 section of the License file that
633.24 * accompanied this code. If applicable, add the following below the
633.25 * License Header, with the fields enclosed by brackets [] replaced by
633.26 * your own identifying information:
634.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DesignProject.java Fri Jul 16 11:47:36 2010 -0400
634.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DesignProject.java Fri Jul 16 14:21:50 2010 -0400
634.3 @@ -1,7 +1,10 @@
634.4 /*
634.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
634.6 *
634.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
634.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
634.9 + *
634.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
634.11 + * Other names may be trademarks of their respective owners.
634.12 *
634.13 * The contents of this file are subject to the terms of either the GNU
634.14 * General Public License Version 2 only ("GPL") or the Common
634.15 @@ -13,9 +16,9 @@
634.16 * specific language governing permissions and limitations under the
634.17 * License. When distributing the software, include this License Header
634.18 * Notice in each file and include the License file at
634.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
634.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
634.21 * particular file as subject to the "Classpath" exception as provided
634.22 - * by Sun in the GPL Version 2 section of the License file that
634.23 + * by Oracle in the GPL Version 2 section of the License file that
634.24 * accompanied this code. If applicable, add the following below the
634.25 * License Header, with the fields enclosed by brackets [] replaced by
634.26 * your own identifying information:
635.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DesignProperty.java Fri Jul 16 11:47:36 2010 -0400
635.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DesignProperty.java Fri Jul 16 14:21:50 2010 -0400
635.3 @@ -1,7 +1,10 @@
635.4 /*
635.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
635.6 *
635.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
635.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
635.9 + *
635.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
635.11 + * Other names may be trademarks of their respective owners.
635.12 *
635.13 * The contents of this file are subject to the terms of either the GNU
635.14 * General Public License Version 2 only ("GPL") or the Common
635.15 @@ -13,9 +16,9 @@
635.16 * specific language governing permissions and limitations under the
635.17 * License. When distributing the software, include this License Header
635.18 * Notice in each file and include the License file at
635.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
635.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
635.21 * particular file as subject to the "Classpath" exception as provided
635.22 - * by Sun in the GPL Version 2 section of the License file that
635.23 + * by Oracle in the GPL Version 2 section of the License file that
635.24 * accompanied this code. If applicable, add the following below the
635.25 * License Header, with the fields enclosed by brackets [] replaced by
635.26 * your own identifying information:
636.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DisplayAction.java Fri Jul 16 11:47:36 2010 -0400
636.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DisplayAction.java Fri Jul 16 14:21:50 2010 -0400
636.3 @@ -1,7 +1,10 @@
636.4 /*
636.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
636.6 *
636.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
636.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
636.9 + *
636.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
636.11 + * Other names may be trademarks of their respective owners.
636.12 *
636.13 * The contents of this file are subject to the terms of either the GNU
636.14 * General Public License Version 2 only ("GPL") or the Common
636.15 @@ -13,9 +16,9 @@
636.16 * specific language governing permissions and limitations under the
636.17 * License. When distributing the software, include this License Header
636.18 * Notice in each file and include the License file at
636.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
636.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
636.21 * particular file as subject to the "Classpath" exception as provided
636.22 - * by Sun in the GPL Version 2 section of the License file that
636.23 + * by Oracle in the GPL Version 2 section of the License file that
636.24 * accompanied this code. If applicable, add the following below the
636.25 * License Header, with the fields enclosed by brackets [] replaced by
636.26 * your own identifying information:
637.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DisplayActionSet.java Fri Jul 16 11:47:36 2010 -0400
637.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DisplayActionSet.java Fri Jul 16 14:21:50 2010 -0400
637.3 @@ -1,7 +1,10 @@
637.4 /*
637.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
637.6 *
637.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
637.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
637.9 + *
637.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
637.11 + * Other names may be trademarks of their respective owners.
637.12 *
637.13 * The contents of this file are subject to the terms of either the GNU
637.14 * General Public License Version 2 only ("GPL") or the Common
637.15 @@ -13,9 +16,9 @@
637.16 * specific language governing permissions and limitations under the
637.17 * License. When distributing the software, include this License Header
637.18 * Notice in each file and include the License file at
637.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
637.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
637.21 * particular file as subject to the "Classpath" exception as provided
637.22 - * by Sun in the GPL Version 2 section of the License file that
637.23 + * by Oracle in the GPL Version 2 section of the License file that
637.24 * accompanied this code. If applicable, add the following below the
637.25 * License Header, with the fields enclosed by brackets [] replaced by
637.26 * your own identifying information:
638.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/DisplayItem.java Fri Jul 16 11:47:36 2010 -0400
638.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/DisplayItem.java Fri Jul 16 14:21:50 2010 -0400
638.3 @@ -1,7 +1,10 @@
638.4 /*
638.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
638.6 *
638.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
638.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
638.9 + *
638.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
638.11 + * Other names may be trademarks of their respective owners.
638.12 *
638.13 * The contents of this file are subject to the terms of either the GNU
638.14 * General Public License Version 2 only ("GPL") or the Common
638.15 @@ -13,9 +16,9 @@
638.16 * specific language governing permissions and limitations under the
638.17 * License. When distributing the software, include this License Header
638.18 * Notice in each file and include the License file at
638.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
638.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
638.21 * particular file as subject to the "Classpath" exception as provided
638.22 - * by Sun in the GPL Version 2 section of the License file that
638.23 + * by Oracle in the GPL Version 2 section of the License file that
638.24 * accompanied this code. If applicable, add the following below the
638.25 * License Header, with the fields enclosed by brackets [] replaced by
638.26 * your own identifying information:
639.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/EventDescriptor.java Fri Jul 16 11:47:36 2010 -0400
639.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/EventDescriptor.java Fri Jul 16 14:21:50 2010 -0400
639.3 @@ -1,7 +1,10 @@
639.4 /*
639.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
639.6 *
639.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
639.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
639.9 + *
639.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
639.11 + * Other names may be trademarks of their respective owners.
639.12 *
639.13 * The contents of this file are subject to the terms of either the GNU
639.14 * General Public License Version 2 only ("GPL") or the Common
639.15 @@ -13,9 +16,9 @@
639.16 * specific language governing permissions and limitations under the
639.17 * License. When distributing the software, include this License Header
639.18 * Notice in each file and include the License file at
639.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
639.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
639.21 * particular file as subject to the "Classpath" exception as provided
639.22 - * by Sun in the GPL Version 2 section of the License file that
639.23 + * by Oracle in the GPL Version 2 section of the License file that
639.24 * accompanied this code. If applicable, add the following below the
639.25 * License Header, with the fields enclosed by brackets [] replaced by
639.26 * your own identifying information:
640.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/Position.java Fri Jul 16 11:47:36 2010 -0400
640.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/Position.java Fri Jul 16 14:21:50 2010 -0400
640.3 @@ -1,7 +1,10 @@
640.4 /*
640.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
640.6 *
640.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
640.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
640.9 + *
640.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
640.11 + * Other names may be trademarks of their respective owners.
640.12 *
640.13 * The contents of this file are subject to the terms of either the GNU
640.14 * General Public License Version 2 only ("GPL") or the Common
640.15 @@ -13,9 +16,9 @@
640.16 * specific language governing permissions and limitations under the
640.17 * License. When distributing the software, include this License Header
640.18 * Notice in each file and include the License file at
640.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
640.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
640.21 * particular file as subject to the "Classpath" exception as provided
640.22 - * by Sun in the GPL Version 2 section of the License file that
640.23 + * by Oracle in the GPL Version 2 section of the License file that
640.24 * accompanied this code. If applicable, add the following below the
640.25 * License Header, with the fields enclosed by brackets [] replaced by
640.26 * your own identifying information:
641.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/PropertyEditor2.java Fri Jul 16 11:47:36 2010 -0400
641.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/PropertyEditor2.java Fri Jul 16 14:21:50 2010 -0400
641.3 @@ -1,7 +1,10 @@
641.4 /*
641.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
641.6 *
641.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
641.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
641.9 + *
641.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
641.11 + * Other names may be trademarks of their respective owners.
641.12 *
641.13 * The contents of this file are subject to the terms of either the GNU
641.14 * General Public License Version 2 only ("GPL") or the Common
641.15 @@ -13,9 +16,9 @@
641.16 * specific language governing permissions and limitations under the
641.17 * License. When distributing the software, include this License Header
641.18 * Notice in each file and include the License file at
641.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
641.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
641.21 * particular file as subject to the "Classpath" exception as provided
641.22 - * by Sun in the GPL Version 2 section of the License file that
641.23 + * by Oracle in the GPL Version 2 section of the License file that
641.24 * accompanied this code. If applicable, add the following below the
641.25 * License Header, with the fields enclosed by brackets [] replaced by
641.26 * your own identifying information:
642.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/Result.java Fri Jul 16 11:47:36 2010 -0400
642.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/Result.java Fri Jul 16 14:21:50 2010 -0400
642.3 @@ -1,7 +1,10 @@
642.4 /*
642.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
642.6 *
642.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
642.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
642.9 + *
642.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
642.11 + * Other names may be trademarks of their respective owners.
642.12 *
642.13 * The contents of this file are subject to the terms of either the GNU
642.14 * General Public License Version 2 only ("GPL") or the Common
642.15 @@ -13,9 +16,9 @@
642.16 * specific language governing permissions and limitations under the
642.17 * License. When distributing the software, include this License Header
642.18 * Notice in each file and include the License file at
642.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
642.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
642.21 * particular file as subject to the "Classpath" exception as provided
642.22 - * by Sun in the GPL Version 2 section of the License file that
642.23 + * by Oracle in the GPL Version 2 section of the License file that
642.24 * accompanied this code. If applicable, add the following below the
642.25 * License Header, with the fields enclosed by brackets [] replaced by
642.26 * your own identifying information:
643.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/ResultMessage.java Fri Jul 16 11:47:36 2010 -0400
643.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/ResultMessage.java Fri Jul 16 14:21:50 2010 -0400
643.3 @@ -1,7 +1,10 @@
643.4 /*
643.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
643.6 *
643.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
643.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
643.9 + *
643.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
643.11 + * Other names may be trademarks of their respective owners.
643.12 *
643.13 * The contents of this file are subject to the terms of either the GNU
643.14 * General Public License Version 2 only ("GPL") or the Common
643.15 @@ -13,9 +16,9 @@
643.16 * specific language governing permissions and limitations under the
643.17 * License. When distributing the software, include this License Header
643.18 * Notice in each file and include the License file at
643.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
643.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
643.21 * particular file as subject to the "Classpath" exception as provided
643.22 - * by Sun in the GPL Version 2 section of the License file that
643.23 + * by Oracle in the GPL Version 2 section of the License file that
643.24 * accompanied this code. If applicable, add the following below the
643.25 * License Header, with the fields enclosed by brackets [] replaced by
643.26 * your own identifying information:
644.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignBeanAdapter.java Fri Jul 16 11:47:36 2010 -0400
644.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignBeanAdapter.java Fri Jul 16 14:21:50 2010 -0400
644.3 @@ -1,7 +1,10 @@
644.4 /*
644.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
644.6 *
644.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
644.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
644.9 + *
644.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
644.11 + * Other names may be trademarks of their respective owners.
644.12 *
644.13 * The contents of this file are subject to the terms of either the GNU
644.14 * General Public License Version 2 only ("GPL") or the Common
644.15 @@ -13,9 +16,9 @@
644.16 * specific language governing permissions and limitations under the
644.17 * License. When distributing the software, include this License Header
644.18 * Notice in each file and include the License file at
644.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
644.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
644.21 * particular file as subject to the "Classpath" exception as provided
644.22 - * by Sun in the GPL Version 2 section of the License file that
644.23 + * by Oracle in the GPL Version 2 section of the License file that
644.24 * accompanied this code. If applicable, add the following below the
644.25 * License Header, with the fields enclosed by brackets [] replaced by
644.26 * your own identifying information:
645.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignBeanListener.java Fri Jul 16 11:47:36 2010 -0400
645.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignBeanListener.java Fri Jul 16 14:21:50 2010 -0400
645.3 @@ -1,7 +1,10 @@
645.4 /*
645.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
645.6 *
645.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
645.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
645.9 + *
645.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
645.11 + * Other names may be trademarks of their respective owners.
645.12 *
645.13 * The contents of this file are subject to the terms of either the GNU
645.14 * General Public License Version 2 only ("GPL") or the Common
645.15 @@ -13,9 +16,9 @@
645.16 * specific language governing permissions and limitations under the
645.17 * License. When distributing the software, include this License Header
645.18 * Notice in each file and include the License file at
645.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
645.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
645.21 * particular file as subject to the "Classpath" exception as provided
645.22 - * by Sun in the GPL Version 2 section of the License file that
645.23 + * by Oracle in the GPL Version 2 section of the License file that
645.24 * accompanied this code. If applicable, add the following below the
645.25 * License Header, with the fields enclosed by brackets [] replaced by
645.26 * your own identifying information:
646.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignContextAdapter.java Fri Jul 16 11:47:36 2010 -0400
646.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignContextAdapter.java Fri Jul 16 14:21:50 2010 -0400
646.3 @@ -1,7 +1,10 @@
646.4 /*
646.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
646.6 *
646.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
646.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
646.9 + *
646.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
646.11 + * Other names may be trademarks of their respective owners.
646.12 *
646.13 * The contents of this file are subject to the terms of either the GNU
646.14 * General Public License Version 2 only ("GPL") or the Common
646.15 @@ -13,9 +16,9 @@
646.16 * specific language governing permissions and limitations under the
646.17 * License. When distributing the software, include this License Header
646.18 * Notice in each file and include the License file at
646.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
646.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
646.21 * particular file as subject to the "Classpath" exception as provided
646.22 - * by Sun in the GPL Version 2 section of the License file that
646.23 + * by Oracle in the GPL Version 2 section of the License file that
646.24 * accompanied this code. If applicable, add the following below the
646.25 * License Header, with the fields enclosed by brackets [] replaced by
646.26 * your own identifying information:
647.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignContextListener.java Fri Jul 16 11:47:36 2010 -0400
647.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignContextListener.java Fri Jul 16 14:21:50 2010 -0400
647.3 @@ -1,7 +1,10 @@
647.4 /*
647.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
647.6 *
647.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
647.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
647.9 + *
647.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
647.11 + * Other names may be trademarks of their respective owners.
647.12 *
647.13 * The contents of this file are subject to the terms of either the GNU
647.14 * General Public License Version 2 only ("GPL") or the Common
647.15 @@ -13,9 +16,9 @@
647.16 * specific language governing permissions and limitations under the
647.17 * License. When distributing the software, include this License Header
647.18 * Notice in each file and include the License file at
647.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
647.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
647.21 * particular file as subject to the "Classpath" exception as provided
647.22 - * by Sun in the GPL Version 2 section of the License file that
647.23 + * by Oracle in the GPL Version 2 section of the License file that
647.24 * accompanied this code. If applicable, add the following below the
647.25 * License Header, with the fields enclosed by brackets [] replaced by
647.26 * your own identifying information:
648.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignIdeAdapter.java Fri Jul 16 11:47:36 2010 -0400
648.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignIdeAdapter.java Fri Jul 16 14:21:50 2010 -0400
648.3 @@ -1,7 +1,10 @@
648.4 /*
648.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
648.6 *
648.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
648.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
648.9 + *
648.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
648.11 + * Other names may be trademarks of their respective owners.
648.12 *
648.13 * The contents of this file are subject to the terms of either the GNU
648.14 * General Public License Version 2 only ("GPL") or the Common
648.15 @@ -13,9 +16,9 @@
648.16 * specific language governing permissions and limitations under the
648.17 * License. When distributing the software, include this License Header
648.18 * Notice in each file and include the License file at
648.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
648.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
648.21 * particular file as subject to the "Classpath" exception as provided
648.22 - * by Sun in the GPL Version 2 section of the License file that
648.23 + * by Oracle in the GPL Version 2 section of the License file that
648.24 * accompanied this code. If applicable, add the following below the
648.25 * License Header, with the fields enclosed by brackets [] replaced by
648.26 * your own identifying information:
649.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignIdeListener.java Fri Jul 16 11:47:36 2010 -0400
649.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignIdeListener.java Fri Jul 16 14:21:50 2010 -0400
649.3 @@ -1,7 +1,10 @@
649.4 /*
649.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
649.6 *
649.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
649.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
649.9 + *
649.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
649.11 + * Other names may be trademarks of their respective owners.
649.12 *
649.13 * The contents of this file are subject to the terms of either the GNU
649.14 * General Public License Version 2 only ("GPL") or the Common
649.15 @@ -13,9 +16,9 @@
649.16 * specific language governing permissions and limitations under the
649.17 * License. When distributing the software, include this License Header
649.18 * Notice in each file and include the License file at
649.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
649.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
649.21 * particular file as subject to the "Classpath" exception as provided
649.22 - * by Sun in the GPL Version 2 section of the License file that
649.23 + * by Oracle in the GPL Version 2 section of the License file that
649.24 * accompanied this code. If applicable, add the following below the
649.25 * License Header, with the fields enclosed by brackets [] replaced by
649.26 * your own identifying information:
650.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignProjectAdapter.java Fri Jul 16 11:47:36 2010 -0400
650.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignProjectAdapter.java Fri Jul 16 14:21:50 2010 -0400
650.3 @@ -1,7 +1,10 @@
650.4 /*
650.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
650.6 *
650.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
650.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
650.9 + *
650.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
650.11 + * Other names may be trademarks of their respective owners.
650.12 *
650.13 * The contents of this file are subject to the terms of either the GNU
650.14 * General Public License Version 2 only ("GPL") or the Common
650.15 @@ -13,9 +16,9 @@
650.16 * specific language governing permissions and limitations under the
650.17 * License. When distributing the software, include this License Header
650.18 * Notice in each file and include the License file at
650.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
650.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
650.21 * particular file as subject to the "Classpath" exception as provided
650.22 - * by Sun in the GPL Version 2 section of the License file that
650.23 + * by Oracle in the GPL Version 2 section of the License file that
650.24 * accompanied this code. If applicable, add the following below the
650.25 * License Header, with the fields enclosed by brackets [] replaced by
650.26 * your own identifying information:
651.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignProjectListener.java Fri Jul 16 11:47:36 2010 -0400
651.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/event/DesignProjectListener.java Fri Jul 16 14:21:50 2010 -0400
651.3 @@ -1,7 +1,10 @@
651.4 /*
651.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
651.6 *
651.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
651.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
651.9 + *
651.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
651.11 + * Other names may be trademarks of their respective owners.
651.12 *
651.13 * The contents of this file are subject to the terms of either the GNU
651.14 * General Public License Version 2 only ("GPL") or the Common
651.15 @@ -13,9 +16,9 @@
651.16 * specific language governing permissions and limitations under the
651.17 * License. When distributing the software, include this License Header
651.18 * Notice in each file and include the License file at
651.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
651.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
651.21 * particular file as subject to the "Classpath" exception as provided
651.22 - * by Sun in the GPL Version 2 section of the License file that
651.23 + * by Oracle in the GPL Version 2 section of the License file that
651.24 * accompanied this code. If applicable, add the following below the
651.25 * License Header, with the fields enclosed by brackets [] replaced by
651.26 * your own identifying information:
652.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesBindingPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
652.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesBindingPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
652.3 @@ -1,7 +1,10 @@
652.4 /*
652.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
652.6 *
652.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
652.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
652.9 + *
652.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
652.11 + * Other names may be trademarks of their respective owners.
652.12 *
652.13 * The contents of this file are subject to the terms of either the GNU
652.14 * General Public License Version 2 only ("GPL") or the Common
652.15 @@ -13,9 +16,9 @@
652.16 * specific language governing permissions and limitations under the
652.17 * License. When distributing the software, include this License Header
652.18 * Notice in each file and include the License file at
652.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
652.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
652.21 * particular file as subject to the "Classpath" exception as provided
652.22 - * by Sun in the GPL Version 2 section of the License file that
652.23 + * by Oracle in the GPL Version 2 section of the License file that
652.24 * accompanied this code. If applicable, add the following below the
652.25 * License Header, with the fields enclosed by brackets [] replaced by
652.26 * your own identifying information:
653.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesDesignBean.java Fri Jul 16 11:47:36 2010 -0400
653.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesDesignBean.java Fri Jul 16 14:21:50 2010 -0400
653.3 @@ -1,7 +1,10 @@
653.4 /*
653.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
653.6 *
653.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
653.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
653.9 + *
653.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
653.11 + * Other names may be trademarks of their respective owners.
653.12 *
653.13 * The contents of this file are subject to the terms of either the GNU
653.14 * General Public License Version 2 only ("GPL") or the Common
653.15 @@ -13,9 +16,9 @@
653.16 * specific language governing permissions and limitations under the
653.17 * License. When distributing the software, include this License Header
653.18 * Notice in each file and include the License file at
653.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
653.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
653.21 * particular file as subject to the "Classpath" exception as provided
653.22 - * by Sun in the GPL Version 2 section of the License file that
653.23 + * by Oracle in the GPL Version 2 section of the License file that
653.24 * accompanied this code. If applicable, add the following below the
653.25 * License Header, with the fields enclosed by brackets [] replaced by
653.26 * your own identifying information:
654.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesDesignContext.java Fri Jul 16 11:47:36 2010 -0400
654.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesDesignContext.java Fri Jul 16 14:21:50 2010 -0400
654.3 @@ -1,7 +1,10 @@
654.4 /*
654.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
654.6 *
654.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
654.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
654.9 + *
654.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
654.11 + * Other names may be trademarks of their respective owners.
654.12 *
654.13 * The contents of this file are subject to the terms of either the GNU
654.14 * General Public License Version 2 only ("GPL") or the Common
654.15 @@ -13,9 +16,9 @@
654.16 * specific language governing permissions and limitations under the
654.17 * License. When distributing the software, include this License Header
654.18 * Notice in each file and include the License file at
654.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
654.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
654.21 * particular file as subject to the "Classpath" exception as provided
654.22 - * by Sun in the GPL Version 2 section of the License file that
654.23 + * by Oracle in the GPL Version 2 section of the License file that
654.24 * accompanied this code. If applicable, add the following below the
654.25 * License Header, with the fields enclosed by brackets [] replaced by
654.26 * your own identifying information:
655.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesDesignProject.java Fri Jul 16 11:47:36 2010 -0400
655.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesDesignProject.java Fri Jul 16 14:21:50 2010 -0400
655.3 @@ -1,7 +1,10 @@
655.4 /*
655.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
655.6 *
655.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
655.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
655.9 + *
655.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
655.11 + * Other names may be trademarks of their respective owners.
655.12 *
655.13 * The contents of this file are subject to the terms of either the GNU
655.14 * General Public License Version 2 only ("GPL") or the Common
655.15 @@ -13,9 +16,9 @@
655.16 * specific language governing permissions and limitations under the
655.17 * License. When distributing the software, include this License Header
655.18 * Notice in each file and include the License file at
655.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
655.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
655.21 * particular file as subject to the "Classpath" exception as provided
655.22 - * by Sun in the GPL Version 2 section of the License file that
655.23 + * by Oracle in the GPL Version 2 section of the License file that
655.24 * accompanied this code. If applicable, add the following below the
655.25 * License Header, with the fields enclosed by brackets [] replaced by
655.26 * your own identifying information:
656.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesDesignProperty.java Fri Jul 16 11:47:36 2010 -0400
656.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacesDesignProperty.java Fri Jul 16 14:21:50 2010 -0400
656.3 @@ -1,7 +1,10 @@
656.4 /*
656.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
656.6 *
656.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
656.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
656.9 + *
656.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
656.11 + * Other names may be trademarks of their respective owners.
656.12 *
656.13 * The contents of this file are subject to the terms of either the GNU
656.14 * General Public License Version 2 only ("GPL") or the Common
656.15 @@ -13,9 +16,9 @@
656.16 * specific language governing permissions and limitations under the
656.17 * License. When distributing the software, include this License Header
656.18 * Notice in each file and include the License file at
656.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
656.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
656.21 * particular file as subject to the "Classpath" exception as provided
656.22 - * by Sun in the GPL Version 2 section of the License file that
656.23 + * by Oracle in the GPL Version 2 section of the License file that
656.24 * accompanied this code. If applicable, add the following below the
656.25 * License Header, with the fields enclosed by brackets [] replaced by
656.26 * your own identifying information:
657.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacetDescriptor.java Fri Jul 16 11:47:36 2010 -0400
657.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/faces/FacetDescriptor.java Fri Jul 16 14:21:50 2010 -0400
657.3 @@ -1,7 +1,10 @@
657.4 /*
657.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
657.6 *
657.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
657.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
657.9 + *
657.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
657.11 + * Other names may be trademarks of their respective owners.
657.12 *
657.13 * The contents of this file are subject to the terms of either the GNU
657.14 * General Public License Version 2 only ("GPL") or the Common
657.15 @@ -13,9 +16,9 @@
657.16 * specific language governing permissions and limitations under the
657.17 * License. When distributing the software, include this License Header
657.18 * Notice in each file and include the License file at
657.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
657.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
657.21 * particular file as subject to the "Classpath" exception as provided
657.22 - * by Sun in the GPL Version 2 section of the License file that
657.23 + * by Oracle in the GPL Version 2 section of the License file that
657.24 * accompanied this code. If applicable, add the following below the
657.25 * License Header, with the fields enclosed by brackets [] replaced by
657.26 * your own identifying information:
658.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/faces/ResolveResult.java Fri Jul 16 11:47:36 2010 -0400
658.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/faces/ResolveResult.java Fri Jul 16 14:21:50 2010 -0400
658.3 @@ -1,7 +1,10 @@
658.4 /*
658.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
658.6 *
658.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
658.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
658.9 + *
658.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
658.11 + * Other names may be trademarks of their respective owners.
658.12 *
658.13 * The contents of this file are subject to the terms of either the GNU
658.14 * General Public License Version 2 only ("GPL") or the Common
658.15 @@ -13,9 +16,9 @@
658.16 * specific language governing permissions and limitations under the
658.17 * License. When distributing the software, include this License Header
658.18 * Notice in each file and include the License file at
658.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
658.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
658.21 * particular file as subject to the "Classpath" exception as provided
658.22 - * by Sun in the GPL Version 2 section of the License file that
658.23 + * by Oracle in the GPL Version 2 section of the License file that
658.24 * accompanied this code. If applicable, add the following below the
658.25 * License Header, with the fields enclosed by brackets [] replaced by
658.26 * your own identifying information:
659.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicBeanCreateInfo.java Fri Jul 16 11:47:36 2010 -0400
659.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicBeanCreateInfo.java Fri Jul 16 14:21:50 2010 -0400
659.3 @@ -1,7 +1,10 @@
659.4 /*
659.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
659.6 *
659.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
659.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
659.9 + *
659.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
659.11 + * Other names may be trademarks of their respective owners.
659.12 *
659.13 * The contents of this file are subject to the terms of either the GNU
659.14 * General Public License Version 2 only ("GPL") or the Common
659.15 @@ -13,9 +16,9 @@
659.16 * specific language governing permissions and limitations under the
659.17 * License. When distributing the software, include this License Header
659.18 * Notice in each file and include the License file at
659.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
659.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
659.21 * particular file as subject to the "Classpath" exception as provided
659.22 - * by Sun in the GPL Version 2 section of the License file that
659.23 + * by Oracle in the GPL Version 2 section of the License file that
659.24 * accompanied this code. If applicable, add the following below the
659.25 * License Header, with the fields enclosed by brackets [] replaced by
659.26 * your own identifying information:
660.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicBeanCreateInfoSet.java Fri Jul 16 11:47:36 2010 -0400
660.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicBeanCreateInfoSet.java Fri Jul 16 14:21:50 2010 -0400
660.3 @@ -1,7 +1,10 @@
660.4 /*
660.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
660.6 *
660.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
660.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
660.9 + *
660.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
660.11 + * Other names may be trademarks of their respective owners.
660.12 *
660.13 * The contents of this file are subject to the terms of either the GNU
660.14 * General Public License Version 2 only ("GPL") or the Common
660.15 @@ -13,9 +16,9 @@
660.16 * specific language governing permissions and limitations under the
660.17 * License. When distributing the software, include this License Header
660.18 * Notice in each file and include the License file at
660.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
660.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
660.21 * particular file as subject to the "Classpath" exception as provided
660.22 - * by Sun in the GPL Version 2 section of the License file that
660.23 + * by Oracle in the GPL Version 2 section of the License file that
660.24 * accompanied this code. If applicable, add the following below the
660.25 * License Header, with the fields enclosed by brackets [] replaced by
660.26 * your own identifying information:
661.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicCheckedDisplayAction.java Fri Jul 16 11:47:36 2010 -0400
661.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicCheckedDisplayAction.java Fri Jul 16 14:21:50 2010 -0400
661.3 @@ -1,7 +1,10 @@
661.4 /*
661.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
661.6 *
661.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
661.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
661.9 + *
661.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
661.11 + * Other names may be trademarks of their respective owners.
661.12 *
661.13 * The contents of this file are subject to the terms of either the GNU
661.14 * General Public License Version 2 only ("GPL") or the Common
661.15 @@ -13,9 +16,9 @@
661.16 * specific language governing permissions and limitations under the
661.17 * License. When distributing the software, include this License Header
661.18 * Notice in each file and include the License file at
661.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
661.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
661.21 * particular file as subject to the "Classpath" exception as provided
661.22 - * by Sun in the GPL Version 2 section of the License file that
661.23 + * by Oracle in the GPL Version 2 section of the License file that
661.24 * accompanied this code. If applicable, add the following below the
661.25 * License Header, with the fields enclosed by brackets [] replaced by
661.26 * your own identifying information:
662.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicCustomizer2.java Fri Jul 16 11:47:36 2010 -0400
662.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicCustomizer2.java Fri Jul 16 14:21:50 2010 -0400
662.3 @@ -1,7 +1,10 @@
662.4 /*
662.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
662.6 *
662.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
662.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
662.9 + *
662.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
662.11 + * Other names may be trademarks of their respective owners.
662.12 *
662.13 * The contents of this file are subject to the terms of either the GNU
662.14 * General Public License Version 2 only ("GPL") or the Common
662.15 @@ -13,9 +16,9 @@
662.16 * specific language governing permissions and limitations under the
662.17 * License. When distributing the software, include this License Header
662.18 * Notice in each file and include the License file at
662.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
662.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
662.21 * particular file as subject to the "Classpath" exception as provided
662.22 - * by Sun in the GPL Version 2 section of the License file that
662.23 + * by Oracle in the GPL Version 2 section of the License file that
662.24 * accompanied this code. If applicable, add the following below the
662.25 * License Header, with the fields enclosed by brackets [] replaced by
662.26 * your own identifying information:
663.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
663.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
663.3 @@ -1,7 +1,10 @@
663.4 /*
663.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
663.6 *
663.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
663.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
663.9 + *
663.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
663.11 + * Other names may be trademarks of their respective owners.
663.12 *
663.13 * The contents of this file are subject to the terms of either the GNU
663.14 * General Public License Version 2 only ("GPL") or the Common
663.15 @@ -13,9 +16,9 @@
663.16 * specific language governing permissions and limitations under the
663.17 * License. When distributing the software, include this License Header
663.18 * Notice in each file and include the License file at
663.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
663.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
663.21 * particular file as subject to the "Classpath" exception as provided
663.22 - * by Sun in the GPL Version 2 section of the License file that
663.23 + * by Oracle in the GPL Version 2 section of the License file that
663.24 * accompanied this code. If applicable, add the following below the
663.25 * License Header, with the fields enclosed by brackets [] replaced by
663.26 * your own identifying information:
664.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicDisplayAction.java Fri Jul 16 11:47:36 2010 -0400
664.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicDisplayAction.java Fri Jul 16 14:21:50 2010 -0400
664.3 @@ -1,7 +1,10 @@
664.4 /*
664.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
664.6 *
664.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
664.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
664.9 + *
664.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
664.11 + * Other names may be trademarks of their respective owners.
664.12 *
664.13 * The contents of this file are subject to the terms of either the GNU
664.14 * General Public License Version 2 only ("GPL") or the Common
664.15 @@ -13,9 +16,9 @@
664.16 * specific language governing permissions and limitations under the
664.17 * License. When distributing the software, include this License Header
664.18 * Notice in each file and include the License file at
664.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
664.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
664.21 * particular file as subject to the "Classpath" exception as provided
664.22 - * by Sun in the GPL Version 2 section of the License file that
664.23 + * by Oracle in the GPL Version 2 section of the License file that
664.24 * accompanied this code. If applicable, add the following below the
664.25 * License Header, with the fields enclosed by brackets [] replaced by
664.26 * your own identifying information:
665.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicDisplayActionSet.java Fri Jul 16 11:47:36 2010 -0400
665.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/impl/BasicDisplayActionSet.java Fri Jul 16 14:21:50 2010 -0400
665.3 @@ -1,7 +1,10 @@
665.4 /*
665.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
665.6 *
665.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
665.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
665.9 + *
665.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
665.11 + * Other names may be trademarks of their respective owners.
665.12 *
665.13 * The contents of this file are subject to the terms of either the GNU
665.14 * General Public License Version 2 only ("GPL") or the Common
665.15 @@ -13,9 +16,9 @@
665.16 * specific language governing permissions and limitations under the
665.17 * License. When distributing the software, include this License Header
665.18 * Notice in each file and include the License file at
665.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
665.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
665.21 * particular file as subject to the "Classpath" exception as provided
665.22 - * by Sun in the GPL Version 2 section of the License file that
665.23 + * by Oracle in the GPL Version 2 section of the License file that
665.24 * accompanied this code. If applicable, add the following below the
665.25 * License Header, with the fields enclosed by brackets [] replaced by
665.26 * your own identifying information:
666.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/AttributeDescriptor.java Fri Jul 16 11:47:36 2010 -0400
666.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/AttributeDescriptor.java Fri Jul 16 14:21:50 2010 -0400
666.3 @@ -1,7 +1,10 @@
666.4 /*
666.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
666.6 *
666.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
666.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
666.9 + *
666.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
666.11 + * Other names may be trademarks of their respective owners.
666.12 *
666.13 * The contents of this file are subject to the terms of either the GNU
666.14 * General Public License Version 2 only ("GPL") or the Common
666.15 @@ -13,9 +16,9 @@
666.16 * specific language governing permissions and limitations under the
666.17 * License. When distributing the software, include this License Header
666.18 * Notice in each file and include the License file at
666.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
666.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
666.21 * particular file as subject to the "Classpath" exception as provided
666.22 - * by Sun in the GPL Version 2 section of the License file that
666.23 + * by Oracle in the GPL Version 2 section of the License file that
666.24 * accompanied this code. If applicable, add the following below the
666.25 * License Header, with the fields enclosed by brackets [] replaced by
666.26 * your own identifying information:
667.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/AttributePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
667.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/AttributePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
667.3 @@ -1,7 +1,10 @@
667.4 /*
667.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
667.6 *
667.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
667.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
667.9 + *
667.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
667.11 + * Other names may be trademarks of their respective owners.
667.12 *
667.13 * The contents of this file are subject to the terms of either the GNU
667.14 * General Public License Version 2 only ("GPL") or the Common
667.15 @@ -13,9 +16,9 @@
667.16 * specific language governing permissions and limitations under the
667.17 * License. When distributing the software, include this License Header
667.18 * Notice in each file and include the License file at
667.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
667.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
667.21 * particular file as subject to the "Classpath" exception as provided
667.22 - * by Sun in the GPL Version 2 section of the License file that
667.23 + * by Oracle in the GPL Version 2 section of the License file that
667.24 * accompanied this code. If applicable, add the following below the
667.25 * License Header, with the fields enclosed by brackets [] replaced by
667.26 * your own identifying information:
668.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/BasicMarkupMouseRegion.java Fri Jul 16 11:47:36 2010 -0400
668.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/BasicMarkupMouseRegion.java Fri Jul 16 14:21:50 2010 -0400
668.3 @@ -1,7 +1,10 @@
668.4 /*
668.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
668.6 *
668.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
668.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
668.9 + *
668.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
668.11 + * Other names may be trademarks of their respective owners.
668.12 *
668.13 * The contents of this file are subject to the terms of either the GNU
668.14 * General Public License Version 2 only ("GPL") or the Common
668.15 @@ -13,9 +16,9 @@
668.16 * specific language governing permissions and limitations under the
668.17 * License. When distributing the software, include this License Header
668.18 * Notice in each file and include the License file at
668.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
668.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
668.21 * particular file as subject to the "Classpath" exception as provided
668.22 - * by Sun in the GPL Version 2 section of the License file that
668.23 + * by Oracle in the GPL Version 2 section of the License file that
668.24 * accompanied this code. If applicable, add the following below the
668.25 * License Header, with the fields enclosed by brackets [] replaced by
668.26 * your own identifying information:
669.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupDesignBean.java Fri Jul 16 11:47:36 2010 -0400
669.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupDesignBean.java Fri Jul 16 14:21:50 2010 -0400
669.3 @@ -1,7 +1,10 @@
669.4 /*
669.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
669.6 *
669.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
669.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
669.9 + *
669.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
669.11 + * Other names may be trademarks of their respective owners.
669.12 *
669.13 * The contents of this file are subject to the terms of either the GNU
669.14 * General Public License Version 2 only ("GPL") or the Common
669.15 @@ -13,9 +16,9 @@
669.16 * specific language governing permissions and limitations under the
669.17 * License. When distributing the software, include this License Header
669.18 * Notice in each file and include the License file at
669.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
669.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
669.21 * particular file as subject to the "Classpath" exception as provided
669.22 - * by Sun in the GPL Version 2 section of the License file that
669.23 + * by Oracle in the GPL Version 2 section of the License file that
669.24 * accompanied this code. If applicable, add the following below the
669.25 * License Header, with the fields enclosed by brackets [] replaced by
669.26 * your own identifying information:
670.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupDesignContext.java Fri Jul 16 11:47:36 2010 -0400
670.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupDesignContext.java Fri Jul 16 14:21:50 2010 -0400
670.3 @@ -1,7 +1,10 @@
670.4 /*
670.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
670.6 *
670.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
670.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
670.9 + *
670.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
670.11 + * Other names may be trademarks of their respective owners.
670.12 *
670.13 * The contents of this file are subject to the terms of either the GNU
670.14 * General Public License Version 2 only ("GPL") or the Common
670.15 @@ -13,9 +16,9 @@
670.16 * specific language governing permissions and limitations under the
670.17 * License. When distributing the software, include this License Header
670.18 * Notice in each file and include the License file at
670.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
670.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
670.21 * particular file as subject to the "Classpath" exception as provided
670.22 - * by Sun in the GPL Version 2 section of the License file that
670.23 + * by Oracle in the GPL Version 2 section of the License file that
670.24 * accompanied this code. If applicable, add the following below the
670.25 * License Header, with the fields enclosed by brackets [] replaced by
670.26 * your own identifying information:
671.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
671.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
671.3 @@ -1,7 +1,10 @@
671.4 /*
671.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
671.6 *
671.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
671.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
671.9 + *
671.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
671.11 + * Other names may be trademarks of their respective owners.
671.12 *
671.13 * The contents of this file are subject to the terms of either the GNU
671.14 * General Public License Version 2 only ("GPL") or the Common
671.15 @@ -13,9 +16,9 @@
671.16 * specific language governing permissions and limitations under the
671.17 * License. When distributing the software, include this License Header
671.18 * Notice in each file and include the License file at
671.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
671.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
671.21 * particular file as subject to the "Classpath" exception as provided
671.22 - * by Sun in the GPL Version 2 section of the License file that
671.23 + * by Oracle in the GPL Version 2 section of the License file that
671.24 * accompanied this code. If applicable, add the following below the
671.25 * License Header, with the fields enclosed by brackets [] replaced by
671.26 * your own identifying information:
672.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupMouseRegion.java Fri Jul 16 11:47:36 2010 -0400
672.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupMouseRegion.java Fri Jul 16 14:21:50 2010 -0400
672.3 @@ -1,7 +1,10 @@
672.4 /*
672.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
672.6 *
672.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
672.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
672.9 + *
672.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
672.11 + * Other names may be trademarks of their respective owners.
672.12 *
672.13 * The contents of this file are subject to the terms of either the GNU
672.14 * General Public License Version 2 only ("GPL") or the Common
672.15 @@ -13,9 +16,9 @@
672.16 * specific language governing permissions and limitations under the
672.17 * License. When distributing the software, include this License Header
672.18 * Notice in each file and include the License file at
672.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
672.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
672.21 * particular file as subject to the "Classpath" exception as provided
672.22 - * by Sun in the GPL Version 2 section of the License file that
672.23 + * by Oracle in the GPL Version 2 section of the License file that
672.24 * accompanied this code. If applicable, add the following below the
672.25 * License Header, with the fields enclosed by brackets [] replaced by
672.26 * your own identifying information:
673.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupPosition.java Fri Jul 16 11:47:36 2010 -0400
673.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupPosition.java Fri Jul 16 14:21:50 2010 -0400
673.3 @@ -1,7 +1,10 @@
673.4 /*
673.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
673.6 *
673.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
673.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
673.9 + *
673.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
673.11 + * Other names may be trademarks of their respective owners.
673.12 *
673.13 * The contents of this file are subject to the terms of either the GNU
673.14 * General Public License Version 2 only ("GPL") or the Common
673.15 @@ -13,9 +16,9 @@
673.16 * specific language governing permissions and limitations under the
673.17 * License. When distributing the software, include this License Header
673.18 * Notice in each file and include the License file at
673.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
673.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
673.21 * particular file as subject to the "Classpath" exception as provided
673.22 - * by Sun in the GPL Version 2 section of the License file that
673.23 + * by Oracle in the GPL Version 2 section of the License file that
673.24 * accompanied this code. If applicable, add the following below the
673.25 * License Header, with the fields enclosed by brackets [] replaced by
673.26 * your own identifying information:
674.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupRenderContext.java Fri Jul 16 11:47:36 2010 -0400
674.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupRenderContext.java Fri Jul 16 14:21:50 2010 -0400
674.3 @@ -1,7 +1,10 @@
674.4 /*
674.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
674.6 *
674.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
674.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
674.9 + *
674.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
674.11 + * Other names may be trademarks of their respective owners.
674.12 *
674.13 * The contents of this file are subject to the terms of either the GNU
674.14 * General Public License Version 2 only ("GPL") or the Common
674.15 @@ -13,9 +16,9 @@
674.16 * specific language governing permissions and limitations under the
674.17 * License. When distributing the software, include this License Header
674.18 * Notice in each file and include the License file at
674.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
674.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
674.21 * particular file as subject to the "Classpath" exception as provided
674.22 - * by Sun in the GPL Version 2 section of the License file that
674.23 + * by Oracle in the GPL Version 2 section of the License file that
674.24 * accompanied this code. If applicable, add the following below the
674.25 * License Header, with the fields enclosed by brackets [] replaced by
674.26 * your own identifying information:
675.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupTableDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
675.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/MarkupTableDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
675.3 @@ -1,7 +1,10 @@
675.4 /*
675.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
675.6 *
675.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
675.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
675.9 + *
675.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
675.11 + * Other names may be trademarks of their respective owners.
675.12 *
675.13 * The contents of this file are subject to the terms of either the GNU
675.14 * General Public License Version 2 only ("GPL") or the Common
675.15 @@ -13,9 +16,9 @@
675.16 * specific language governing permissions and limitations under the
675.17 * License. When distributing the software, include this License Header
675.18 * Notice in each file and include the License file at
675.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
675.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
675.21 * particular file as subject to the "Classpath" exception as provided
675.22 - * by Sun in the GPL Version 2 section of the License file that
675.23 + * by Oracle in the GPL Version 2 section of the License file that
675.24 * accompanied this code. If applicable, add the following below the
675.25 * License Header, with the fields enclosed by brackets [] replaced by
675.26 * your own identifying information:
676.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/markup/StyleClassDescriptor.java Fri Jul 16 11:47:36 2010 -0400
676.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/markup/StyleClassDescriptor.java Fri Jul 16 14:21:50 2010 -0400
676.3 @@ -1,7 +1,10 @@
676.4 /*
676.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
676.6 *
676.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
676.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
676.9 + *
676.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
676.11 + * Other names may be trademarks of their respective owners.
676.12 *
676.13 * The contents of this file are subject to the terms of either the GNU
676.14 * General Public License Version 2 only ("GPL") or the Common
676.15 @@ -13,9 +16,9 @@
676.16 * specific language governing permissions and limitations under the
676.17 * License. When distributing the software, include this License Header
676.18 * Notice in each file and include the License file at
676.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
676.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
676.21 * particular file as subject to the "Classpath" exception as provided
676.22 - * by Sun in the GPL Version 2 section of the License file that
676.23 + * by Oracle in the GPL Version 2 section of the License file that
676.24 * accompanied this code. If applicable, add the following below the
676.25 * License Header, with the fields enclosed by brackets [] replaced by
676.26 * your own identifying information:
677.1 --- a/visualweb.designtime/library/src/com/sun/rave/designtime/module/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
677.2 +++ b/visualweb.designtime/library/src/com/sun/rave/designtime/module/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
677.3 @@ -1,6 +1,9 @@
677.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
677.5 #
677.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
677.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
677.8 +#
677.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
677.10 +# Other names may be trademarks of their respective owners.
677.11 #
677.12 # The contents of this file are subject to the terms of either the GNU
677.13 # General Public License Version 2 only ("GPL") or the Common
677.14 @@ -12,9 +15,9 @@
677.15 # specific language governing permissions and limitations under the
677.16 # License. When distributing the software, include this License Header
677.17 # Notice in each file and include the License file at
677.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
677.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
677.20 # particular file as subject to the "Classpath" exception as provided
677.21 -# by Sun in the GPL Version 2 section of the License file that
677.22 +# by Oracle in the GPL Version 2 section of the License file that
677.23 # accompanied this code. If applicable, add the following below the
677.24 # License Header, with the fields enclosed by brackets [] replaced by
677.25 # your own identifying information:
678.1 --- a/visualweb.designtime/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
678.2 +++ b/visualweb.designtime/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
678.3 @@ -1,6 +1,9 @@
678.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
678.5 #
678.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
678.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
678.8 +#
678.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
678.10 +# Other names may be trademarks of their respective owners.
678.11 #
678.12 # The contents of this file are subject to the terms of either the GNU
678.13 # General Public License Version 2 only ("GPL") or the Common
678.14 @@ -12,9 +15,9 @@
678.15 # specific language governing permissions and limitations under the
678.16 # License. When distributing the software, include this License Header
678.17 # Notice in each file and include the License file at
678.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
678.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
678.20 # particular file as subject to the "Classpath" exception as provided
678.21 -# by Sun in the GPL Version 2 section of the License file that
678.22 +# by Oracle in the GPL Version 2 section of the License file that
678.23 # accompanied this code. If applicable, add the following below the
678.24 # License Header, with the fields enclosed by brackets [] replaced by
678.25 # your own identifying information:
679.1 --- a/visualweb.designtime/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
679.2 +++ b/visualweb.designtime/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
679.3 @@ -2,7 +2,10 @@
679.4 <!--
679.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
679.6
679.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
679.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
679.9 +
679.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
679.11 +Other names may be trademarks of their respective owners.
679.12
679.13
679.14 The contents of this file are subject to the terms of either the GNU
679.15 @@ -15,9 +18,9 @@
679.16 specific language governing permissions and limitations under the
679.17 License. When distributing the software, include this License Header
679.18 Notice in each file and include the License file at
679.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
679.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
679.21 particular file as subject to the "Classpath" exception as provided
679.22 -by Sun in the GPL Version 2 section of the License file that
679.23 +by Oracle in the GPL Version 2 section of the License file that
679.24 accompanied this code. If applicable, add the following below the
679.25 License Header, with the fields enclosed by brackets [] replaced by
679.26 your own identifying information:
680.1 --- a/visualweb.designtime/src/org/netbeans/modules/visualweb/designtime/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
680.2 +++ b/visualweb.designtime/src/org/netbeans/modules/visualweb/designtime/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
680.3 @@ -1,6 +1,9 @@
680.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
680.5 #
680.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
680.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
680.8 +#
680.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
680.10 +# Other names may be trademarks of their respective owners.
680.11 #
680.12 # The contents of this file are subject to the terms of either the GNU
680.13 # General Public License Version 2 only ("GPL") or the Common
680.14 @@ -12,9 +15,9 @@
680.15 # specific language governing permissions and limitations under the
680.16 # License. When distributing the software, include this License Header
680.17 # Notice in each file and include the License file at
680.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
680.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
680.20 # particular file as subject to the "Classpath" exception as provided
680.21 -# by Sun in the GPL Version 2 section of the License file that
680.22 +# by Oracle in the GPL Version 2 section of the License file that
680.23 # accompanied this code. If applicable, add the following below the
680.24 # License Header, with the fields enclosed by brackets [] replaced by
680.25 # your own identifying information:
681.1 --- a/visualweb.designtimeext/build.xml Fri Jul 16 11:47:36 2010 -0400
681.2 +++ b/visualweb.designtimeext/build.xml Fri Jul 16 14:21:50 2010 -0400
681.3 @@ -2,7 +2,10 @@
681.4 <!--
681.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
681.6
681.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
681.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
681.9 +
681.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
681.11 +Other names may be trademarks of their respective owners.
681.12
681.13
681.14 The contents of this file are subject to the terms of either the GNU
681.15 @@ -15,9 +18,9 @@
681.16 specific language governing permissions and limitations under the
681.17 License. When distributing the software, include this License Header
681.18 Notice in each file and include the License file at
681.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
681.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
681.21 particular file as subject to the "Classpath" exception as provided
681.22 -by Sun in the GPL Version 2 section of the License file that
681.23 +by Oracle in the GPL Version 2 section of the License file that
681.24 accompanied this code. If applicable, add the following below the
681.25 License Header, with the fields enclosed by brackets [] replaced by
681.26 your own identifying information:
682.1 --- a/visualweb.designtimeext/library/build.xml Fri Jul 16 11:47:36 2010 -0400
682.2 +++ b/visualweb.designtimeext/library/build.xml Fri Jul 16 14:21:50 2010 -0400
682.3 @@ -2,7 +2,10 @@
682.4 <!--
682.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
682.6
682.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
682.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
682.9 +
682.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
682.11 +Other names may be trademarks of their respective owners.
682.12
682.13
682.14 The contents of this file are subject to the terms of either the GNU
682.15 @@ -15,9 +18,9 @@
682.16 specific language governing permissions and limitations under the
682.17 License. When distributing the software, include this License Header
682.18 Notice in each file and include the License file at
682.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
682.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
682.21 particular file as subject to the "Classpath" exception as provided
682.22 -by Sun in the GPL Version 2 section of the License file that
682.23 +by Oracle in the GPL Version 2 section of the License file that
682.24 accompanied this code. If applicable, add the following below the
682.25 License Header, with the fields enclosed by brackets [] replaced by
682.26 your own identifying information:
683.1 --- a/visualweb.designtimeext/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
683.2 +++ b/visualweb.designtimeext/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
683.3 @@ -1,6 +1,9 @@
683.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
683.5 #
683.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
683.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
683.8 +#
683.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
683.10 +# Other names may be trademarks of their respective owners.
683.11 #
683.12 # The contents of this file are subject to the terms of either the GNU
683.13 # General Public License Version 2 only ("GPL") or the Common
683.14 @@ -12,9 +15,9 @@
683.15 # specific language governing permissions and limitations under the
683.16 # License. When distributing the software, include this License Header
683.17 # Notice in each file and include the License file at
683.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
683.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
683.20 # particular file as subject to the "Classpath" exception as provided
683.21 -# by Sun in the GPL Version 2 section of the License file that
683.22 +# by Oracle in the GPL Version 2 section of the License file that
683.23 # accompanied this code. If applicable, add the following below the
683.24 # License Header, with the fields enclosed by brackets [] replaced by
683.25 # your own identifying information:
684.1 --- a/visualweb.designtimeext/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
684.2 +++ b/visualweb.designtimeext/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
684.3 @@ -2,7 +2,10 @@
684.4 <!--
684.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
684.6
684.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
684.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
684.9 +
684.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
684.11 +Other names may be trademarks of their respective owners.
684.12
684.13
684.14 The contents of this file are subject to the terms of either the GNU
684.15 @@ -15,9 +18,9 @@
684.16 specific language governing permissions and limitations under the
684.17 License. When distributing the software, include this License Header
684.18 Notice in each file and include the License file at
684.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
684.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
684.21 particular file as subject to the "Classpath" exception as provided
684.22 -by Sun in the GPL Version 2 section of the License file that
684.23 +by Oracle in the GPL Version 2 section of the License file that
684.24 accompanied this code. If applicable, add the following below the
684.25 License Header, with the fields enclosed by brackets [] replaced by
684.26 your own identifying information:
685.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/ConstantsExt.java Fri Jul 16 11:47:36 2010 -0400
685.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/ConstantsExt.java Fri Jul 16 14:21:50 2010 -0400
685.3 @@ -1,7 +1,10 @@
685.4 /*
685.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
685.6 *
685.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
685.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
685.9 + *
685.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
685.11 + * Other names may be trademarks of their respective owners.
685.12 *
685.13 * The contents of this file are subject to the terms of either the GNU
685.14 * General Public License Version 2 only ("GPL") or the Common
685.15 @@ -13,9 +16,9 @@
685.16 * specific language governing permissions and limitations under the
685.17 * License. When distributing the software, include this License Header
685.18 * Notice in each file and include the License file at
685.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
685.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
685.21 * particular file as subject to the "Classpath" exception as provided
685.22 - * by Sun in the GPL Version 2 section of the License file that
685.23 + * by Oracle in the GPL Version 2 section of the License file that
685.24 * accompanied this code. If applicable, add the following below the
685.25 * License Header, with the fields enclosed by brackets [] replaced by
685.26 * your own identifying information:
686.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/DesignBeanExt.java Fri Jul 16 11:47:36 2010 -0400
686.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/DesignBeanExt.java Fri Jul 16 14:21:50 2010 -0400
686.3 @@ -1,7 +1,10 @@
686.4 /*
686.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
686.6 *
686.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
686.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
686.9 + *
686.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
686.11 + * Other names may be trademarks of their respective owners.
686.12 *
686.13 * The contents of this file are subject to the terms of either the GNU
686.14 * General Public License Version 2 only ("GPL") or the Common
686.15 @@ -13,9 +16,9 @@
686.16 * specific language governing permissions and limitations under the
686.17 * License. When distributing the software, include this License Header
686.18 * Notice in each file and include the License file at
686.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
686.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
686.21 * particular file as subject to the "Classpath" exception as provided
686.22 - * by Sun in the GPL Version 2 section of the License file that
686.23 + * by Oracle in the GPL Version 2 section of the License file that
686.24 * accompanied this code. If applicable, add the following below the
686.25 * License Header, with the fields enclosed by brackets [] replaced by
686.26 * your own identifying information:
687.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/DesignInfoExt.java Fri Jul 16 11:47:36 2010 -0400
687.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/DesignInfoExt.java Fri Jul 16 14:21:50 2010 -0400
687.3 @@ -1,7 +1,10 @@
687.4 /*
687.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
687.6 *
687.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
687.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
687.9 + *
687.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
687.11 + * Other names may be trademarks of their respective owners.
687.12 *
687.13 * The contents of this file are subject to the terms of either the GNU
687.14 * General Public License Version 2 only ("GPL") or the Common
687.15 @@ -13,9 +16,9 @@
687.16 * specific language governing permissions and limitations under the
687.17 * License. When distributing the software, include this License Header
687.18 * Notice in each file and include the License file at
687.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
687.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
687.21 * particular file as subject to the "Classpath" exception as provided
687.22 - * by Sun in the GPL Version 2 section of the License file that
687.23 + * by Oracle in the GPL Version 2 section of the License file that
687.24 * accompanied this code. If applicable, add the following below the
687.25 * License Header, with the fields enclosed by brackets [] replaced by
687.26 * your own identifying information:
688.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ColorWrapper.java Fri Jul 16 11:47:36 2010 -0400
688.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ColorWrapper.java Fri Jul 16 14:21:50 2010 -0400
688.3 @@ -1,7 +1,10 @@
688.4 /*
688.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
688.6 *
688.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
688.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
688.9 + *
688.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
688.11 + * Other names may be trademarks of their respective owners.
688.12 *
688.13 * The contents of this file are subject to the terms of either the GNU
688.14 * General Public License Version 2 only ("GPL") or the Common
688.15 @@ -13,9 +16,9 @@
688.16 * specific language governing permissions and limitations under the
688.17 * License. When distributing the software, include this License Header
688.18 * Notice in each file and include the License file at
688.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
688.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
688.21 * particular file as subject to the "Classpath" exception as provided
688.22 - * by Sun in the GPL Version 2 section of the License file that
688.23 + * by Oracle in the GPL Version 2 section of the License file that
688.24 * accompanied this code. If applicable, add the following below the
688.25 * License Header, with the fields enclosed by brackets [] replaced by
688.26 * your own identifying information:
689.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ComponentGroup.java Fri Jul 16 11:47:36 2010 -0400
689.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ComponentGroup.java Fri Jul 16 14:21:50 2010 -0400
689.3 @@ -1,7 +1,10 @@
689.4 /*
689.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
689.6 *
689.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
689.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
689.9 + *
689.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
689.11 + * Other names may be trademarks of their respective owners.
689.12 *
689.13 * The contents of this file are subject to the terms of either the GNU
689.14 * General Public License Version 2 only ("GPL") or the Common
689.15 @@ -13,9 +16,9 @@
689.16 * specific language governing permissions and limitations under the
689.17 * License. When distributing the software, include this License Header
689.18 * Notice in each file and include the License file at
689.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
689.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
689.21 * particular file as subject to the "Classpath" exception as provided
689.22 - * by Sun in the GPL Version 2 section of the License file that
689.23 + * by Oracle in the GPL Version 2 section of the License file that
689.24 * accompanied this code. If applicable, add the following below the
689.25 * License Header, with the fields enclosed by brackets [] replaced by
689.26 * your own identifying information:
690.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ComponentGroupDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
690.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ComponentGroupDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
690.3 @@ -1,7 +1,10 @@
690.4 /*
690.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
690.6 *
690.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
690.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
690.9 + *
690.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
690.11 + * Other names may be trademarks of their respective owners.
690.12 *
690.13 * The contents of this file are subject to the terms of either the GNU
690.14 * General Public License Version 2 only ("GPL") or the Common
690.15 @@ -13,9 +16,9 @@
690.16 * specific language governing permissions and limitations under the
690.17 * License. When distributing the software, include this License Header
690.18 * Notice in each file and include the License file at
690.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
690.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
690.21 * particular file as subject to the "Classpath" exception as provided
690.22 - * by Sun in the GPL Version 2 section of the License file that
690.23 + * by Oracle in the GPL Version 2 section of the License file that
690.24 * accompanied this code. If applicable, add the following below the
690.25 * License Header, with the fields enclosed by brackets [] replaced by
690.26 * your own identifying information:
691.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ComponentGroupHolder.java Fri Jul 16 11:47:36 2010 -0400
691.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ComponentGroupHolder.java Fri Jul 16 14:21:50 2010 -0400
691.3 @@ -1,7 +1,10 @@
691.4 /*
691.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
691.6 *
691.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
691.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
691.9 + *
691.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
691.11 + * Other names may be trademarks of their respective owners.
691.12 *
691.13 * The contents of this file are subject to the terms of either the GNU
691.14 * General Public License Version 2 only ("GPL") or the Common
691.15 @@ -13,9 +16,9 @@
691.16 * specific language governing permissions and limitations under the
691.17 * License. When distributing the software, include this License Header
691.18 * Notice in each file and include the License file at
691.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
691.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
691.21 * particular file as subject to the "Classpath" exception as provided
691.22 - * by Sun in the GPL Version 2 section of the License file that
691.23 + * by Oracle in the GPL Version 2 section of the License file that
691.24 * accompanied this code. If applicable, add the following below the
691.25 * License Header, with the fields enclosed by brackets [] replaced by
691.26 * your own identifying information:
692.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ComponentSubset.java Fri Jul 16 11:47:36 2010 -0400
692.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/ComponentSubset.java Fri Jul 16 14:21:50 2010 -0400
692.3 @@ -1,7 +1,10 @@
692.4 /*
692.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
692.6 *
692.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
692.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
692.9 + *
692.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
692.11 + * Other names may be trademarks of their respective owners.
692.12 *
692.13 * The contents of this file are subject to the terms of either the GNU
692.14 * General Public License Version 2 only ("GPL") or the Common
692.15 @@ -13,9 +16,9 @@
692.16 * specific language governing permissions and limitations under the
692.17 * License. When distributing the software, include this License Header
692.18 * Notice in each file and include the License file at
692.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
692.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
692.21 * particular file as subject to the "Classpath" exception as provided
692.22 - * by Sun in the GPL Version 2 section of the License file that
692.23 + * by Oracle in the GPL Version 2 section of the License file that
692.24 * accompanied this code. If applicable, add the following below the
692.25 * License Header, with the fields enclosed by brackets [] replaced by
692.26 * your own identifying information:
693.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/impl/ColorWrapperImpl.java Fri Jul 16 11:47:36 2010 -0400
693.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/impl/ColorWrapperImpl.java Fri Jul 16 14:21:50 2010 -0400
693.3 @@ -1,7 +1,10 @@
693.4 /*
693.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
693.6 *
693.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
693.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
693.9 + *
693.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
693.11 + * Other names may be trademarks of their respective owners.
693.12 *
693.13 * The contents of this file are subject to the terms of either the GNU
693.14 * General Public License Version 2 only ("GPL") or the Common
693.15 @@ -13,9 +16,9 @@
693.16 * specific language governing permissions and limitations under the
693.17 * License. When distributing the software, include this License Header
693.18 * Notice in each file and include the License file at
693.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
693.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
693.21 * particular file as subject to the "Classpath" exception as provided
693.22 - * by Sun in the GPL Version 2 section of the License file that
693.23 + * by Oracle in the GPL Version 2 section of the License file that
693.24 * accompanied this code. If applicable, add the following below the
693.25 * License Header, with the fields enclosed by brackets [] replaced by
693.26 * your own identifying information:
694.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/impl/ComponentGroupImpl.java Fri Jul 16 11:47:36 2010 -0400
694.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/impl/ComponentGroupImpl.java Fri Jul 16 14:21:50 2010 -0400
694.3 @@ -1,7 +1,10 @@
694.4 /*
694.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
694.6 *
694.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
694.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
694.9 + *
694.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
694.11 + * Other names may be trademarks of their respective owners.
694.12 *
694.13 * The contents of this file are subject to the terms of either the GNU
694.14 * General Public License Version 2 only ("GPL") or the Common
694.15 @@ -13,9 +16,9 @@
694.16 * specific language governing permissions and limitations under the
694.17 * License. When distributing the software, include this License Header
694.18 * Notice in each file and include the License file at
694.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
694.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
694.21 * particular file as subject to the "Classpath" exception as provided
694.22 - * by Sun in the GPL Version 2 section of the License file that
694.23 + * by Oracle in the GPL Version 2 section of the License file that
694.24 * accompanied this code. If applicable, add the following below the
694.25 * License Header, with the fields enclosed by brackets [] replaced by
694.26 * your own identifying information:
695.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/impl/ComponentSubsetImpl.java Fri Jul 16 11:47:36 2010 -0400
695.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/impl/ComponentSubsetImpl.java Fri Jul 16 14:21:50 2010 -0400
695.3 @@ -1,7 +1,10 @@
695.4 /*
695.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
695.6 *
695.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
695.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
695.9 + *
695.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
695.11 + * Other names may be trademarks of their respective owners.
695.12 *
695.13 * The contents of this file are subject to the terms of either the GNU
695.14 * General Public License Version 2 only ("GPL") or the Common
695.15 @@ -13,9 +16,9 @@
695.16 * specific language governing permissions and limitations under the
695.17 * License. When distributing the software, include this License Header
695.18 * Notice in each file and include the License file at
695.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
695.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
695.21 * particular file as subject to the "Classpath" exception as provided
695.22 - * by Sun in the GPL Version 2 section of the License file that
695.23 + * by Oracle in the GPL Version 2 section of the License file that
695.24 * accompanied this code. If applicable, add the following below the
695.25 * License Header, with the fields enclosed by brackets [] replaced by
695.26 * your own identifying information:
696.1 --- a/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/util/ComponentGroupHelper.java Fri Jul 16 11:47:36 2010 -0400
696.2 +++ b/visualweb.designtimeext/library/src/com/sun/rave/designtime/ext/componentgroup/util/ComponentGroupHelper.java Fri Jul 16 14:21:50 2010 -0400
696.3 @@ -1,7 +1,10 @@
696.4 /*
696.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
696.6 *
696.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
696.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
696.9 + *
696.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
696.11 + * Other names may be trademarks of their respective owners.
696.12 *
696.13 * The contents of this file are subject to the terms of either the GNU
696.14 * General Public License Version 2 only ("GPL") or the Common
696.15 @@ -13,9 +16,9 @@
696.16 * specific language governing permissions and limitations under the
696.17 * License. When distributing the software, include this License Header
696.18 * Notice in each file and include the License file at
696.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
696.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
696.21 * particular file as subject to the "Classpath" exception as provided
696.22 - * by Sun in the GPL Version 2 section of the License file that
696.23 + * by Oracle in the GPL Version 2 section of the License file that
696.24 * accompanied this code. If applicable, add the following below the
696.25 * License Header, with the fields enclosed by brackets [] replaced by
696.26 * your own identifying information:
697.1 --- a/visualweb.designtimeext/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
697.2 +++ b/visualweb.designtimeext/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
697.3 @@ -1,6 +1,9 @@
697.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
697.5 #
697.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
697.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
697.8 +#
697.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
697.10 +# Other names may be trademarks of their respective owners.
697.11 #
697.12 # The contents of this file are subject to the terms of either the GNU
697.13 # General Public License Version 2 only ("GPL") or the Common
697.14 @@ -12,9 +15,9 @@
697.15 # specific language governing permissions and limitations under the
697.16 # License. When distributing the software, include this License Header
697.17 # Notice in each file and include the License file at
697.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
697.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
697.20 # particular file as subject to the "Classpath" exception as provided
697.21 -# by Sun in the GPL Version 2 section of the License file that
697.22 +# by Oracle in the GPL Version 2 section of the License file that
697.23 # accompanied this code. If applicable, add the following below the
697.24 # License Header, with the fields enclosed by brackets [] replaced by
697.25 # your own identifying information:
697.26 @@ -37,5 +40,5 @@
697.27 # Version 2 license, then the option applies only if the new code is
697.28 # made subject to such option by the copyright holder.
697.29 javac.compilerargs=-Xlint:unchecked
697.30 -javac.source=1.5
697.31 +javac.source=1.6
697.32 extra.module.files=modules/ext/designtimeext.jar
698.1 --- a/visualweb.designtimeext/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
698.2 +++ b/visualweb.designtimeext/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
698.3 @@ -2,7 +2,10 @@
698.4 <!--
698.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
698.6
698.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
698.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
698.9 +
698.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
698.11 +Other names may be trademarks of their respective owners.
698.12
698.13
698.14 The contents of this file are subject to the terms of either the GNU
698.15 @@ -15,9 +18,9 @@
698.16 specific language governing permissions and limitations under the
698.17 License. When distributing the software, include this License Header
698.18 Notice in each file and include the License file at
698.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
698.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
698.21 particular file as subject to the "Classpath" exception as provided
698.22 -by Sun in the GPL Version 2 section of the License file that
698.23 +by Oracle in the GPL Version 2 section of the License file that
698.24 accompanied this code. If applicable, add the following below the
698.25 License Header, with the fields enclosed by brackets [] replaced by
698.26 your own identifying information:
699.1 --- a/visualweb.designtimeext/src/org/netbeans/modules/visualweb/designtimeext/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
699.2 +++ b/visualweb.designtimeext/src/org/netbeans/modules/visualweb/designtimeext/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
699.3 @@ -1,6 +1,9 @@
699.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
699.5 #
699.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
699.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
699.8 +#
699.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
699.10 +# Other names may be trademarks of their respective owners.
699.11 #
699.12 # The contents of this file are subject to the terms of either the GNU
699.13 # General Public License Version 2 only ("GPL") or the Common
699.14 @@ -12,9 +15,9 @@
699.15 # specific language governing permissions and limitations under the
699.16 # License. When distributing the software, include this License Header
699.17 # Notice in each file and include the License file at
699.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
699.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
699.20 # particular file as subject to the "Classpath" exception as provided
699.21 -# by Sun in the GPL Version 2 section of the License file that
699.22 +# by Oracle in the GPL Version 2 section of the License file that
699.23 # accompanied this code. If applicable, add the following below the
699.24 # License Header, with the fields enclosed by brackets [] replaced by
699.25 # your own identifying information:
700.1 --- a/visualweb.ejb/build.xml Fri Jul 16 11:47:36 2010 -0400
700.2 +++ b/visualweb.ejb/build.xml Fri Jul 16 14:21:50 2010 -0400
700.3 @@ -2,7 +2,10 @@
700.4 <!--
700.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
700.6
700.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
700.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
700.9 +
700.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
700.11 +Other names may be trademarks of their respective owners.
700.12
700.13
700.14 The contents of this file are subject to the terms of either the GNU
700.15 @@ -15,9 +18,9 @@
700.16 specific language governing permissions and limitations under the
700.17 License. When distributing the software, include this License Header
700.18 Notice in each file and include the License file at
700.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
700.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
700.21 particular file as subject to the "Classpath" exception as provided
700.22 -by Sun in the GPL Version 2 section of the License file that
700.23 +by Oracle in the GPL Version 2 section of the License file that
700.24 accompanied this code. If applicable, add the following below the
700.25 License Header, with the fields enclosed by brackets [] replaced by
700.26 your own identifying information:
701.1 --- a/visualweb.ejb/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
701.2 +++ b/visualweb.ejb/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
701.3 @@ -1,6 +1,9 @@
701.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
701.5 #
701.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
701.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
701.8 +#
701.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
701.10 +# Other names may be trademarks of their respective owners.
701.11 #
701.12 # The contents of this file are subject to the terms of either the GNU
701.13 # General Public License Version 2 only ("GPL") or the Common
701.14 @@ -12,9 +15,9 @@
701.15 # specific language governing permissions and limitations under the
701.16 # License. When distributing the software, include this License Header
701.17 # Notice in each file and include the License file at
701.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
701.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
701.20 # particular file as subject to the "Classpath" exception as provided
701.21 -# by Sun in the GPL Version 2 section of the License file that
701.22 +# by Oracle in the GPL Version 2 section of the License file that
701.23 # accompanied this code. If applicable, add the following below the
701.24 # License Header, with the fields enclosed by brackets [] replaced by
701.25 # your own identifying information:
701.26 @@ -39,7 +42,7 @@
701.27
701.28 # manifest.mf=Manifest.mf
701.29 javac.compilerargs=-Xlint -Xlint:-serial
701.30 -javac.source=1.5
701.31 +javac.source=1.6
701.32 test.qa-functional.cp.extra=${nb_all}/visualweb.kit/gravy/builds/gravy.jar:\
701.33 ${visualweb.ejb.dir}/modules/ext/tidy-mod.jar:\
701.34 ${nb_all}/testtools/external/httpunit.jar
702.1 --- a/visualweb.ejb/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
702.2 +++ b/visualweb.ejb/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
702.3 @@ -2,7 +2,10 @@
702.4 <!--
702.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
702.6
702.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
702.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
702.9 +
702.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
702.11 +Other names may be trademarks of their respective owners.
702.12
702.13
702.14 The contents of this file are subject to the terms of either the GNU
702.15 @@ -15,9 +18,9 @@
702.16 specific language governing permissions and limitations under the
702.17 License. When distributing the software, include this License Header
702.18 Notice in each file and include the License file at
702.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
702.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
702.21 particular file as subject to the "Classpath" exception as provided
702.22 -by Sun in the GPL Version 2 section of the License file that
702.23 +by Oracle in the GPL Version 2 section of the License file that
702.24 accompanied this code. If applicable, add the following below the
702.25 License Header, with the fields enclosed by brackets [] replaced by
702.26 your own identifying information:
702.27 @@ -222,7 +225,15 @@
702.28 <build-prerequisite/>
702.29 <compile-dependency/>
702.30 <run-dependency>
702.31 - <specification-version>7.22</specification-version>
702.32 + <specification-version>8.0</specification-version>
702.33 + </run-dependency>
702.34 + </dependency>
702.35 + <dependency>
702.36 + <code-name-base>org.openide.util.lookup</code-name-base>
702.37 + <build-prerequisite/>
702.38 + <compile-dependency/>
702.39 + <run-dependency>
702.40 + <specification-version>8.0</specification-version>
702.41 </run-dependency>
702.42 </dependency>
702.43 <dependency>
703.1 --- a/visualweb.ejb/postinstallsrc/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
703.2 +++ b/visualweb.ejb/postinstallsrc/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
703.3 @@ -1,6 +1,9 @@
703.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
703.5 #
703.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
703.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
703.8 +#
703.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
703.10 +# Other names may be trademarks of their respective owners.
703.11 #
703.12 # The contents of this file are subject to the terms of either the GNU
703.13 # General Public License Version 2 only ("GPL") or the Common
703.14 @@ -12,9 +15,9 @@
703.15 # specific language governing permissions and limitations under the
703.16 # License. When distributing the software, include this License Header
703.17 # Notice in each file and include the License file at
703.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
703.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
703.20 # particular file as subject to the "Classpath" exception as provided
703.21 -# by Sun in the GPL Version 2 section of the License file that
703.22 +# by Oracle in the GPL Version 2 section of the License file that
703.23 # accompanied this code. If applicable, add the following below the
703.24 # License Header, with the fields enclosed by brackets [] replaced by
703.25 # your own identifying information:
704.1 --- a/visualweb.ejb/postinstallsrc/PostInstall.java Fri Jul 16 11:47:36 2010 -0400
704.2 +++ b/visualweb.ejb/postinstallsrc/PostInstall.java Fri Jul 16 14:21:50 2010 -0400
704.3 @@ -1,7 +1,10 @@
704.4 /*
704.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
704.6 *
704.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
704.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
704.9 + *
704.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
704.11 + * Other names may be trademarks of their respective owners.
704.12 *
704.13 * The contents of this file are subject to the terms of either the GNU
704.14 * General Public License Version 2 only ("GPL") or the Common
704.15 @@ -13,9 +16,9 @@
704.16 * specific language governing permissions and limitations under the
704.17 * License. When distributing the software, include this License Header
704.18 * Notice in each file and include the License file at
704.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
704.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
704.21 * particular file as subject to the "Classpath" exception as provided
704.22 - * by Sun in the GPL Version 2 section of the License file that
704.23 + * by Oracle in the GPL Version 2 section of the License file that
704.24 * accompanied this code. If applicable, add the following below the
704.25 * License Header, with the fields enclosed by brackets [] replaced by
704.26 * your own identifying information:
705.1 --- a/visualweb.ejb/postinstallsrc/ProgressWindow.java Fri Jul 16 11:47:36 2010 -0400
705.2 +++ b/visualweb.ejb/postinstallsrc/ProgressWindow.java Fri Jul 16 14:21:50 2010 -0400
705.3 @@ -1,7 +1,10 @@
705.4 /*
705.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
705.6 *
705.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
705.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
705.9 + *
705.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
705.11 + * Other names may be trademarks of their respective owners.
705.12 *
705.13 * The contents of this file are subject to the terms of either the GNU
705.14 * General Public License Version 2 only ("GPL") or the Common
705.15 @@ -13,9 +16,9 @@
705.16 * specific language governing permissions and limitations under the
705.17 * License. When distributing the software, include this License Header
705.18 * Notice in each file and include the License file at
705.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
705.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
705.21 * particular file as subject to the "Classpath" exception as provided
705.22 - * by Sun in the GPL Version 2 section of the License file that
705.23 + * by Oracle in the GPL Version 2 section of the License file that
705.24 * accompanied this code. If applicable, add the following below the
705.25 * License Header, with the fields enclosed by brackets [] replaced by
705.26 * your own identifying information:
706.1 --- a/visualweb.ejb/postinstallsrc/RunCommand.java Fri Jul 16 11:47:36 2010 -0400
706.2 +++ b/visualweb.ejb/postinstallsrc/RunCommand.java Fri Jul 16 14:21:50 2010 -0400
706.3 @@ -1,7 +1,10 @@
706.4 /*
706.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
706.6 *
706.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
706.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
706.9 + *
706.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
706.11 + * Other names may be trademarks of their respective owners.
706.12 *
706.13 * The contents of this file are subject to the terms of either the GNU
706.14 * General Public License Version 2 only ("GPL") or the Common
706.15 @@ -13,9 +16,9 @@
706.16 * specific language governing permissions and limitations under the
706.17 * License. When distributing the software, include this License Header
706.18 * Notice in each file and include the License file at
706.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
706.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
706.21 * particular file as subject to the "Classpath" exception as provided
706.22 - * by Sun in the GPL Version 2 section of the License file that
706.23 + * by Oracle in the GPL Version 2 section of the License file that
706.24 * accompanied this code. If applicable, add the following below the
706.25 * License Header, with the fields enclosed by brackets [] replaced by
706.26 * your own identifying information:
707.1 --- a/visualweb.ejb/postinstallsrc/main.properties Fri Jul 16 11:47:36 2010 -0400
707.2 +++ b/visualweb.ejb/postinstallsrc/main.properties Fri Jul 16 14:21:50 2010 -0400
707.3 @@ -1,6 +1,9 @@
707.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
707.5 #
707.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
707.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
707.8 +#
707.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
707.10 +# Other names may be trademarks of their respective owners.
707.11 #
707.12 # The contents of this file are subject to the terms of either the GNU
707.13 # General Public License Version 2 only ("GPL") or the Common
707.14 @@ -12,9 +15,9 @@
707.15 # specific language governing permissions and limitations under the
707.16 # License. When distributing the software, include this License Header
707.17 # Notice in each file and include the License file at
707.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
707.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
707.20 # particular file as subject to the "Classpath" exception as provided
707.21 -# by Sun in the GPL Version 2 section of the License file that
707.22 +# by Oracle in the GPL Version 2 section of the License file that
707.23 # accompanied this code. If applicable, add the following below the
707.24 # License Header, with the fields enclosed by brackets [] replaced by
707.25 # your own identifying information:
708.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
708.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
708.3 @@ -1,6 +1,9 @@
708.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
708.5 #
708.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
708.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
708.8 +#
708.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
708.10 +# Other names may be trademarks of their respective owners.
708.11 #
708.12 # The contents of this file are subject to the terms of either the GNU
708.13 # General Public License Version 2 only ("GPL") or the Common
708.14 @@ -12,9 +15,9 @@
708.15 # specific language governing permissions and limitations under the
708.16 # License. When distributing the software, include this License Header
708.17 # Notice in each file and include the License file at
708.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
708.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
708.20 # particular file as subject to the "Classpath" exception as provided
708.21 -# by Sun in the GPL Version 2 section of the License file that
708.22 +# by Oracle in the GPL Version 2 section of the License file that
708.23 # accompanied this code. If applicable, add the following below the
708.24 # License Header, with the fields enclosed by brackets [] replaced by
708.25 # your own identifying information:
709.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/EjbDataSourceManager.java Fri Jul 16 11:47:36 2010 -0400
709.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/EjbDataSourceManager.java Fri Jul 16 14:21:50 2010 -0400
709.3 @@ -1,7 +1,10 @@
709.4 /*
709.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
709.6 *
709.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
709.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
709.9 + *
709.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
709.11 + * Other names may be trademarks of their respective owners.
709.12 *
709.13 * The contents of this file are subject to the terms of either the GNU
709.14 * General Public License Version 2 only ("GPL") or the Common
709.15 @@ -13,9 +16,9 @@
709.16 * specific language governing permissions and limitations under the
709.17 * License. When distributing the software, include this License Header
709.18 * Notice in each file and include the License file at
709.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
709.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
709.21 * particular file as subject to the "Classpath" exception as provided
709.22 - * by Sun in the GPL Version 2 section of the License file that
709.23 + * by Oracle in the GPL Version 2 section of the License file that
709.24 * accompanied this code. If applicable, add the following below the
709.25 * License Header, with the fields enclosed by brackets [] replaced by
709.26 * your own identifying information:
710.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/EjbDataSourceModuleInstaller.java Fri Jul 16 11:47:36 2010 -0400
710.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/EjbDataSourceModuleInstaller.java Fri Jul 16 14:21:50 2010 -0400
710.3 @@ -1,7 +1,10 @@
710.4 /*
710.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
710.6 *
710.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
710.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
710.9 + *
710.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
710.11 + * Other names may be trademarks of their respective owners.
710.12 *
710.13 * The contents of this file are subject to the terms of either the GNU
710.14 * General Public License Version 2 only ("GPL") or the Common
710.15 @@ -13,9 +16,9 @@
710.16 * specific language governing permissions and limitations under the
710.17 * License. When distributing the software, include this License Header
710.18 * Notice in each file and include the License file at
710.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
710.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
710.21 * particular file as subject to the "Classpath" exception as provided
710.22 - * by Sun in the GPL Version 2 section of the License file that
710.23 + * by Oracle in the GPL Version 2 section of the License file that
710.24 * accompanied this code. If applicable, add the following below the
710.25 * License Header, with the fields enclosed by brackets [] replaced by
710.26 * your own identifying information:
711.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/EjbRefMaintainer.java Fri Jul 16 11:47:36 2010 -0400
711.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/EjbRefMaintainer.java Fri Jul 16 14:21:50 2010 -0400
711.3 @@ -1,7 +1,10 @@
711.4 /*
711.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
711.6 *
711.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
711.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
711.9 + *
711.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
711.11 + * Other names may be trademarks of their respective owners.
711.12 *
711.13 * The contents of this file are subject to the terms of either the GNU
711.14 * General Public License Version 2 only ("GPL") or the Common
711.15 @@ -13,9 +16,9 @@
711.16 * specific language governing permissions and limitations under the
711.17 * License. When distributing the software, include this License Header
711.18 * Notice in each file and include the License file at
711.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
711.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
711.21 * particular file as subject to the "Classpath" exception as provided
711.22 - * by Sun in the GPL Version 2 section of the License file that
711.23 + * by Oracle in the GPL Version 2 section of the License file that
711.24 * accompanied this code. If applicable, add the following below the
711.25 * License Header, with the fields enclosed by brackets [] replaced by
711.26 * your own identifying information:
712.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/EjbRefTracker.java Fri Jul 16 11:47:36 2010 -0400
712.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/EjbRefTracker.java Fri Jul 16 14:21:50 2010 -0400
712.3 @@ -1,7 +1,10 @@
712.4 /*
712.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
712.6 *
712.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
712.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
712.9 + *
712.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
712.11 + * Other names may be trademarks of their respective owners.
712.12 *
712.13 * The contents of this file are subject to the terms of either the GNU
712.14 * General Public License Version 2 only ("GPL") or the Common
712.15 @@ -13,9 +16,9 @@
712.16 * specific language governing permissions and limitations under the
712.17 * License. When distributing the software, include this License Header
712.18 * Notice in each file and include the License file at
712.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
712.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
712.21 * particular file as subject to the "Classpath" exception as provided
712.22 - * by Sun in the GPL Version 2 section of the License file that
712.23 + * by Oracle in the GPL Version 2 section of the License file that
712.24 * accompanied this code. If applicable, add the following below the
712.25 * License Header, with the fields enclosed by brackets [] replaced by
712.26 * your own identifying information:
713.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/AddEjbGroupAction.java Fri Jul 16 11:47:36 2010 -0400
713.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/AddEjbGroupAction.java Fri Jul 16 14:21:50 2010 -0400
713.3 @@ -1,7 +1,10 @@
713.4 /*
713.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
713.6 *
713.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
713.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
713.9 + *
713.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
713.11 + * Other names may be trademarks of their respective owners.
713.12 *
713.13 * The contents of this file are subject to the terms of either the GNU
713.14 * General Public License Version 2 only ("GPL") or the Common
713.15 @@ -13,9 +16,9 @@
713.16 * specific language governing permissions and limitations under the
713.17 * License. When distributing the software, include this License Header
713.18 * Notice in each file and include the License file at
713.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
713.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
713.21 * particular file as subject to the "Classpath" exception as provided
713.22 - * by Sun in the GPL Version 2 section of the License file that
713.23 + * by Oracle in the GPL Version 2 section of the License file that
713.24 * accompanied this code. If applicable, add the following below the
713.25 * License Header, with the fields enclosed by brackets [] replaced by
713.26 * your own identifying information:
714.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
714.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
714.3 @@ -1,6 +1,9 @@
714.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
714.5 #
714.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
714.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
714.8 +#
714.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
714.10 +# Other names may be trademarks of their respective owners.
714.11 #
714.12 # The contents of this file are subject to the terms of either the GNU
714.13 # General Public License Version 2 only ("GPL") or the Common
714.14 @@ -12,9 +15,9 @@
714.15 # specific language governing permissions and limitations under the
714.16 # License. When distributing the software, include this License Header
714.17 # Notice in each file and include the License file at
714.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
714.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
714.20 # particular file as subject to the "Classpath" exception as provided
714.21 -# by Sun in the GPL Version 2 section of the License file that
714.22 +# by Oracle in the GPL Version 2 section of the License file that
714.23 # accompanied this code. If applicable, add the following below the
714.24 # License Header, with the fields enclosed by brackets [] replaced by
714.25 # your own identifying information:
715.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ConfigureMethodsAction.java Fri Jul 16 11:47:36 2010 -0400
715.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ConfigureMethodsAction.java Fri Jul 16 14:21:50 2010 -0400
715.3 @@ -1,7 +1,10 @@
715.4 /*
715.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
715.6 *
715.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
715.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
715.9 + *
715.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
715.11 + * Other names may be trademarks of their respective owners.
715.12 *
715.13 * The contents of this file are subject to the terms of either the GNU
715.14 * General Public License Version 2 only ("GPL") or the Common
715.15 @@ -13,9 +16,9 @@
715.16 * specific language governing permissions and limitations under the
715.17 * License. When distributing the software, include this License Header
715.18 * Notice in each file and include the License file at
715.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
715.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
715.21 * particular file as subject to the "Classpath" exception as provided
715.22 - * by Sun in the GPL Version 2 section of the License file that
715.23 + * by Oracle in the GPL Version 2 section of the License file that
715.24 * accompanied this code. If applicable, add the following below the
715.25 * License Header, with the fields enclosed by brackets [] replaced by
715.26 * your own identifying information:
716.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/DeleteEjbGroupAction.java Fri Jul 16 11:47:36 2010 -0400
716.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/DeleteEjbGroupAction.java Fri Jul 16 14:21:50 2010 -0400
716.3 @@ -1,7 +1,10 @@
716.4 /*
716.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
716.6 *
716.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
716.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
716.9 + *
716.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
716.11 + * Other names may be trademarks of their respective owners.
716.12 *
716.13 * The contents of this file are subject to the terms of either the GNU
716.14 * General Public License Version 2 only ("GPL") or the Common
716.15 @@ -13,9 +16,9 @@
716.16 * specific language governing permissions and limitations under the
716.17 * License. When distributing the software, include this License Header
716.18 * Notice in each file and include the License file at
716.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
716.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
716.21 * particular file as subject to the "Classpath" exception as provided
716.22 - * by Sun in the GPL Version 2 section of the License file that
716.23 + * by Oracle in the GPL Version 2 section of the License file that
716.24 * accompanied this code. If applicable, add the following below the
716.25 * License Header, with the fields enclosed by brackets [] replaced by
716.26 * your own identifying information:
717.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ExportAllEjbDataSourcesAction.java Fri Jul 16 11:47:36 2010 -0400
717.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ExportAllEjbDataSourcesAction.java Fri Jul 16 14:21:50 2010 -0400
717.3 @@ -1,7 +1,10 @@
717.4 /*
717.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
717.6 *
717.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
717.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
717.9 + *
717.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
717.11 + * Other names may be trademarks of their respective owners.
717.12 *
717.13 * The contents of this file are subject to the terms of either the GNU
717.14 * General Public License Version 2 only ("GPL") or the Common
717.15 @@ -13,9 +16,9 @@
717.16 * specific language governing permissions and limitations under the
717.17 * License. When distributing the software, include this License Header
717.18 * Notice in each file and include the License file at
717.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
717.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
717.21 * particular file as subject to the "Classpath" exception as provided
717.22 - * by Sun in the GPL Version 2 section of the License file that
717.23 + * by Oracle in the GPL Version 2 section of the License file that
717.24 * accompanied this code. If applicable, add the following below the
717.25 * License Header, with the fields enclosed by brackets [] replaced by
717.26 * your own identifying information:
718.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ExportEjbDataSourceAction.java Fri Jul 16 11:47:36 2010 -0400
718.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ExportEjbDataSourceAction.java Fri Jul 16 14:21:50 2010 -0400
718.3 @@ -1,7 +1,10 @@
718.4 /*
718.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
718.6 *
718.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
718.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
718.9 + *
718.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
718.11 + * Other names may be trademarks of their respective owners.
718.12 *
718.13 * The contents of this file are subject to the terms of either the GNU
718.14 * General Public License Version 2 only ("GPL") or the Common
718.15 @@ -13,9 +16,9 @@
718.16 * specific language governing permissions and limitations under the
718.17 * License. When distributing the software, include this License Header
718.18 * Notice in each file and include the License file at
718.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
718.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
718.21 * particular file as subject to the "Classpath" exception as provided
718.22 - * by Sun in the GPL Version 2 section of the License file that
718.23 + * by Oracle in the GPL Version 2 section of the License file that
718.24 * accompanied this code. If applicable, add the following below the
718.25 * License Header, with the fields enclosed by brackets [] replaced by
718.26 * your own identifying information:
719.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ImportEjbDataSourceAction.java Fri Jul 16 11:47:36 2010 -0400
719.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ImportEjbDataSourceAction.java Fri Jul 16 14:21:50 2010 -0400
719.3 @@ -1,7 +1,10 @@
719.4 /*
719.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
719.6 *
719.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
719.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
719.9 + *
719.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
719.11 + * Other names may be trademarks of their respective owners.
719.12 *
719.13 * The contents of this file are subject to the terms of either the GNU
719.14 * General Public License Version 2 only ("GPL") or the Common
719.15 @@ -13,9 +16,9 @@
719.16 * specific language governing permissions and limitations under the
719.17 * License. When distributing the software, include this License Header
719.18 * Notice in each file and include the License file at
719.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
719.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
719.21 * particular file as subject to the "Classpath" exception as provided
719.22 - * by Sun in the GPL Version 2 section of the License file that
719.23 + * by Oracle in the GPL Version 2 section of the License file that
719.24 * accompanied this code. If applicable, add the following below the
719.25 * License Header, with the fields enclosed by brackets [] replaced by
719.26 * your own identifying information:
720.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ModifyEjbGroupAction.java Fri Jul 16 11:47:36 2010 -0400
720.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/ModifyEjbGroupAction.java Fri Jul 16 14:21:50 2010 -0400
720.3 @@ -1,7 +1,10 @@
720.4 /*
720.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
720.6 *
720.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
720.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
720.9 + *
720.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
720.11 + * Other names may be trademarks of their respective owners.
720.12 *
720.13 * The contents of this file are subject to the terms of either the GNU
720.14 * General Public License Version 2 only ("GPL") or the Common
720.15 @@ -13,9 +16,9 @@
720.16 * specific language governing permissions and limitations under the
720.17 * License. When distributing the software, include this License Header
720.18 * Notice in each file and include the License file at
720.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
720.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
720.21 * particular file as subject to the "Classpath" exception as provided
720.22 - * by Sun in the GPL Version 2 section of the License file that
720.23 + * by Oracle in the GPL Version 2 section of the License file that
720.24 * accompanied this code. If applicable, add the following below the
720.25 * License Header, with the fields enclosed by brackets [] replaced by
720.26 * your own identifying information:
721.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/RefreshEjbGroupAction.java Fri Jul 16 11:47:36 2010 -0400
721.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/actions/RefreshEjbGroupAction.java Fri Jul 16 14:21:50 2010 -0400
721.3 @@ -1,7 +1,10 @@
721.4 /*
721.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
721.6 *
721.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
721.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
721.9 + *
721.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
721.11 + * Other names may be trademarks of their respective owners.
721.12 *
721.13 * The contents of this file are subject to the terms of either the GNU
721.14 * General Public License Version 2 only ("GPL") or the Common
721.15 @@ -13,9 +16,9 @@
721.16 * specific language governing permissions and limitations under the
721.17 * License. When distributing the software, include this License Header
721.18 * Notice in each file and include the License file at
721.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
721.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
721.21 * particular file as subject to the "Classpath" exception as provided
721.22 - * by Sun in the GPL Version 2 section of the License file that
721.23 + * by Oracle in the GPL Version 2 section of the License file that
721.24 * accompanied this code. If applicable, add the following below the
721.25 * License Header, with the fields enclosed by brackets [] replaced by
721.26 * your own identifying information:
722.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/codeclips/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
722.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/codeclips/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
722.3 @@ -1,6 +1,9 @@
722.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
722.5 #
722.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
722.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
722.8 +#
722.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
722.10 +# Other names may be trademarks of their respective owners.
722.11 #
722.12 # The contents of this file are subject to the terms of either the GNU
722.13 # General Public License Version 2 only ("GPL") or the Common
722.14 @@ -12,9 +15,9 @@
722.15 # specific language governing permissions and limitations under the
722.16 # License. When distributing the software, include this License Header
722.17 # Notice in each file and include the License file at
722.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
722.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
722.20 # particular file as subject to the "Classpath" exception as provided
722.21 -# by Sun in the GPL Version 2 section of the License file that
722.22 +# by Oracle in the GPL Version 2 section of the License file that
722.23 # accompanied this code. If applicable, add the following below the
722.24 # License Header, with the fields enclosed by brackets [] replaced by
722.25 # your own identifying information:
723.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/codeclips/DropDownProcessValueChanged.xml Fri Jul 16 11:47:36 2010 -0400
723.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/codeclips/DropDownProcessValueChanged.xml Fri Jul 16 14:21:50 2010 -0400
723.3 @@ -2,7 +2,10 @@
723.4 <!--
723.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
723.6
723.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
723.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
723.9 +
723.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
723.11 +Other names may be trademarks of their respective owners.
723.12
723.13
723.14 The contents of this file are subject to the terms of either the GNU
723.15 @@ -15,9 +18,9 @@
723.16 specific language governing permissions and limitations under the
723.17 License. When distributing the software, include this License Header
723.18 Notice in each file and include the License file at
723.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
723.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
723.21 particular file as subject to the "Classpath" exception as provided
723.22 -by Sun in the GPL Version 2 section of the License file that
723.23 +by Oracle in the GPL Version 2 section of the License file that
723.24 accompanied this code. If applicable, add the following below the
723.25 License Header, with the fields enclosed by brackets [] replaced by
723.26 your own identifying information:
724.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/codeclips/FirstPersonSelected.xml Fri Jul 16 11:47:36 2010 -0400
724.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/codeclips/FirstPersonSelected.xml Fri Jul 16 14:21:50 2010 -0400
724.3 @@ -2,7 +2,10 @@
724.4 <!--
724.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
724.6
724.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
724.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
724.9 +
724.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
724.11 +Other names may be trademarks of their respective owners.
724.12
724.13
724.14 The contents of this file are subject to the terms of either the GNU
724.15 @@ -15,9 +18,9 @@
724.16 specific language governing permissions and limitations under the
724.17 License. When distributing the software, include this License Header
724.18 Notice in each file and include the License file at
724.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
724.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
724.21 particular file as subject to the "Classpath" exception as provided
724.22 -by Sun in the GPL Version 2 section of the License file that
724.23 +by Oracle in the GPL Version 2 section of the License file that
724.24 accompanied this code. If applicable, add the following below the
724.25 License Header, with the fields enclosed by brackets [] replaced by
724.26 your own identifying information:
725.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/codeclips/GetFirstPerson.xml Fri Jul 16 11:47:36 2010 -0400
725.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/codeclips/GetFirstPerson.xml Fri Jul 16 14:21:50 2010 -0400
725.3 @@ -2,7 +2,10 @@
725.4 <!--
725.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
725.6
725.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
725.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
725.9 +
725.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
725.11 +Other names may be trademarks of their respective owners.
725.12
725.13
725.14 The contents of this file are subject to the terms of either the GNU
725.15 @@ -15,9 +18,9 @@
725.16 specific language governing permissions and limitations under the
725.17 License. When distributing the software, include this License Header
725.18 Notice in each file and include the License file at
725.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
725.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
725.21 particular file as subject to the "Classpath" exception as provided
725.22 -by Sun in the GPL Version 2 section of the License file that
725.23 +by Oracle in the GPL Version 2 section of the License file that
725.24 accompanied this code. If applicable, add the following below the
725.25 License Header, with the fields enclosed by brackets [] replaced by
725.26 your own identifying information:
726.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
726.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
726.3 @@ -1,6 +1,9 @@
726.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
726.5 #
726.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
726.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
726.8 +#
726.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
726.10 +# Other names may be trademarks of their respective owners.
726.11 #
726.12 # The contents of this file are subject to the terms of either the GNU
726.13 # General Public License Version 2 only ("GPL") or the Common
726.14 @@ -12,9 +15,9 @@
726.15 # specific language governing permissions and limitations under the
726.16 # License. When distributing the software, include this License Header
726.17 # Notice in each file and include the License file at
726.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
726.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
726.20 # particular file as subject to the "Classpath" exception as provided
726.21 -# by Sun in the GPL Version 2 section of the License file that
726.22 +# by Oracle in the GPL Version 2 section of the License file that
726.23 # accompanied this code. If applicable, add the following below the
726.24 # License Header, with the fields enclosed by brackets [] replaced by
726.25 # your own identifying information:
727.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbContainerVendor.java Fri Jul 16 11:47:36 2010 -0400
727.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbContainerVendor.java Fri Jul 16 14:21:50 2010 -0400
727.3 @@ -1,7 +1,10 @@
727.4 /*
727.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
727.6 *
727.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
727.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
727.9 + *
727.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
727.11 + * Other names may be trademarks of their respective owners.
727.12 *
727.13 * The contents of this file are subject to the terms of either the GNU
727.14 * General Public License Version 2 only ("GPL") or the Common
727.15 @@ -13,9 +16,9 @@
727.16 * specific language governing permissions and limitations under the
727.17 * License. When distributing the software, include this License Header
727.18 * Notice in each file and include the License file at
727.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
727.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
727.21 * particular file as subject to the "Classpath" exception as provided
727.22 - * by Sun in the GPL Version 2 section of the License file that
727.23 + * by Oracle in the GPL Version 2 section of the License file that
727.24 * accompanied this code. If applicable, add the following below the
727.25 * License Header, with the fields enclosed by brackets [] replaced by
727.26 * your own identifying information:
728.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbDataModel.java Fri Jul 16 11:47:36 2010 -0400
728.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbDataModel.java Fri Jul 16 14:21:50 2010 -0400
728.3 @@ -1,7 +1,10 @@
728.4 /*
728.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
728.6 *
728.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
728.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
728.9 + *
728.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
728.11 + * Other names may be trademarks of their respective owners.
728.12 *
728.13 * The contents of this file are subject to the terms of either the GNU
728.14 * General Public License Version 2 only ("GPL") or the Common
728.15 @@ -13,9 +16,9 @@
728.16 * specific language governing permissions and limitations under the
728.17 * License. When distributing the software, include this License Header
728.18 * Notice in each file and include the License file at
728.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
728.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
728.21 * particular file as subject to the "Classpath" exception as provided
728.22 - * by Sun in the GPL Version 2 section of the License file that
728.23 + * by Oracle in the GPL Version 2 section of the License file that
728.24 * accompanied this code. If applicable, add the following below the
728.25 * License Header, with the fields enclosed by brackets [] replaced by
728.26 * your own identifying information:
729.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbDataModelEvent.java Fri Jul 16 11:47:36 2010 -0400
729.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbDataModelEvent.java Fri Jul 16 14:21:50 2010 -0400
729.3 @@ -1,7 +1,10 @@
729.4 /*
729.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
729.6 *
729.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
729.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
729.9 + *
729.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
729.11 + * Other names may be trademarks of their respective owners.
729.12 *
729.13 * The contents of this file are subject to the terms of either the GNU
729.14 * General Public License Version 2 only ("GPL") or the Common
729.15 @@ -13,9 +16,9 @@
729.16 * specific language governing permissions and limitations under the
729.17 * License. When distributing the software, include this License Header
729.18 * Notice in each file and include the License file at
729.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
729.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
729.21 * particular file as subject to the "Classpath" exception as provided
729.22 - * by Sun in the GPL Version 2 section of the License file that
729.23 + * by Oracle in the GPL Version 2 section of the License file that
729.24 * accompanied this code. If applicable, add the following below the
729.25 * License Header, with the fields enclosed by brackets [] replaced by
729.26 * your own identifying information:
730.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbDataModelListener.java Fri Jul 16 11:47:36 2010 -0400
730.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbDataModelListener.java Fri Jul 16 14:21:50 2010 -0400
730.3 @@ -1,7 +1,10 @@
730.4 /*
730.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
730.6 *
730.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
730.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
730.9 + *
730.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
730.11 + * Other names may be trademarks of their respective owners.
730.12 *
730.13 * The contents of this file are subject to the terms of either the GNU
730.14 * General Public License Version 2 only ("GPL") or the Common
730.15 @@ -13,9 +16,9 @@
730.16 * specific language governing permissions and limitations under the
730.17 * License. When distributing the software, include this License Header
730.18 * Notice in each file and include the License file at
730.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
730.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
730.21 * particular file as subject to the "Classpath" exception as provided
730.22 - * by Sun in the GPL Version 2 section of the License file that
730.23 + * by Oracle in the GPL Version 2 section of the License file that
730.24 * accompanied this code. If applicable, add the following below the
730.25 * License Header, with the fields enclosed by brackets [] replaced by
730.26 * your own identifying information:
731.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbGroup.java Fri Jul 16 11:47:36 2010 -0400
731.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbGroup.java Fri Jul 16 14:21:50 2010 -0400
731.3 @@ -1,7 +1,10 @@
731.4 /*
731.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
731.6 *
731.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
731.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
731.9 + *
731.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
731.11 + * Other names may be trademarks of their respective owners.
731.12 *
731.13 * The contents of this file are subject to the terms of either the GNU
731.14 * General Public License Version 2 only ("GPL") or the Common
731.15 @@ -13,9 +16,9 @@
731.16 * specific language governing permissions and limitations under the
731.17 * License. When distributing the software, include this License Header
731.18 * Notice in each file and include the License file at
731.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
731.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
731.21 * particular file as subject to the "Classpath" exception as provided
731.22 - * by Sun in the GPL Version 2 section of the License file that
731.23 + * by Oracle in the GPL Version 2 section of the License file that
731.24 * accompanied this code. If applicable, add the following below the
731.25 * License Header, with the fields enclosed by brackets [] replaced by
731.26 * your own identifying information:
732.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbInfo.java Fri Jul 16 11:47:36 2010 -0400
732.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/EjbInfo.java Fri Jul 16 14:21:50 2010 -0400
732.3 @@ -1,7 +1,10 @@
732.4 /*
732.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
732.6 *
732.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
732.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
732.9 + *
732.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
732.11 + * Other names may be trademarks of their respective owners.
732.12 *
732.13 * The contents of this file are subject to the terms of either the GNU
732.14 * General Public License Version 2 only ("GPL") or the Common
732.15 @@ -13,9 +16,9 @@
732.16 * specific language governing permissions and limitations under the
732.17 * License. When distributing the software, include this License Header
732.18 * Notice in each file and include the License file at
732.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
732.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
732.21 * particular file as subject to the "Classpath" exception as provided
732.22 - * by Sun in the GPL Version 2 section of the License file that
732.23 + * by Oracle in the GPL Version 2 section of the License file that
732.24 * accompanied this code. If applicable, add the following below the
732.25 * License Header, with the fields enclosed by brackets [] replaced by
732.26 * your own identifying information:
733.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/MethodInfo.java Fri Jul 16 11:47:36 2010 -0400
733.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/MethodInfo.java Fri Jul 16 14:21:50 2010 -0400
733.3 @@ -1,7 +1,10 @@
733.4 /*
733.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
733.6 *
733.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
733.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
733.9 + *
733.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
733.11 + * Other names may be trademarks of their respective owners.
733.12 *
733.13 * The contents of this file are subject to the terms of either the GNU
733.14 * General Public License Version 2 only ("GPL") or the Common
733.15 @@ -13,9 +16,9 @@
733.16 * specific language governing permissions and limitations under the
733.17 * License. When distributing the software, include this License Header
733.18 * Notice in each file and include the License file at
733.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
733.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
733.21 * particular file as subject to the "Classpath" exception as provided
733.22 - * by Sun in the GPL Version 2 section of the License file that
733.23 + * by Oracle in the GPL Version 2 section of the License file that
733.24 * accompanied this code. If applicable, add the following below the
733.25 * License Header, with the fields enclosed by brackets [] replaced by
733.26 * your own identifying information:
734.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/MethodParam.java Fri Jul 16 11:47:36 2010 -0400
734.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/MethodParam.java Fri Jul 16 14:21:50 2010 -0400
734.3 @@ -1,7 +1,10 @@
734.4 /*
734.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
734.6 *
734.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
734.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
734.9 + *
734.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
734.11 + * Other names may be trademarks of their respective owners.
734.12 *
734.13 * The contents of this file are subject to the terms of either the GNU
734.14 * General Public License Version 2 only ("GPL") or the Common
734.15 @@ -13,9 +16,9 @@
734.16 * specific language governing permissions and limitations under the
734.17 * License. When distributing the software, include this License Header
734.18 * Notice in each file and include the License file at
734.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
734.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
734.21 * particular file as subject to the "Classpath" exception as provided
734.22 - * by Sun in the GPL Version 2 section of the License file that
734.23 + * by Oracle in the GPL Version 2 section of the License file that
734.24 * accompanied this code. If applicable, add the following below the
734.25 * License Header, with the fields enclosed by brackets [] replaced by
734.26 * your own identifying information:
735.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/MethodReturn.java Fri Jul 16 11:47:36 2010 -0400
735.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/datamodel/MethodReturn.java Fri Jul 16 14:21:50 2010 -0400
735.3 @@ -1,7 +1,10 @@
735.4 /*
735.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
735.6 *
735.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
735.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
735.9 + *
735.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
735.11 + * Other names may be trademarks of their respective owners.
735.12 *
735.13 * The contents of this file are subject to the terms of either the GNU
735.14 * General Public License Version 2 only ("GPL") or the Common
735.15 @@ -13,9 +16,9 @@
735.16 * specific language governing permissions and limitations under the
735.17 * License. When distributing the software, include this License Header
735.18 * Notice in each file and include the License file at
735.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
735.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
735.21 * particular file as subject to the "Classpath" exception as provided
735.22 - * by Sun in the GPL Version 2 section of the License file that
735.23 + * by Oracle in the GPL Version 2 section of the License file that
735.24 * accompanied this code. If applicable, add the following below the
735.25 * License Header, with the fields enclosed by brackets [] replaced by
735.26 * your own identifying information:
736.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/libraries/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
736.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/libraries/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
736.3 @@ -1,6 +1,9 @@
736.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
736.5 #
736.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
736.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
736.8 +#
736.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
736.10 +# Other names may be trademarks of their respective owners.
736.11 #
736.12 # The contents of this file are subject to the terms of either the GNU
736.13 # General Public License Version 2 only ("GPL") or the Common
736.14 @@ -12,9 +15,9 @@
736.15 # specific language governing permissions and limitations under the
736.16 # License. When distributing the software, include this License Header
736.17 # Notice in each file and include the License file at
736.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
736.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
736.20 # particular file as subject to the "Classpath" exception as provided
736.21 -# by Sun in the GPL Version 2 section of the License file that
736.22 +# by Oracle in the GPL Version 2 section of the License file that
736.23 # accompanied this code. If applicable, add the following below the
736.24 # License Header, with the fields enclosed by brackets [] replaced by
736.25 # your own identifying information:
737.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
737.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
737.3 @@ -1,6 +1,9 @@
737.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
737.5 #
737.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
737.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
737.8 +#
737.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
737.10 +# Other names may be trademarks of their respective owners.
737.11 #
737.12 # The contents of this file are subject to the terms of either the GNU
737.13 # General Public License Version 2 only ("GPL") or the Common
737.14 @@ -12,9 +15,9 @@
737.15 # specific language governing permissions and limitations under the
737.16 # License. When distributing the software, include this License Header
737.17 # Notice in each file and include the License file at
737.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
737.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
737.20 # particular file as subject to the "Classpath" exception as provided
737.21 -# by Sun in the GPL Version 2 section of the License file that
737.22 +# by Oracle in the GPL Version 2 section of the License file that
737.23 # accompanied this code. If applicable, add the following below the
737.24 # License Header, with the fields enclosed by brackets [] replaced by
737.25 # your own identifying information:
738.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClassDescriptor.java Fri Jul 16 11:47:36 2010 -0400
738.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClassDescriptor.java Fri Jul 16 14:21:50 2010 -0400
738.3 @@ -1,7 +1,10 @@
738.4 /*
738.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
738.6 *
738.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
738.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
738.9 + *
738.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
738.11 + * Other names may be trademarks of their respective owners.
738.12 *
738.13 * The contents of this file are subject to the terms of either the GNU
738.14 * General Public License Version 2 only ("GPL") or the Common
738.15 @@ -13,9 +16,9 @@
738.16 * specific language governing permissions and limitations under the
738.17 * License. When distributing the software, include this License Header
738.18 * Notice in each file and include the License file at
738.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
738.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
738.21 * particular file as subject to the "Classpath" exception as provided
738.22 - * by Sun in the GPL Version 2 section of the License file that
738.23 + * by Oracle in the GPL Version 2 section of the License file that
738.24 * accompanied this code. If applicable, add the following below the
738.25 * License Header, with the fields enclosed by brackets [] replaced by
738.26 * your own identifying information:
739.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClientBeanGenerator.java Fri Jul 16 11:47:36 2010 -0400
739.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClientBeanGenerator.java Fri Jul 16 14:21:50 2010 -0400
739.3 @@ -1,7 +1,10 @@
739.4 /*
739.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
739.6 *
739.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
739.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
739.9 + *
739.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
739.11 + * Other names may be trademarks of their respective owners.
739.12 *
739.13 * The contents of this file are subject to the terms of either the GNU
739.14 * General Public License Version 2 only ("GPL") or the Common
739.15 @@ -13,9 +16,9 @@
739.16 * specific language governing permissions and limitations under the
739.17 * License. When distributing the software, include this License Header
739.18 * Notice in each file and include the License file at
739.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
739.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
739.21 * particular file as subject to the "Classpath" exception as provided
739.22 - * by Sun in the GPL Version 2 section of the License file that
739.23 + * by Oracle in the GPL Version 2 section of the License file that
739.24 * accompanied this code. If applicable, add the following below the
739.25 * License Header, with the fields enclosed by brackets [] replaced by
739.26 * your own identifying information:
740.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClientBeanInfoGenerator.java Fri Jul 16 11:47:36 2010 -0400
740.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClientBeanInfoGenerator.java Fri Jul 16 14:21:50 2010 -0400
740.3 @@ -1,7 +1,10 @@
740.4 /*
740.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
740.6 *
740.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
740.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
740.9 + *
740.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
740.11 + * Other names may be trademarks of their respective owners.
740.12 *
740.13 * The contents of this file are subject to the terms of either the GNU
740.14 * General Public License Version 2 only ("GPL") or the Common
740.15 @@ -13,9 +16,9 @@
740.16 * specific language governing permissions and limitations under the
740.17 * License. When distributing the software, include this License Header
740.18 * Notice in each file and include the License file at
740.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
740.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
740.21 * particular file as subject to the "Classpath" exception as provided
740.22 - * by Sun in the GPL Version 2 section of the License file that
740.23 + * by Oracle in the GPL Version 2 section of the License file that
740.24 * accompanied this code. If applicable, add the following below the
740.25 * License Header, with the fields enclosed by brackets [] replaced by
740.26 * your own identifying information:
741.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClientBeanWrapperCompiler.java Fri Jul 16 11:47:36 2010 -0400
741.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClientBeanWrapperCompiler.java Fri Jul 16 14:21:50 2010 -0400
741.3 @@ -1,7 +1,10 @@
741.4 /*
741.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
741.6 *
741.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
741.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
741.9 + *
741.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
741.11 + * Other names may be trademarks of their respective owners.
741.12 *
741.13 * The contents of this file are subject to the terms of either the GNU
741.14 * General Public License Version 2 only ("GPL") or the Common
741.15 @@ -13,9 +16,9 @@
741.16 * specific language governing permissions and limitations under the
741.17 * License. When distributing the software, include this License Header
741.18 * Notice in each file and include the License file at
741.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
741.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
741.21 * particular file as subject to the "Classpath" exception as provided
741.22 - * by Sun in the GPL Version 2 section of the License file that
741.23 + * by Oracle in the GPL Version 2 section of the License file that
741.24 * accompanied this code. If applicable, add the following below the
741.25 * License Header, with the fields enclosed by brackets [] replaced by
741.26 * your own identifying information:
742.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClientBeanWrapperJarGenerator.java Fri Jul 16 11:47:36 2010 -0400
742.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/ClientBeanWrapperJarGenerator.java Fri Jul 16 14:21:50 2010 -0400
742.3 @@ -1,7 +1,10 @@
742.4 /*
742.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
742.6 *
742.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
742.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
742.9 + *
742.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
742.11 + * Other names may be trademarks of their respective owners.
742.12 *
742.13 * The contents of this file are subject to the terms of either the GNU
742.14 * General Public License Version 2 only ("GPL") or the Common
742.15 @@ -13,9 +16,9 @@
742.16 * specific language governing permissions and limitations under the
742.17 * License. When distributing the software, include this License Header
742.18 * Notice in each file and include the License file at
742.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
742.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
742.21 * particular file as subject to the "Classpath" exception as provided
742.22 - * by Sun in the GPL Version 2 section of the License file that
742.23 + * by Oracle in the GPL Version 2 section of the License file that
742.24 * accompanied this code. If applicable, add the following below the
742.25 * License Header, with the fields enclosed by brackets [] replaced by
742.26 * your own identifying information:
743.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/DataProviderBeanInfoGenerator.java Fri Jul 16 11:47:36 2010 -0400
743.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/DataProviderBeanInfoGenerator.java Fri Jul 16 14:21:50 2010 -0400
743.3 @@ -1,7 +1,10 @@
743.4 /*
743.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
743.6 *
743.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
743.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
743.9 + *
743.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
743.11 + * Other names may be trademarks of their respective owners.
743.12 *
743.13 * The contents of this file are subject to the terms of either the GNU
743.14 * General Public License Version 2 only ("GPL") or the Common
743.15 @@ -13,9 +16,9 @@
743.16 * specific language governing permissions and limitations under the
743.17 * License. When distributing the software, include this License Header
743.18 * Notice in each file and include the License file at
743.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
743.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
743.21 * particular file as subject to the "Classpath" exception as provided
743.22 - * by Sun in the GPL Version 2 section of the License file that
743.23 + * by Oracle in the GPL Version 2 section of the License file that
743.24 * accompanied this code. If applicable, add the following below the
743.25 * License Header, with the fields enclosed by brackets [] replaced by
743.26 * your own identifying information:
744.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/DataProviderDesignInfoGenerator.java Fri Jul 16 11:47:36 2010 -0400
744.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/DataProviderDesignInfoGenerator.java Fri Jul 16 14:21:50 2010 -0400
744.3 @@ -1,7 +1,10 @@
744.4 /*
744.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
744.6 *
744.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
744.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
744.9 + *
744.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
744.11 + * Other names may be trademarks of their respective owners.
744.12 *
744.13 * The contents of this file are subject to the terms of either the GNU
744.14 * General Public License Version 2 only ("GPL") or the Common
744.15 @@ -13,9 +16,9 @@
744.16 * specific language governing permissions and limitations under the
744.17 * License. When distributing the software, include this License Header
744.18 * Notice in each file and include the License file at
744.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
744.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
744.21 * particular file as subject to the "Classpath" exception as provided
744.22 - * by Sun in the GPL Version 2 section of the License file that
744.23 + * by Oracle in the GPL Version 2 section of the License file that
744.24 * accompanied this code. If applicable, add the following below the
744.25 * License Header, with the fields enclosed by brackets [] replaced by
744.26 * your own identifying information:
745.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/DataProviderGenerator.java Fri Jul 16 11:47:36 2010 -0400
745.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/DataProviderGenerator.java Fri Jul 16 14:21:50 2010 -0400
745.3 @@ -1,7 +1,10 @@
745.4 /*
745.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
745.6 *
745.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
745.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
745.9 + *
745.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
745.11 + * Other names may be trademarks of their respective owners.
745.12 *
745.13 * The contents of this file are subject to the terms of either the GNU
745.14 * General Public License Version 2 only ("GPL") or the Common
745.15 @@ -13,9 +16,9 @@
745.16 * specific language governing permissions and limitations under the
745.17 * License. When distributing the software, include this License Header
745.18 * Notice in each file and include the License file at
745.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
745.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
745.21 * particular file as subject to the "Classpath" exception as provided
745.22 - * by Sun in the GPL Version 2 section of the License file that
745.23 + * by Oracle in the GPL Version 2 section of the License file that
745.24 * accompanied this code. If applicable, add the following below the
745.25 * License Header, with the fields enclosed by brackets [] replaced by
745.26 * your own identifying information:
746.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/DeploymentDescriptorExtractor.java Fri Jul 16 11:47:36 2010 -0400
746.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/DeploymentDescriptorExtractor.java Fri Jul 16 14:21:50 2010 -0400
746.3 @@ -1,7 +1,10 @@
746.4 /*
746.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
746.6 *
746.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
746.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
746.9 + *
746.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
746.11 + * Other names may be trademarks of their respective owners.
746.12 *
746.13 * The contents of this file are subject to the terms of either the GNU
746.14 * General Public License Version 2 only ("GPL") or the Common
746.15 @@ -13,9 +16,9 @@
746.16 * specific language governing permissions and limitations under the
746.17 * License. When distributing the software, include this License Header
746.18 * Notice in each file and include the License file at
746.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
746.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
746.21 * particular file as subject to the "Classpath" exception as provided
746.22 - * by Sun in the GPL Version 2 section of the License file that
746.23 + * by Oracle in the GPL Version 2 section of the License file that
746.24 * accompanied this code. If applicable, add the following below the
746.25 * License Header, with the fields enclosed by brackets [] replaced by
746.26 * your own identifying information:
747.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbDataSourceXmlCreator.java Fri Jul 16 11:47:36 2010 -0400
747.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbDataSourceXmlCreator.java Fri Jul 16 14:21:50 2010 -0400
747.3 @@ -1,7 +1,10 @@
747.4 /*
747.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
747.6 *
747.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
747.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
747.9 + *
747.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
747.11 + * Other names may be trademarks of their respective owners.
747.12 *
747.13 * The contents of this file are subject to the terms of either the GNU
747.14 * General Public License Version 2 only ("GPL") or the Common
747.15 @@ -13,9 +16,9 @@
747.16 * specific language governing permissions and limitations under the
747.17 * License. When distributing the software, include this License Header
747.18 * Notice in each file and include the License file at
747.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
747.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
747.21 * particular file as subject to the "Classpath" exception as provided
747.22 - * by Sun in the GPL Version 2 section of the License file that
747.23 + * by Oracle in the GPL Version 2 section of the License file that
747.24 * accompanied this code. If applicable, add the following below the
747.25 * License Header, with the fields enclosed by brackets [] replaced by
747.26 * your own identifying information:
748.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbDataSourceXmlParser.java Fri Jul 16 11:47:36 2010 -0400
748.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbDataSourceXmlParser.java Fri Jul 16 14:21:50 2010 -0400
748.3 @@ -1,7 +1,10 @@
748.4 /*
748.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
748.6 *
748.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
748.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
748.9 + *
748.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
748.11 + * Other names may be trademarks of their respective owners.
748.12 *
748.13 * The contents of this file are subject to the terms of either the GNU
748.14 * General Public License Version 2 only ("GPL") or the Common
748.15 @@ -13,9 +16,9 @@
748.16 * specific language governing permissions and limitations under the
748.17 * License. When distributing the software, include this License Header
748.18 * Notice in each file and include the License file at
748.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
748.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
748.21 * particular file as subject to the "Classpath" exception as provided
748.22 - * by Sun in the GPL Version 2 section of the License file that
748.23 + * by Oracle in the GPL Version 2 section of the License file that
748.24 * accompanied this code. If applicable, add the following below the
748.25 * License Header, with the fields enclosed by brackets [] replaced by
748.26 * your own identifying information:
749.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbDataSourcesExportor.java Fri Jul 16 11:47:36 2010 -0400
749.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbDataSourcesExportor.java Fri Jul 16 14:21:50 2010 -0400
749.3 @@ -1,7 +1,10 @@
749.4 /*
749.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
749.6 *
749.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
749.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
749.9 + *
749.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
749.11 + * Other names may be trademarks of their respective owners.
749.12 *
749.13 * The contents of this file are subject to the terms of either the GNU
749.14 * General Public License Version 2 only ("GPL") or the Common
749.15 @@ -13,9 +16,9 @@
749.16 * specific language governing permissions and limitations under the
749.17 * License. When distributing the software, include this License Header
749.18 * Notice in each file and include the License file at
749.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
749.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
749.21 * particular file as subject to the "Classpath" exception as provided
749.22 - * by Sun in the GPL Version 2 section of the License file that
749.23 + * by Oracle in the GPL Version 2 section of the License file that
749.24 * accompanied this code. If applicable, add the following below the
749.25 * License Header, with the fields enclosed by brackets [] replaced by
749.26 * your own identifying information:
750.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbDataSourcesImportor.java Fri Jul 16 11:47:36 2010 -0400
750.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbDataSourcesImportor.java Fri Jul 16 14:21:50 2010 -0400
750.3 @@ -1,7 +1,10 @@
750.4 /*
750.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
750.6 *
750.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
750.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
750.9 + *
750.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
750.11 + * Other names may be trademarks of their respective owners.
750.12 *
750.13 * The contents of this file are subject to the terms of either the GNU
750.14 * General Public License Version 2 only ("GPL") or the Common
750.15 @@ -13,9 +16,9 @@
750.16 * specific language governing permissions and limitations under the
750.17 * License. When distributing the software, include this License Header
750.18 * Notice in each file and include the License file at
750.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
750.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
750.21 * particular file as subject to the "Classpath" exception as provided
750.22 - * by Sun in the GPL Version 2 section of the License file that
750.23 + * by Oracle in the GPL Version 2 section of the License file that
750.24 * accompanied this code. If applicable, add the following below the
750.25 * License Header, with the fields enclosed by brackets [] replaced by
750.26 * your own identifying information:
751.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbLoadException.java Fri Jul 16 11:47:36 2010 -0400
751.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbLoadException.java Fri Jul 16 14:21:50 2010 -0400
751.3 @@ -1,7 +1,10 @@
751.4 /*
751.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
751.6 *
751.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
751.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
751.9 + *
751.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
751.11 + * Other names may be trademarks of their respective owners.
751.12 *
751.13 * The contents of this file are subject to the terms of either the GNU
751.14 * General Public License Version 2 only ("GPL") or the Common
751.15 @@ -13,9 +16,9 @@
751.16 * specific language governing permissions and limitations under the
751.17 * License. When distributing the software, include this License Header
751.18 * Notice in each file and include the License file at
751.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
751.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
751.21 * particular file as subject to the "Classpath" exception as provided
751.22 - * by Sun in the GPL Version 2 section of the License file that
751.23 + * by Oracle in the GPL Version 2 section of the License file that
751.24 * accompanied this code. If applicable, add the following below the
751.25 * License Header, with the fields enclosed by brackets [] replaced by
751.26 * your own identifying information:
752.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbLoader.java Fri Jul 16 11:47:36 2010 -0400
752.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbLoader.java Fri Jul 16 14:21:50 2010 -0400
752.3 @@ -1,7 +1,10 @@
752.4 /*
752.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
752.6 *
752.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
752.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
752.9 + *
752.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
752.11 + * Other names may be trademarks of their respective owners.
752.12 *
752.13 * The contents of this file are subject to the terms of either the GNU
752.14 * General Public License Version 2 only ("GPL") or the Common
752.15 @@ -13,9 +16,9 @@
752.16 * specific language governing permissions and limitations under the
752.17 * License. When distributing the software, include this License Header
752.18 * Notice in each file and include the License file at
752.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
752.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
752.21 * particular file as subject to the "Classpath" exception as provided
752.22 - * by Sun in the GPL Version 2 section of the License file that
752.23 + * by Oracle in the GPL Version 2 section of the License file that
752.24 * accompanied this code. If applicable, add the following below the
752.25 * License Header, with the fields enclosed by brackets [] replaced by
752.26 * your own identifying information:
753.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbLoaderHelper.java Fri Jul 16 11:47:36 2010 -0400
753.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbLoaderHelper.java Fri Jul 16 14:21:50 2010 -0400
753.3 @@ -1,7 +1,10 @@
753.4 /*
753.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
753.6 *
753.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
753.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
753.9 + *
753.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
753.11 + * Other names may be trademarks of their respective owners.
753.12 *
753.13 * The contents of this file are subject to the terms of either the GNU
753.14 * General Public License Version 2 only ("GPL") or the Common
753.15 @@ -13,9 +16,9 @@
753.16 * specific language governing permissions and limitations under the
753.17 * License. When distributing the software, include this License Header
753.18 * Notice in each file and include the License file at
753.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
753.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
753.21 * particular file as subject to the "Classpath" exception as provided
753.22 - * by Sun in the GPL Version 2 section of the License file that
753.23 + * by Oracle in the GPL Version 2 section of the License file that
753.24 * accompanied this code. If applicable, add the following below the
753.25 * License Header, with the fields enclosed by brackets [] replaced by
753.26 * your own identifying information:
754.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbMethodFilter.java Fri Jul 16 11:47:36 2010 -0400
754.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/EjbMethodFilter.java Fri Jul 16 14:21:50 2010 -0400
754.3 @@ -1,7 +1,10 @@
754.4 /*
754.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
754.6 *
754.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
754.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
754.9 + *
754.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
754.11 + * Other names may be trademarks of their respective owners.
754.12 *
754.13 * The contents of this file are subject to the terms of either the GNU
754.14 * General Public License Version 2 only ("GPL") or the Common
754.15 @@ -13,9 +16,9 @@
754.16 * specific language governing permissions and limitations under the
754.17 * License. When distributing the software, include this License Header
754.18 * Notice in each file and include the License file at
754.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
754.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
754.21 * particular file as subject to the "Classpath" exception as provided
754.22 - * by Sun in the GPL Version 2 section of the License file that
754.23 + * by Oracle in the GPL Version 2 section of the License file that
754.24 * accompanied this code. If applicable, add the following below the
754.25 * License Header, with the fields enclosed by brackets [] replaced by
754.26 * your own identifying information:
755.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/StdDeploymentDescriptorParser.java Fri Jul 16 11:47:36 2010 -0400
755.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/StdDeploymentDescriptorParser.java Fri Jul 16 14:21:50 2010 -0400
755.3 @@ -1,7 +1,10 @@
755.4 /*
755.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
755.6 *
755.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
755.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
755.9 + *
755.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
755.11 + * Other names may be trademarks of their respective owners.
755.12 *
755.13 * The contents of this file are subject to the terms of either the GNU
755.14 * General Public License Version 2 only ("GPL") or the Common
755.15 @@ -13,9 +16,9 @@
755.16 * specific language governing permissions and limitations under the
755.17 * License. When distributing the software, include this License Header
755.18 * Notice in each file and include the License file at
755.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
755.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
755.21 * particular file as subject to the "Classpath" exception as provided
755.22 - * by Sun in the GPL Version 2 section of the License file that
755.23 + * by Oracle in the GPL Version 2 section of the License file that
755.24 * accompanied this code. If applicable, add the following below the
755.25 * License Header, with the fields enclosed by brackets [] replaced by
755.26 * your own identifying information:
756.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/SunDeploymentDescriptorParser.java Fri Jul 16 11:47:36 2010 -0400
756.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/SunDeploymentDescriptorParser.java Fri Jul 16 14:21:50 2010 -0400
756.3 @@ -1,7 +1,10 @@
756.4 /*
756.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
756.6 *
756.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
756.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
756.9 + *
756.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
756.11 + * Other names may be trademarks of their respective owners.
756.12 *
756.13 * The contents of this file are subject to the terms of either the GNU
756.14 * General Public License Version 2 only ("GPL") or the Common
756.15 @@ -13,9 +16,9 @@
756.16 * specific language governing permissions and limitations under the
756.17 * License. When distributing the software, include this License Header
756.18 * Notice in each file and include the License file at
756.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
756.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
756.21 * particular file as subject to the "Classpath" exception as provided
756.22 - * by Sun in the GPL Version 2 section of the License file that
756.23 + * by Oracle in the GPL Version 2 section of the License file that
756.24 * accompanied this code. If applicable, add the following below the
756.25 * License Header, with the fields enclosed by brackets [] replaced by
756.26 * your own identifying information:
757.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/WeblogicDeploymentDescriptorParser.java Fri Jul 16 11:47:36 2010 -0400
757.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/WeblogicDeploymentDescriptorParser.java Fri Jul 16 14:21:50 2010 -0400
757.3 @@ -1,7 +1,10 @@
757.4 /*
757.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
757.6 *
757.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
757.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
757.9 + *
757.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
757.11 + * Other names may be trademarks of their respective owners.
757.12 *
757.13 * The contents of this file are subject to the terms of either the GNU
757.14 * General Public License Version 2 only ("GPL") or the Common
757.15 @@ -13,9 +16,9 @@
757.16 * specific language governing permissions and limitations under the
757.17 * License. When distributing the software, include this License Header
757.18 * Notice in each file and include the License file at
757.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
757.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
757.21 * particular file as subject to the "Classpath" exception as provided
757.22 - * by Sun in the GPL Version 2 section of the License file that
757.23 + * by Oracle in the GPL Version 2 section of the License file that
757.24 * accompanied this code. If applicable, add the following below the
757.25 * License Header, with the fields enclosed by brackets [] replaced by
757.26 * your own identifying information:
758.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/WebsphereDeploymentDescriptorParser.java Fri Jul 16 11:47:36 2010 -0400
758.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/WebsphereDeploymentDescriptorParser.java Fri Jul 16 14:21:50 2010 -0400
758.3 @@ -1,7 +1,10 @@
758.4 /*
758.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
758.6 *
758.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
758.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
758.9 + *
758.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
758.11 + * Other names may be trademarks of their respective owners.
758.12 *
758.13 * The contents of this file are subject to the terms of either the GNU
758.14 * General Public License Version 2 only ("GPL") or the Common
758.15 @@ -13,9 +16,9 @@
758.16 * specific language governing permissions and limitations under the
758.17 * License. When distributing the software, include this License Header
758.18 * Notice in each file and include the License file at
758.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
758.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
758.21 * particular file as subject to the "Classpath" exception as provided
758.22 - * by Sun in the GPL Version 2 section of the License file that
758.23 + * by Oracle in the GPL Version 2 section of the License file that
758.24 * accompanied this code. If applicable, add the following below the
758.25 * License Header, with the fields enclosed by brackets [] replaced by
758.26 * your own identifying information:
759.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/XmlTagConstants.java Fri Jul 16 11:47:36 2010 -0400
759.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/load/XmlTagConstants.java Fri Jul 16 14:21:50 2010 -0400
759.3 @@ -1,7 +1,10 @@
759.4 /*
759.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
759.6 *
759.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
759.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
759.9 + *
759.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
759.11 + * Other names may be trademarks of their respective owners.
759.12 *
759.13 * The contents of this file are subject to the terms of either the GNU
759.14 * General Public License Version 2 only ("GPL") or the Common
759.15 @@ -13,9 +16,9 @@
759.16 * specific language governing permissions and limitations under the
759.17 * License. When distributing the software, include this License Header
759.18 * Notice in each file and include the License file at
759.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
759.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
759.21 * particular file as subject to the "Classpath" exception as provided
759.22 - * by Sun in the GPL Version 2 section of the License file that
759.23 + * by Oracle in the GPL Version 2 section of the License file that
759.24 * accompanied this code. If applicable, add the following below the
759.25 * License Header, with the fields enclosed by brackets [] replaced by
759.26 * your own identifying information:
760.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/mf-layer.xml Fri Jul 16 11:47:36 2010 -0400
760.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/mf-layer.xml Fri Jul 16 14:21:50 2010 -0400
760.3 @@ -2,7 +2,10 @@
760.4 <!--
760.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
760.6
760.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
760.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
760.9 +
760.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
760.11 +Other names may be trademarks of their respective owners.
760.12
760.13
760.14 The contents of this file are subject to the terms of either the GNU
760.15 @@ -15,9 +18,9 @@
760.16 specific language governing permissions and limitations under the
760.17 License. When distributing the software, include this License Header
760.18 Notice in each file and include the License file at
760.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
760.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
760.21 particular file as subject to the "Classpath" exception as provided
760.22 -by Sun in the GPL Version 2 section of the License file that
760.23 +by Oracle in the GPL Version 2 section of the License file that
760.24 accompanied this code. If applicable, add the following below the
760.25 License Header, with the fields enclosed by brackets [] replaced by
760.26 your own identifying information:
761.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
761.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
761.3 @@ -1,6 +1,9 @@
761.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
761.5 #
761.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
761.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
761.8 +#
761.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
761.10 +# Other names may be trademarks of their respective owners.
761.11 #
761.12 # The contents of this file are subject to the terms of either the GNU
761.13 # General Public License Version 2 only ("GPL") or the Common
761.14 @@ -12,9 +15,9 @@
761.15 # specific language governing permissions and limitations under the
761.16 # License. When distributing the software, include this License Header
761.17 # Notice in each file and include the License file at
761.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
761.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
761.20 # particular file as subject to the "Classpath" exception as provided
761.21 -# by Sun in the GPL Version 2 section of the License file that
761.22 +# by Oracle in the GPL Version 2 section of the License file that
761.23 # accompanied this code. If applicable, add the following below the
761.24 # License Header, with the fields enclosed by brackets [] replaced by
761.25 # your own identifying information:
762.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbGroupNode.java Fri Jul 16 11:47:36 2010 -0400
762.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbGroupNode.java Fri Jul 16 14:21:50 2010 -0400
762.3 @@ -1,7 +1,10 @@
762.4 /*
762.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
762.6 *
762.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
762.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
762.9 + *
762.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
762.11 + * Other names may be trademarks of their respective owners.
762.12 *
762.13 * The contents of this file are subject to the terms of either the GNU
762.14 * General Public License Version 2 only ("GPL") or the Common
762.15 @@ -13,9 +16,9 @@
762.16 * specific language governing permissions and limitations under the
762.17 * License. When distributing the software, include this License Header
762.18 * Notice in each file and include the License file at
762.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
762.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
762.21 * particular file as subject to the "Classpath" exception as provided
762.22 - * by Sun in the GPL Version 2 section of the License file that
762.23 + * by Oracle in the GPL Version 2 section of the License file that
762.24 * accompanied this code. If applicable, add the following below the
762.25 * License Header, with the fields enclosed by brackets [] replaced by
762.26 * your own identifying information:
763.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbGroupNodeChildren.java Fri Jul 16 11:47:36 2010 -0400
763.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbGroupNodeChildren.java Fri Jul 16 14:21:50 2010 -0400
763.3 @@ -1,7 +1,10 @@
763.4 /*
763.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
763.6 *
763.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
763.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
763.9 + *
763.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
763.11 + * Other names may be trademarks of their respective owners.
763.12 *
763.13 * The contents of this file are subject to the terms of either the GNU
763.14 * General Public License Version 2 only ("GPL") or the Common
763.15 @@ -13,9 +16,9 @@
763.16 * specific language governing permissions and limitations under the
763.17 * License. When distributing the software, include this License Header
763.18 * Notice in each file and include the License file at
763.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
763.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
763.21 * particular file as subject to the "Classpath" exception as provided
763.22 - * by Sun in the GPL Version 2 section of the License file that
763.23 + * by Oracle in the GPL Version 2 section of the License file that
763.24 * accompanied this code. If applicable, add the following below the
763.25 * License Header, with the fields enclosed by brackets [] replaced by
763.26 * your own identifying information:
764.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbLibReferenceHelper.java Fri Jul 16 11:47:36 2010 -0400
764.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbLibReferenceHelper.java Fri Jul 16 14:21:50 2010 -0400
764.3 @@ -1,7 +1,10 @@
764.4 /*
764.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
764.6 *
764.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
764.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
764.9 + *
764.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
764.11 + * Other names may be trademarks of their respective owners.
764.12 *
764.13 * The contents of this file are subject to the terms of either the GNU
764.14 * General Public License Version 2 only ("GPL") or the Common
764.15 @@ -13,9 +16,9 @@
764.16 * specific language governing permissions and limitations under the
764.17 * License. When distributing the software, include this License Header
764.18 * Notice in each file and include the License file at
764.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
764.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
764.21 * particular file as subject to the "Classpath" exception as provided
764.22 - * by Sun in the GPL Version 2 section of the License file that
764.23 + * by Oracle in the GPL Version 2 section of the License file that
764.24 * accompanied this code. If applicable, add the following below the
764.25 * License Header, with the fields enclosed by brackets [] replaced by
764.26 * your own identifying information:
765.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbRootNode.java Fri Jul 16 11:47:36 2010 -0400
765.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbRootNode.java Fri Jul 16 14:21:50 2010 -0400
765.3 @@ -1,7 +1,10 @@
765.4 /*
765.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
765.6 *
765.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
765.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
765.9 + *
765.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
765.11 + * Other names may be trademarks of their respective owners.
765.12 *
765.13 * The contents of this file are subject to the terms of either the GNU
765.14 * General Public License Version 2 only ("GPL") or the Common
765.15 @@ -13,9 +16,9 @@
765.16 * specific language governing permissions and limitations under the
765.17 * License. When distributing the software, include this License Header
765.18 * Notice in each file and include the License file at
765.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
765.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
765.21 * particular file as subject to the "Classpath" exception as provided
765.22 - * by Sun in the GPL Version 2 section of the License file that
765.23 + * by Oracle in the GPL Version 2 section of the License file that
765.24 * accompanied this code. If applicable, add the following below the
765.25 * License Header, with the fields enclosed by brackets [] replaced by
765.26 * your own identifying information:
766.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbRootNodeChildren.java Fri Jul 16 11:47:36 2010 -0400
766.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/EjbRootNodeChildren.java Fri Jul 16 14:21:50 2010 -0400
766.3 @@ -1,7 +1,10 @@
766.4 /*
766.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
766.6 *
766.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
766.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
766.9 + *
766.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
766.11 + * Other names may be trademarks of their respective owners.
766.12 *
766.13 * The contents of this file are subject to the terms of either the GNU
766.14 * General Public License Version 2 only ("GPL") or the Common
766.15 @@ -13,9 +16,9 @@
766.16 * specific language governing permissions and limitations under the
766.17 * License. When distributing the software, include this License Header
766.18 * Notice in each file and include the License file at
766.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
766.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
766.21 * particular file as subject to the "Classpath" exception as provided
766.22 - * by Sun in the GPL Version 2 section of the License file that
766.23 + * by Oracle in the GPL Version 2 section of the License file that
766.24 * accompanied this code. If applicable, add the following below the
766.25 * License Header, with the fields enclosed by brackets [] replaced by
766.26 * your own identifying information:
767.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/MethodNode.java Fri Jul 16 11:47:36 2010 -0400
767.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/MethodNode.java Fri Jul 16 14:21:50 2010 -0400
767.3 @@ -1,7 +1,10 @@
767.4 /*
767.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
767.6 *
767.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
767.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
767.9 + *
767.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
767.11 + * Other names may be trademarks of their respective owners.
767.12 *
767.13 * The contents of this file are subject to the terms of either the GNU
767.14 * General Public License Version 2 only ("GPL") or the Common
767.15 @@ -13,9 +16,9 @@
767.16 * specific language governing permissions and limitations under the
767.17 * License. When distributing the software, include this License Header
767.18 * Notice in each file and include the License file at
767.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
767.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
767.21 * particular file as subject to the "Classpath" exception as provided
767.22 - * by Sun in the GPL Version 2 section of the License file that
767.23 + * by Oracle in the GPL Version 2 section of the License file that
767.24 * accompanied this code. If applicable, add the following below the
767.25 * License Header, with the fields enclosed by brackets [] replaced by
767.26 * your own identifying information:
768.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/SessionBeanNode.java Fri Jul 16 11:47:36 2010 -0400
768.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/SessionBeanNode.java Fri Jul 16 14:21:50 2010 -0400
768.3 @@ -1,7 +1,10 @@
768.4 /*
768.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
768.6 *
768.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
768.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
768.9 + *
768.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
768.11 + * Other names may be trademarks of their respective owners.
768.12 *
768.13 * The contents of this file are subject to the terms of either the GNU
768.14 * General Public License Version 2 only ("GPL") or the Common
768.15 @@ -13,9 +16,9 @@
768.16 * specific language governing permissions and limitations under the
768.17 * License. When distributing the software, include this License Header
768.18 * Notice in each file and include the License file at
768.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
768.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
768.21 * particular file as subject to the "Classpath" exception as provided
768.22 - * by Sun in the GPL Version 2 section of the License file that
768.23 + * by Oracle in the GPL Version 2 section of the License file that
768.24 * accompanied this code. If applicable, add the following below the
768.25 * License Header, with the fields enclosed by brackets [] replaced by
768.26 * your own identifying information:
769.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/SessionBeanNodeChildren.java Fri Jul 16 11:47:36 2010 -0400
769.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/nodes/SessionBeanNodeChildren.java Fri Jul 16 14:21:50 2010 -0400
769.3 @@ -1,7 +1,10 @@
769.4 /*
769.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
769.6 *
769.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
769.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
769.9 + *
769.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
769.11 + * Other names may be trademarks of their respective owners.
769.12 *
769.13 * The contents of this file are subject to the terms of either the GNU
769.14 * General Public License Version 2 only ("GPL") or the Common
769.15 @@ -13,9 +16,9 @@
769.16 * specific language governing permissions and limitations under the
769.17 * License. When distributing the software, include this License Header
769.18 * Notice in each file and include the License file at
769.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
769.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
769.21 * particular file as subject to the "Classpath" exception as provided
769.22 - * by Sun in the GPL Version 2 section of the License file that
769.23 + * by Oracle in the GPL Version 2 section of the License file that
769.24 * accompanied this code. If applicable, add the following below the
769.25 * License Header, with the fields enclosed by brackets [] replaced by
769.26 * your own identifying information:
770.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/AddEjbGroupDialog.java Fri Jul 16 11:47:36 2010 -0400
770.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/AddEjbGroupDialog.java Fri Jul 16 14:21:50 2010 -0400
770.3 @@ -1,7 +1,10 @@
770.4 /*
770.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
770.6 *
770.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
770.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
770.9 + *
770.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
770.11 + * Other names may be trademarks of their respective owners.
770.12 *
770.13 * The contents of this file are subject to the terms of either the GNU
770.14 * General Public License Version 2 only ("GPL") or the Common
770.15 @@ -13,9 +16,9 @@
770.16 * specific language governing permissions and limitations under the
770.17 * License. When distributing the software, include this License Header
770.18 * Notice in each file and include the License file at
770.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
770.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
770.21 * particular file as subject to the "Classpath" exception as provided
770.22 - * by Sun in the GPL Version 2 section of the License file that
770.23 + * by Oracle in the GPL Version 2 section of the License file that
770.24 * accompanied this code. If applicable, add the following below the
770.25 * License Header, with the fields enclosed by brackets [] replaced by
770.26 * your own identifying information:
771.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
771.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
771.3 @@ -1,6 +1,9 @@
771.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
771.5 #
771.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
771.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
771.8 +#
771.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
771.10 +# Other names may be trademarks of their respective owners.
771.11 #
771.12 # The contents of this file are subject to the terms of either the GNU
771.13 # General Public License Version 2 only ("GPL") or the Common
771.14 @@ -12,9 +15,9 @@
771.15 # specific language governing permissions and limitations under the
771.16 # License. When distributing the software, include this License Header
771.17 # Notice in each file and include the License file at
771.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
771.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
771.20 # particular file as subject to the "Classpath" exception as provided
771.21 -# by Sun in the GPL Version 2 section of the License file that
771.22 +# by Oracle in the GPL Version 2 section of the License file that
771.23 # accompanied this code. If applicable, add the following below the
771.24 # License Header, with the fields enclosed by brackets [] replaced by
771.25 # your own identifying information:
772.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ClientJarFileListModel.java Fri Jul 16 11:47:36 2010 -0400
772.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ClientJarFileListModel.java Fri Jul 16 14:21:50 2010 -0400
772.3 @@ -1,7 +1,10 @@
772.4 /*
772.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
772.6 *
772.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
772.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
772.9 + *
772.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
772.11 + * Other names may be trademarks of their respective owners.
772.12 *
772.13 * The contents of this file are subject to the terms of either the GNU
772.14 * General Public License Version 2 only ("GPL") or the Common
772.15 @@ -13,9 +16,9 @@
772.16 * specific language governing permissions and limitations under the
772.17 * License. When distributing the software, include this License Header
772.18 * Notice in each file and include the License file at
772.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
772.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
772.21 * particular file as subject to the "Classpath" exception as provided
772.22 - * by Sun in the GPL Version 2 section of the License file that
772.23 + * by Oracle in the GPL Version 2 section of the License file that
772.24 * accompanied this code. If applicable, add the following below the
772.25 * License Header, with the fields enclosed by brackets [] replaced by
772.26 * your own identifying information:
773.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ComboBoxAutoCompletion.java Fri Jul 16 11:47:36 2010 -0400
773.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ComboBoxAutoCompletion.java Fri Jul 16 14:21:50 2010 -0400
773.3 @@ -1,7 +1,10 @@
773.4 /*
773.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
773.6 *
773.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
773.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
773.9 + *
773.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
773.11 + * Other names may be trademarks of their respective owners.
773.12 *
773.13 * The contents of this file are subject to the terms of either the GNU
773.14 * General Public License Version 2 only ("GPL") or the Common
773.15 @@ -13,9 +16,9 @@
773.16 * specific language governing permissions and limitations under the
773.17 * License. When distributing the software, include this License Header
773.18 * Notice in each file and include the License file at
773.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
773.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
773.21 * particular file as subject to the "Classpath" exception as provided
773.22 - * by Sun in the GPL Version 2 section of the License file that
773.23 + * by Oracle in the GPL Version 2 section of the License file that
773.24 * accompanied this code. If applicable, add the following below the
773.25 * License Header, with the fields enclosed by brackets [] replaced by
773.26 * your own identifying information:
773.27 @@ -79,7 +82,6 @@
773.28 // flag to indicate if setSelectedItem has been called
773.29 // subsequent calls to remove/insertString should be ignored
773.30 private boolean selecting=false;
773.31 - private boolean hidePopupOnFocusLoss;
773.32 private boolean hitBackspace=false;
773.33 private boolean hitBackspaceOnSelection;
773.34 private boolean listContainsSelectedItem;
773.35 @@ -131,16 +133,12 @@
773.36 }
773.37 }
773.38 });
773.39 - // Bug 5100422 on Java 1.5: Editable JComboBox won't hide popup when tabbing out
773.40 - hidePopupOnFocusLoss=System.getProperty("java.version").startsWith("1.5");
773.41 // Highlight whole text when gaining focus
773.42 editor.addFocusListener(new FocusAdapter() {
773.43 public void focusGained(FocusEvent e) {
773.44 highlightCompletedText(0);
773.45 }
773.46 public void focusLost(FocusEvent e) {
773.47 - // Workaround for Bug 5100422 - Hide Popup on focus loss
773.48 - if (hidePopupOnFocusLoss) comboBox.setPopupVisible(false);
773.49 }
773.50 });
773.51 // Handle initially selected object
774.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ConfigureMethodsDialog.java Fri Jul 16 11:47:36 2010 -0400
774.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ConfigureMethodsDialog.java Fri Jul 16 14:21:50 2010 -0400
774.3 @@ -1,7 +1,10 @@
774.4 /*
774.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
774.6 *
774.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
774.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
774.9 + *
774.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
774.11 + * Other names may be trademarks of their respective owners.
774.12 *
774.13 * The contents of this file are subject to the terms of either the GNU
774.14 * General Public License Version 2 only ("GPL") or the Common
774.15 @@ -13,9 +16,9 @@
774.16 * specific language governing permissions and limitations under the
774.17 * License. When distributing the software, include this License Header
774.18 * Notice in each file and include the License file at
774.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
774.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
774.21 * particular file as subject to the "Classpath" exception as provided
774.22 - * by Sun in the GPL Version 2 section of the License file that
774.23 + * by Oracle in the GPL Version 2 section of the License file that
774.24 * accompanied this code. If applicable, add the following below the
774.25 * License Header, with the fields enclosed by brackets [] replaced by
774.26 * your own identifying information:
775.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ConfigureMethodsPanel.java Fri Jul 16 11:47:36 2010 -0400
775.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ConfigureMethodsPanel.java Fri Jul 16 14:21:50 2010 -0400
775.3 @@ -1,7 +1,10 @@
775.4 /*
775.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
775.6 *
775.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
775.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
775.9 + *
775.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
775.11 + * Other names may be trademarks of their respective owners.
775.12 *
775.13 * The contents of this file are subject to the terms of either the GNU
775.14 * General Public License Version 2 only ("GPL") or the Common
775.15 @@ -13,9 +16,9 @@
775.16 * specific language governing permissions and limitations under the
775.17 * License. When distributing the software, include this License Header
775.18 * Notice in each file and include the License file at
775.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
775.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
775.21 * particular file as subject to the "Classpath" exception as provided
775.22 - * by Sun in the GPL Version 2 section of the License file that
775.23 + * by Oracle in the GPL Version 2 section of the License file that
775.24 * accompanied this code. If applicable, add the following below the
775.25 * License Header, with the fields enclosed by brackets [] replaced by
775.26 * your own identifying information:
776.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/EjbDataSourcePropertiesPanel.java Fri Jul 16 11:47:36 2010 -0400
776.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/EjbDataSourcePropertiesPanel.java Fri Jul 16 14:21:50 2010 -0400
776.3 @@ -1,7 +1,10 @@
776.4 /*
776.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
776.6 *
776.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
776.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
776.9 + *
776.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
776.11 + * Other names may be trademarks of their respective owners.
776.12 *
776.13 * The contents of this file are subject to the terms of either the GNU
776.14 * General Public License Version 2 only ("GPL") or the Common
776.15 @@ -13,9 +16,9 @@
776.16 * specific language governing permissions and limitations under the
776.17 * License. When distributing the software, include this License Header
776.18 * Notice in each file and include the License file at
776.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
776.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
776.21 * particular file as subject to the "Classpath" exception as provided
776.22 - * by Sun in the GPL Version 2 section of the License file that
776.23 + * by Oracle in the GPL Version 2 section of the License file that
776.24 * accompanied this code. If applicable, add the following below the
776.25 * License Header, with the fields enclosed by brackets [] replaced by
776.26 * your own identifying information:
777.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/EjbDataSourcesSelectionPanel.java Fri Jul 16 11:47:36 2010 -0400
777.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/EjbDataSourcesSelectionPanel.java Fri Jul 16 14:21:50 2010 -0400
777.3 @@ -1,7 +1,10 @@
777.4 /*
777.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
777.6 *
777.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
777.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
777.9 + *
777.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
777.11 + * Other names may be trademarks of their respective owners.
777.12 *
777.13 * The contents of this file are subject to the terms of either the GNU
777.14 * General Public License Version 2 only ("GPL") or the Common
777.15 @@ -13,9 +16,9 @@
777.16 * specific language governing permissions and limitations under the
777.17 * License. When distributing the software, include this License Header
777.18 * Notice in each file and include the License file at
777.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
777.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
777.21 * particular file as subject to the "Classpath" exception as provided
777.22 - * by Sun in the GPL Version 2 section of the License file that
777.23 + * by Oracle in the GPL Version 2 section of the License file that
777.24 * accompanied this code. If applicable, add the following below the
777.25 * License Header, with the fields enclosed by brackets [] replaced by
777.26 * your own identifying information:
778.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/EjbGroupPanel.java Fri Jul 16 11:47:36 2010 -0400
778.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/EjbGroupPanel.java Fri Jul 16 14:21:50 2010 -0400
778.3 @@ -1,7 +1,10 @@
778.4 /*
778.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
778.6 *
778.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
778.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
778.9 + *
778.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
778.11 + * Other names may be trademarks of their respective owners.
778.12 *
778.13 * The contents of this file are subject to the terms of either the GNU
778.14 * General Public License Version 2 only ("GPL") or the Common
778.15 @@ -13,9 +16,9 @@
778.16 * specific language governing permissions and limitations under the
778.17 * License. When distributing the software, include this License Header
778.18 * Notice in each file and include the License file at
778.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
778.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
778.21 * particular file as subject to the "Classpath" exception as provided
778.22 - * by Sun in the GPL Version 2 section of the License file that
778.23 + * by Oracle in the GPL Version 2 section of the License file that
778.24 * accompanied this code. If applicable, add the following below the
778.25 * License Header, with the fields enclosed by brackets [] replaced by
778.26 * your own identifying information:
779.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/EjbGroupTreeNodes.java Fri Jul 16 11:47:36 2010 -0400
779.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/EjbGroupTreeNodes.java Fri Jul 16 14:21:50 2010 -0400
779.3 @@ -1,7 +1,10 @@
779.4 /*
779.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
779.6 *
779.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
779.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
779.9 + *
779.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
779.11 + * Other names may be trademarks of their respective owners.
779.12 *
779.13 * The contents of this file are subject to the terms of either the GNU
779.14 * General Public License Version 2 only ("GPL") or the Common
779.15 @@ -13,9 +16,9 @@
779.16 * specific language governing permissions and limitations under the
779.17 * License. When distributing the software, include this License Header
779.18 * Notice in each file and include the License file at
779.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
779.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
779.21 * particular file as subject to the "Classpath" exception as provided
779.22 - * by Sun in the GPL Version 2 section of the License file that
779.23 + * by Oracle in the GPL Version 2 section of the License file that
779.24 * accompanied this code. If applicable, add the following below the
779.25 * License Header, with the fields enclosed by brackets [] replaced by
779.26 * your own identifying information:
780.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ExportEjbDataSourceDialog.java Fri Jul 16 11:47:36 2010 -0400
780.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ExportEjbDataSourceDialog.java Fri Jul 16 14:21:50 2010 -0400
780.3 @@ -1,7 +1,10 @@
780.4 /*
780.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
780.6 *
780.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
780.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
780.9 + *
780.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
780.11 + * Other names may be trademarks of their respective owners.
780.12 *
780.13 * The contents of this file are subject to the terms of either the GNU
780.14 * General Public License Version 2 only ("GPL") or the Common
780.15 @@ -13,9 +16,9 @@
780.16 * specific language governing permissions and limitations under the
780.17 * License. When distributing the software, include this License Header
780.18 * Notice in each file and include the License file at
780.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
780.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
780.21 * particular file as subject to the "Classpath" exception as provided
780.22 - * by Sun in the GPL Version 2 section of the License file that
780.23 + * by Oracle in the GPL Version 2 section of the License file that
780.24 * accompanied this code. If applicable, add the following below the
780.25 * License Header, with the fields enclosed by brackets [] replaced by
780.26 * your own identifying information:
781.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ExportEjbDataSourcesPanel.java Fri Jul 16 11:47:36 2010 -0400
781.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ExportEjbDataSourcesPanel.java Fri Jul 16 14:21:50 2010 -0400
781.3 @@ -1,7 +1,10 @@
781.4 /*
781.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
781.6 *
781.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
781.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
781.9 + *
781.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
781.11 + * Other names may be trademarks of their respective owners.
781.12 *
781.13 * The contents of this file are subject to the terms of either the GNU
781.14 * General Public License Version 2 only ("GPL") or the Common
781.15 @@ -13,9 +16,9 @@
781.16 * specific language governing permissions and limitations under the
781.17 * License. When distributing the software, include this License Header
781.18 * Notice in each file and include the License file at
781.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
781.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
781.21 * particular file as subject to the "Classpath" exception as provided
781.22 - * by Sun in the GPL Version 2 section of the License file that
781.23 + * by Oracle in the GPL Version 2 section of the License file that
781.24 * accompanied this code. If applicable, add the following below the
781.25 * License Header, with the fields enclosed by brackets [] replaced by
781.26 * your own identifying information:
782.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ImportEjbDataSourcesDialog.java Fri Jul 16 11:47:36 2010 -0400
782.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ImportEjbDataSourcesDialog.java Fri Jul 16 14:21:50 2010 -0400
782.3 @@ -1,7 +1,10 @@
782.4 /*
782.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
782.6 *
782.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
782.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
782.9 + *
782.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
782.11 + * Other names may be trademarks of their respective owners.
782.12 *
782.13 * The contents of this file are subject to the terms of either the GNU
782.14 * General Public License Version 2 only ("GPL") or the Common
782.15 @@ -13,9 +16,9 @@
782.16 * specific language governing permissions and limitations under the
782.17 * License. When distributing the software, include this License Header
782.18 * Notice in each file and include the License file at
782.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
782.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
782.21 * particular file as subject to the "Classpath" exception as provided
782.22 - * by Sun in the GPL Version 2 section of the License file that
782.23 + * by Oracle in the GPL Version 2 section of the License file that
782.24 * accompanied this code. If applicable, add the following below the
782.25 * License Header, with the fields enclosed by brackets [] replaced by
782.26 * your own identifying information:
783.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ImportEjbDataSourcesHelper.java Fri Jul 16 11:47:36 2010 -0400
783.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ImportEjbDataSourcesHelper.java Fri Jul 16 14:21:50 2010 -0400
783.3 @@ -1,7 +1,10 @@
783.4 /*
783.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
783.6 *
783.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
783.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
783.9 + *
783.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
783.11 + * Other names may be trademarks of their respective owners.
783.12 *
783.13 * The contents of this file are subject to the terms of either the GNU
783.14 * General Public License Version 2 only ("GPL") or the Common
783.15 @@ -13,9 +16,9 @@
783.16 * specific language governing permissions and limitations under the
783.17 * License. When distributing the software, include this License Header
783.18 * Notice in each file and include the License file at
783.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
783.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
783.21 * particular file as subject to the "Classpath" exception as provided
783.22 - * by Sun in the GPL Version 2 section of the License file that
783.23 + * by Oracle in the GPL Version 2 section of the License file that
783.24 * accompanied this code. If applicable, add the following below the
783.25 * License Header, with the fields enclosed by brackets [] replaced by
783.26 * your own identifying information:
784.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ImportEjbDataSourcesPanel.java Fri Jul 16 11:47:36 2010 -0400
784.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ImportEjbDataSourcesPanel.java Fri Jul 16 14:21:50 2010 -0400
784.3 @@ -1,7 +1,10 @@
784.4 /*
784.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
784.6 *
784.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
784.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
784.9 + *
784.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
784.11 + * Other names may be trademarks of their respective owners.
784.12 *
784.13 * The contents of this file are subject to the terms of either the GNU
784.14 * General Public License Version 2 only ("GPL") or the Common
784.15 @@ -13,9 +16,9 @@
784.16 * specific language governing permissions and limitations under the
784.17 * License. When distributing the software, include this License Header
784.18 * Notice in each file and include the License file at
784.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
784.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
784.21 * particular file as subject to the "Classpath" exception as provided
784.22 - * by Sun in the GPL Version 2 section of the License file that
784.23 + * by Oracle in the GPL Version 2 section of the License file that
784.24 * accompanied this code. If applicable, add the following below the
784.25 * License Header, with the fields enclosed by brackets [] replaced by
784.26 * your own identifying information:
785.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ImportExportFileChooser.java Fri Jul 16 11:47:36 2010 -0400
785.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ImportExportFileChooser.java Fri Jul 16 14:21:50 2010 -0400
785.3 @@ -1,7 +1,10 @@
785.4 /*
785.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
785.6 *
785.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
785.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
785.9 + *
785.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
785.11 + * Other names may be trademarks of their respective owners.
785.12 *
785.13 * The contents of this file are subject to the terms of either the GNU
785.14 * General Public License Version 2 only ("GPL") or the Common
785.15 @@ -13,9 +16,9 @@
785.16 * specific language governing permissions and limitations under the
785.17 * License. When distributing the software, include this License Header
785.18 * Notice in each file and include the License file at
785.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
785.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
785.21 * particular file as subject to the "Classpath" exception as provided
785.22 - * by Sun in the GPL Version 2 section of the License file that
785.23 + * by Oracle in the GPL Version 2 section of the License file that
785.24 * accompanied this code. If applicable, add the following below the
785.25 * License Header, with the fields enclosed by brackets [] replaced by
785.26 * your own identifying information:
786.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/MethodDetailPanel.java Fri Jul 16 11:47:36 2010 -0400
786.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/MethodDetailPanel.java Fri Jul 16 14:21:50 2010 -0400
786.3 @@ -1,7 +1,10 @@
786.4 /*
786.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
786.6 *
786.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
786.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
786.9 + *
786.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
786.11 + * Other names may be trademarks of their respective owners.
786.12 *
786.13 * The contents of this file are subject to the terms of either the GNU
786.14 * General Public License Version 2 only ("GPL") or the Common
786.15 @@ -13,9 +16,9 @@
786.16 * specific language governing permissions and limitations under the
786.17 * License. When distributing the software, include this License Header
786.18 * Notice in each file and include the License file at
786.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
786.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
786.21 * particular file as subject to the "Classpath" exception as provided
786.22 - * by Sun in the GPL Version 2 section of the License file that
786.23 + * by Oracle in the GPL Version 2 section of the License file that
786.24 * accompanied this code. If applicable, add the following below the
786.25 * License Header, with the fields enclosed by brackets [] replaced by
786.26 * your own identifying information:
787.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ModifyEjbGroupDialog.java Fri Jul 16 11:47:36 2010 -0400
787.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ModifyEjbGroupDialog.java Fri Jul 16 14:21:50 2010 -0400
787.3 @@ -1,7 +1,10 @@
787.4 /*
787.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
787.6 *
787.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
787.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
787.9 + *
787.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
787.11 + * Other names may be trademarks of their respective owners.
787.12 *
787.13 * The contents of this file are subject to the terms of either the GNU
787.14 * General Public License Version 2 only ("GPL") or the Common
787.15 @@ -13,9 +16,9 @@
787.16 * specific language governing permissions and limitations under the
787.17 * License. When distributing the software, include this License Header
787.18 * Notice in each file and include the License file at
787.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
787.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
787.21 * particular file as subject to the "Classpath" exception as provided
787.22 - * by Sun in the GPL Version 2 section of the License file that
787.23 + * by Oracle in the GPL Version 2 section of the License file that
787.24 * accompanied this code. If applicable, add the following below the
787.25 * License Header, with the fields enclosed by brackets [] replaced by
787.26 * your own identifying information:
788.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ModifyEjbGroupPanel.java Fri Jul 16 11:47:36 2010 -0400
788.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/ModifyEjbGroupPanel.java Fri Jul 16 14:21:50 2010 -0400
788.3 @@ -1,7 +1,10 @@
788.4 /*
788.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
788.6 *
788.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
788.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
788.9 + *
788.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
788.11 + * Other names may be trademarks of their respective owners.
788.12 *
788.13 * The contents of this file are subject to the terms of either the GNU
788.14 * General Public License Version 2 only ("GPL") or the Common
788.15 @@ -13,9 +16,9 @@
788.16 * specific language governing permissions and limitations under the
788.17 * License. When distributing the software, include this License Header
788.18 * Notice in each file and include the License file at
788.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
788.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
788.21 * particular file as subject to the "Classpath" exception as provided
788.22 - * by Sun in the GPL Version 2 section of the License file that
788.23 + * by Oracle in the GPL Version 2 section of the License file that
788.24 * accompanied this code. If applicable, add the following below the
788.25 * License Header, with the fields enclosed by brackets [] replaced by
788.26 * your own identifying information:
789.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/PortableEjbDataSource.java Fri Jul 16 11:47:36 2010 -0400
789.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/ui/PortableEjbDataSource.java Fri Jul 16 14:21:50 2010 -0400
789.3 @@ -1,7 +1,10 @@
789.4 /*
789.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
789.6 *
789.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
789.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
789.9 + *
789.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
789.11 + * Other names may be trademarks of their respective owners.
789.12 *
789.13 * The contents of this file are subject to the terms of either the GNU
789.14 * General Public License Version 2 only ("GPL") or the Common
789.15 @@ -13,9 +16,9 @@
789.16 * specific language governing permissions and limitations under the
789.17 * License. When distributing the software, include this License Header
789.18 * Notice in each file and include the License file at
789.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
789.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
789.21 * particular file as subject to the "Classpath" exception as provided
789.22 - * by Sun in the GPL Version 2 section of the License file that
789.23 + * by Oracle in the GPL Version 2 section of the License file that
789.24 * accompanied this code. If applicable, add the following below the
789.25 * License Header, with the fields enclosed by brackets [] replaced by
789.26 * your own identifying information:
790.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
790.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
790.3 @@ -1,6 +1,9 @@
790.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
790.5 #
790.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
790.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
790.8 +#
790.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
790.10 +# Other names may be trademarks of their respective owners.
790.11 #
790.12 # The contents of this file are subject to the terms of either the GNU
790.13 # General Public License Version 2 only ("GPL") or the Common
790.14 @@ -12,9 +15,9 @@
790.15 # specific language governing permissions and limitations under the
790.16 # License. When distributing the software, include this License Header
790.17 # Notice in each file and include the License file at
790.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
790.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
790.20 # particular file as subject to the "Classpath" exception as provided
790.21 -# by Sun in the GPL Version 2 section of the License file that
790.22 +# by Oracle in the GPL Version 2 section of the License file that
790.23 # accompanied this code. If applicable, add the following below the
790.24 # License Header, with the fields enclosed by brackets [] replaced by
790.25 # your own identifying information:
791.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/InvalidParameterNameException.java Fri Jul 16 11:47:36 2010 -0400
791.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/InvalidParameterNameException.java Fri Jul 16 14:21:50 2010 -0400
791.3 @@ -1,7 +1,10 @@
791.4 /*
791.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
791.6 *
791.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
791.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
791.9 + *
791.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
791.11 + * Other names may be trademarks of their respective owners.
791.12 *
791.13 * The contents of this file are subject to the terms of either the GNU
791.14 * General Public License Version 2 only ("GPL") or the Common
791.15 @@ -13,9 +16,9 @@
791.16 * specific language governing permissions and limitations under the
791.17 * License. When distributing the software, include this License Header
791.18 * Notice in each file and include the License file at
791.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
791.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
791.21 * particular file as subject to the "Classpath" exception as provided
791.22 - * by Sun in the GPL Version 2 section of the License file that
791.23 + * by Oracle in the GPL Version 2 section of the License file that
791.24 * accompanied this code. If applicable, add the following below the
791.25 * License Header, with the fields enclosed by brackets [] replaced by
791.26 * your own identifying information:
792.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/JarExploder.java Fri Jul 16 11:47:36 2010 -0400
792.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/JarExploder.java Fri Jul 16 14:21:50 2010 -0400
792.3 @@ -1,7 +1,10 @@
792.4 /*
792.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
792.6 *
792.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
792.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
792.9 + *
792.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
792.11 + * Other names may be trademarks of their respective owners.
792.12 *
792.13 * The contents of this file are subject to the terms of either the GNU
792.14 * General Public License Version 2 only ("GPL") or the Common
792.15 @@ -13,9 +16,9 @@
792.16 * specific language governing permissions and limitations under the
792.17 * License. When distributing the software, include this License Header
792.18 * Notice in each file and include the License file at
792.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
792.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
792.21 * particular file as subject to the "Classpath" exception as provided
792.22 - * by Sun in the GPL Version 2 section of the License file that
792.23 + * by Oracle in the GPL Version 2 section of the License file that
792.24 * accompanied this code. If applicable, add the following below the
792.25 * License Header, with the fields enclosed by brackets [] replaced by
792.26 * your own identifying information:
793.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/JavaKeywords.java Fri Jul 16 11:47:36 2010 -0400
793.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/JavaKeywords.java Fri Jul 16 14:21:50 2010 -0400
793.3 @@ -1,7 +1,10 @@
793.4 /*
793.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
793.6 *
793.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
793.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
793.9 + *
793.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
793.11 + * Other names may be trademarks of their respective owners.
793.12 *
793.13 * The contents of this file are subject to the terms of either the GNU
793.14 * General Public License Version 2 only ("GPL") or the Common
793.15 @@ -13,9 +16,9 @@
793.16 * specific language governing permissions and limitations under the
793.17 * License. When distributing the software, include this License Header
793.18 * Notice in each file and include the License file at
793.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
793.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
793.21 * particular file as subject to the "Classpath" exception as provided
793.22 - * by Sun in the GPL Version 2 section of the License file that
793.23 + * by Oracle in the GPL Version 2 section of the License file that
793.24 * accompanied this code. If applicable, add the following below the
793.25 * License Header, with the fields enclosed by brackets [] replaced by
793.26 * your own identifying information:
794.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/MethodParamValidator.java Fri Jul 16 11:47:36 2010 -0400
794.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/MethodParamValidator.java Fri Jul 16 14:21:50 2010 -0400
794.3 @@ -1,7 +1,10 @@
794.4 /*
794.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
794.6 *
794.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
794.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
794.9 + *
794.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
794.11 + * Other names may be trademarks of their respective owners.
794.12 *
794.13 * The contents of this file are subject to the terms of either the GNU
794.14 * General Public License Version 2 only ("GPL") or the Common
794.15 @@ -13,9 +16,9 @@
794.16 * specific language governing permissions and limitations under the
794.17 * License. When distributing the software, include this License Header
794.18 * Notice in each file and include the License file at
794.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
794.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
794.21 * particular file as subject to the "Classpath" exception as provided
794.22 - * by Sun in the GPL Version 2 section of the License file that
794.23 + * by Oracle in the GPL Version 2 section of the License file that
794.24 * accompanied this code. If applicable, add the following below the
794.25 * License Header, with the fields enclosed by brackets [] replaced by
794.26 * your own identifying information:
795.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/RunCommand.java Fri Jul 16 11:47:36 2010 -0400
795.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/RunCommand.java Fri Jul 16 14:21:50 2010 -0400
795.3 @@ -1,7 +1,10 @@
795.4 /*
795.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
795.6 *
795.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
795.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
795.9 + *
795.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
795.11 + * Other names may be trademarks of their respective owners.
795.12 *
795.13 * The contents of this file are subject to the terms of either the GNU
795.14 * General Public License Version 2 only ("GPL") or the Common
795.15 @@ -13,9 +16,9 @@
795.16 * specific language governing permissions and limitations under the
795.17 * License. When distributing the software, include this License Header
795.18 * Notice in each file and include the License file at
795.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
795.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
795.21 * particular file as subject to the "Classpath" exception as provided
795.22 - * by Sun in the GPL Version 2 section of the License file that
795.23 + * by Oracle in the GPL Version 2 section of the License file that
795.24 * accompanied this code. If applicable, add the following below the
795.25 * License Header, with the fields enclosed by brackets [] replaced by
795.26 * your own identifying information:
796.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/StreamGobbler.java Fri Jul 16 11:47:36 2010 -0400
796.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/StreamGobbler.java Fri Jul 16 14:21:50 2010 -0400
796.3 @@ -1,7 +1,10 @@
796.4 /*
796.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
796.6 *
796.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
796.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
796.9 + *
796.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
796.11 + * Other names may be trademarks of their respective owners.
796.12 *
796.13 * The contents of this file are subject to the terms of either the GNU
796.14 * General Public License Version 2 only ("GPL") or the Common
796.15 @@ -13,9 +16,9 @@
796.16 * specific language governing permissions and limitations under the
796.17 * License. When distributing the software, include this License Header
796.18 * Notice in each file and include the License file at
796.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
796.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
796.21 * particular file as subject to the "Classpath" exception as provided
796.22 - * by Sun in the GPL Version 2 section of the License file that
796.23 + * by Oracle in the GPL Version 2 section of the License file that
796.24 * accompanied this code. If applicable, add the following below the
796.25 * License Header, with the fields enclosed by brackets [] replaced by
796.26 * your own identifying information:
797.1 --- a/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/Util.java Fri Jul 16 11:47:36 2010 -0400
797.2 +++ b/visualweb.ejb/src/org/netbeans/modules/visualweb/ejb/util/Util.java Fri Jul 16 14:21:50 2010 -0400
797.3 @@ -1,7 +1,10 @@
797.4 /*
797.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
797.6 *
797.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
797.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
797.9 + *
797.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
797.11 + * Other names may be trademarks of their respective owners.
797.12 *
797.13 * The contents of this file are subject to the terms of either the GNU
797.14 * General Public License Version 2 only ("GPL") or the Common
797.15 @@ -13,9 +16,9 @@
797.16 * specific language governing permissions and limitations under the
797.17 * License. When distributing the software, include this License Header
797.18 * Notice in each file and include the License file at
797.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
797.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
797.21 * particular file as subject to the "Classpath" exception as provided
797.22 - * by Sun in the GPL Version 2 section of the License file that
797.23 + * by Oracle in the GPL Version 2 section of the License file that
797.24 * accompanied this code. If applicable, add the following below the
797.25 * License Header, with the fields enclosed by brackets [] replaced by
797.26 * your own identifying information:
798.1 --- a/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/AddEJBTest.java Fri Jul 16 11:47:36 2010 -0400
798.2 +++ b/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/AddEJBTest.java Fri Jul 16 14:21:50 2010 -0400
798.3 @@ -1,7 +1,10 @@
798.4 /*
798.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
798.6
798.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
798.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
798.9 +
798.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
798.11 +Other names may be trademarks of their respective owners.
798.12
798.13
798.14 The contents of this file are subject to the terms of either the GNU
798.15 @@ -14,9 +17,9 @@
798.16 specific language governing permissions and limitations under the
798.17 License. When distributing the software, include this License Header
798.18 Notice in each file and include the License file at
798.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
798.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
798.21 particular file as subject to the "Classpath" exception as provided
798.22 -by Sun in the GPL Version 2 section of the License file that
798.23 +by Oracle in the GPL Version 2 section of the License file that
798.24 accompanied this code. If applicable, add the following below the
798.25 License Header, with the fields enclosed by brackets [] replaced by
798.26 your own identifying information:
799.1 --- a/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/EJBAcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
799.2 +++ b/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/EJBAcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
799.3 @@ -1,7 +1,10 @@
799.4 /*
799.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
799.6
799.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
799.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
799.9 +
799.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
799.11 +Other names may be trademarks of their respective owners.
799.12
799.13
799.14 The contents of this file are subject to the terms of either the GNU
799.15 @@ -14,9 +17,9 @@
799.16 specific language governing permissions and limitations under the
799.17 License. When distributing the software, include this License Header
799.18 Notice in each file and include the License file at
799.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
799.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
799.21 particular file as subject to the "Classpath" exception as provided
799.22 -by Sun in the GPL Version 2 section of the License file that
799.23 +by Oracle in the GPL Version 2 section of the License file that
799.24 accompanied this code. If applicable, add the following below the
799.25 License Header, with the fields enclosed by brackets [] replaced by
799.26 your own identifying information:
800.1 --- a/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/EJBAppSubnodeTest.java Fri Jul 16 11:47:36 2010 -0400
800.2 +++ b/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/EJBAppSubnodeTest.java Fri Jul 16 14:21:50 2010 -0400
800.3 @@ -1,7 +1,10 @@
800.4 /*
800.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
800.6
800.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
800.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
800.9 +
800.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
800.11 +Other names may be trademarks of their respective owners.
800.12
800.13
800.14 The contents of this file are subject to the terms of either the GNU
800.15 @@ -14,9 +17,9 @@
800.16 specific language governing permissions and limitations under the
800.17 License. When distributing the software, include this License Header
800.18 Notice in each file and include the License file at
800.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
800.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
800.21 particular file as subject to the "Classpath" exception as provided
800.22 -by Sun in the GPL Version 2 section of the License file that
800.23 +by Oracle in the GPL Version 2 section of the License file that
800.24 accompanied this code. If applicable, add the following below the
800.25 License Header, with the fields enclosed by brackets [] replaced by
800.26 your own identifying information:
801.1 --- a/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/EJBNodeTest.java Fri Jul 16 11:47:36 2010 -0400
801.2 +++ b/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/EJBNodeTest.java Fri Jul 16 14:21:50 2010 -0400
801.3 @@ -1,7 +1,10 @@
801.4 /*
801.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
801.6
801.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
801.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
801.9 +
801.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
801.11 +Other names may be trademarks of their respective owners.
801.12
801.13
801.14 The contents of this file are subject to the terms of either the GNU
801.15 @@ -14,9 +17,9 @@
801.16 specific language governing permissions and limitations under the
801.17 License. When distributing the software, include this License Header
801.18 Notice in each file and include the License file at
801.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
801.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
801.21 particular file as subject to the "Classpath" exception as provided
801.22 -by Sun in the GPL Version 2 section of the License file that
801.23 +by Oracle in the GPL Version 2 section of the License file that
801.24 accompanied this code. If applicable, add the following below the
801.25 License Header, with the fields enclosed by brackets [] replaced by
801.26 your own identifying information:
802.1 --- a/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/EJBTestUtils.java Fri Jul 16 11:47:36 2010 -0400
802.2 +++ b/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/EJBTestUtils.java Fri Jul 16 14:21:50 2010 -0400
802.3 @@ -1,7 +1,10 @@
802.4 /*
802.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
802.6
802.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
802.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
802.9 +
802.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
802.11 +Other names may be trademarks of their respective owners.
802.12
802.13
802.14 The contents of this file are subject to the terms of either the GNU
802.15 @@ -14,9 +17,9 @@
802.16 specific language governing permissions and limitations under the
802.17 License. When distributing the software, include this License Header
802.18 Notice in each file and include the License file at
802.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
802.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
802.21 particular file as subject to the "Classpath" exception as provided
802.22 -by Sun in the GPL Version 2 section of the License file that
802.23 +by Oracle in the GPL Version 2 section of the License file that
802.24 accompanied this code. If applicable, add the following below the
802.25 License Header, with the fields enclosed by brackets [] replaced by
802.26 your own identifying information:
803.1 --- a/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/ExportEJBTest.java Fri Jul 16 11:47:36 2010 -0400
803.2 +++ b/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/ExportEJBTest.java Fri Jul 16 14:21:50 2010 -0400
803.3 @@ -1,7 +1,10 @@
803.4 /*
803.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
803.6
803.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
803.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
803.9 +
803.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
803.11 +Other names may be trademarks of their respective owners.
803.12
803.13
803.14 The contents of this file are subject to the terms of either the GNU
803.15 @@ -14,9 +17,9 @@
803.16 specific language governing permissions and limitations under the
803.17 License. When distributing the software, include this License Header
803.18 Notice in each file and include the License file at
803.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
803.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
803.21 particular file as subject to the "Classpath" exception as provided
803.22 -by Sun in the GPL Version 2 section of the License file that
803.23 +by Oracle in the GPL Version 2 section of the License file that
803.24 accompanied this code. If applicable, add the following below the
803.25 License Header, with the fields enclosed by brackets [] replaced by
803.26 your own identifying information:
804.1 --- a/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/ImportEJBTest.java Fri Jul 16 11:47:36 2010 -0400
804.2 +++ b/visualweb.ejb/test/qa-functional/src/org/netbeans/test/ejb/ImportEJBTest.java Fri Jul 16 14:21:50 2010 -0400
804.3 @@ -1,7 +1,10 @@
804.4 /*
804.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
804.6
804.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
804.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
804.9 +
804.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
804.11 +Other names may be trademarks of their respective owners.
804.12
804.13
804.14 The contents of this file are subject to the terms of either the GNU
804.15 @@ -14,9 +17,9 @@
804.16 specific language governing permissions and limitations under the
804.17 License. When distributing the software, include this License Header
804.18 Notice in each file and include the License file at
804.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
804.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
804.21 particular file as subject to the "Classpath" exception as provided
804.22 -by Sun in the GPL Version 2 section of the License file that
804.23 +by Oracle in the GPL Version 2 section of the License file that
804.24 accompanied this code. If applicable, add the following below the
804.25 License Header, with the fields enclosed by brackets [] replaced by
804.26 your own identifying information:
805.1 --- a/visualweb.errorhandler.client/build.xml Fri Jul 16 11:47:36 2010 -0400
805.2 +++ b/visualweb.errorhandler.client/build.xml Fri Jul 16 14:21:50 2010 -0400
805.3 @@ -2,7 +2,10 @@
805.4 <!--
805.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
805.6
805.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
805.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
805.9 +
805.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
805.11 +Other names may be trademarks of their respective owners.
805.12
805.13
805.14 The contents of this file are subject to the terms of either the GNU
805.15 @@ -15,9 +18,9 @@
805.16 specific language governing permissions and limitations under the
805.17 License. When distributing the software, include this License Header
805.18 Notice in each file and include the License file at
805.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
805.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
805.21 particular file as subject to the "Classpath" exception as provided
805.22 -by Sun in the GPL Version 2 section of the License file that
805.23 +by Oracle in the GPL Version 2 section of the License file that
805.24 accompanied this code. If applicable, add the following below the
805.25 License Header, with the fields enclosed by brackets [] replaced by
805.26 your own identifying information:
806.1 --- a/visualweb.errorhandler.client/library/build.xml Fri Jul 16 11:47:36 2010 -0400
806.2 +++ b/visualweb.errorhandler.client/library/build.xml Fri Jul 16 14:21:50 2010 -0400
806.3 @@ -2,7 +2,10 @@
806.4 <!--
806.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
806.6
806.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
806.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
806.9 +
806.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
806.11 +Other names may be trademarks of their respective owners.
806.12
806.13
806.14 The contents of this file are subject to the terms of either the GNU
806.15 @@ -15,9 +18,9 @@
806.16 specific language governing permissions and limitations under the
806.17 License. When distributing the software, include this License Header
806.18 Notice in each file and include the License file at
806.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
806.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
806.21 particular file as subject to the "Classpath" exception as provided
806.22 -by Sun in the GPL Version 2 section of the License file that
806.23 +by Oracle in the GPL Version 2 section of the License file that
806.24 accompanied this code. If applicable, add the following below the
806.25 License Header, with the fields enclosed by brackets [] replaced by
806.26 your own identifying information:
807.1 --- a/visualweb.errorhandler.client/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
807.2 +++ b/visualweb.errorhandler.client/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
807.3 @@ -1,6 +1,9 @@
807.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
807.5 #
807.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
807.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
807.8 +#
807.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
807.10 +# Other names may be trademarks of their respective owners.
807.11 #
807.12 # The contents of this file are subject to the terms of either the GNU
807.13 # General Public License Version 2 only ("GPL") or the Common
807.14 @@ -12,9 +15,9 @@
807.15 # specific language governing permissions and limitations under the
807.16 # License. When distributing the software, include this License Header
807.17 # Notice in each file and include the License file at
807.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
807.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
807.20 # particular file as subject to the "Classpath" exception as provided
807.21 -# by Sun in the GPL Version 2 section of the License file that
807.22 +# by Oracle in the GPL Version 2 section of the License file that
807.23 # accompanied this code. If applicable, add the following below the
807.24 # License Header, with the fields enclosed by brackets [] replaced by
807.25 # your own identifying information:
807.26 @@ -56,7 +59,7 @@
807.27 dist.jar=${dist.dir}/errorhandler.jar
807.28 dist.javadoc.dir=${dist.dir}/javadoc
807.29 excludes=
807.30 -file.reference.servlet-jsp-api.jar=${servletjspapi.dir}/modules/ext/servlet2.5-jsp2.1-api.jar
807.31 +file.reference.servlet-jsp-api.jar=${servletjspapi.dir}/modules/ext/servlet3.0-jsp2.2-api.jar
807.32 includes=**
807.33 jar.compress=false
807.34 javac.classpath=\
808.1 --- a/visualweb.errorhandler.client/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
808.2 +++ b/visualweb.errorhandler.client/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
808.3 @@ -2,7 +2,10 @@
808.4 <!--
808.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
808.6
808.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
808.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
808.9 +
808.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
808.11 +Other names may be trademarks of their respective owners.
808.12
808.13
808.14 The contents of this file are subject to the terms of either the GNU
808.15 @@ -15,9 +18,9 @@
808.16 specific language governing permissions and limitations under the
808.17 License. When distributing the software, include this License Header
808.18 Notice in each file and include the License file at
808.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
808.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
808.21 particular file as subject to the "Classpath" exception as provided
808.22 -by Sun in the GPL Version 2 section of the License file that
808.23 +by Oracle in the GPL Version 2 section of the License file that
808.24 accompanied this code. If applicable, add the following below the
808.25 License Header, with the fields enclosed by brackets [] replaced by
808.26 your own identifying information:
809.1 --- a/visualweb.errorhandler.client/library/src/com/sun/errorhandler/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
809.2 +++ b/visualweb.errorhandler.client/library/src/com/sun/errorhandler/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
809.3 @@ -1,6 +1,9 @@
809.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
809.5 #
809.6 - # Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
809.7 + # Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
809.8 + #
809.9 + # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
809.10 + # Other names may be trademarks of their respective owners.
809.11 #
809.12 # The contents of this file are subject to the terms of either the GNU
809.13 # General Public License Version 2 only ("GPL") or the Common
809.14 @@ -12,9 +15,9 @@
809.15 # specific language governing permissions and limitations under the
809.16 # License. When distributing the software, include this License Header
809.17 # Notice in each file and include the License file at
809.18 - # nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
809.19 + # nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
809.20 # particular file as subject to the "Classpath" exception as provided
809.21 - # by Sun in the GPL Version 2 section of the License file that
809.22 + # by Oracle in the GPL Version 2 section of the License file that
809.23 # accompanied this code. If applicable, add the following below the
809.24 # License Header, with the fields enclosed by brackets [] replaced by
809.25 # your own identifying information:
810.1 --- a/visualweb.errorhandler.client/library/src/com/sun/errorhandler/DebugClientTestThread.java Fri Jul 16 11:47:36 2010 -0400
810.2 +++ b/visualweb.errorhandler.client/library/src/com/sun/errorhandler/DebugClientTestThread.java Fri Jul 16 14:21:50 2010 -0400
810.3 @@ -1,7 +1,10 @@
810.4 /*
810.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
810.6 *
810.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
810.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
810.9 + *
810.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
810.11 + * Other names may be trademarks of their respective owners.
810.12 *
810.13 * The contents of this file are subject to the terms of either the GNU
810.14 * General Public License Version 2 only ("GPL") or the Common
810.15 @@ -13,9 +16,9 @@
810.16 * specific language governing permissions and limitations under the
810.17 * License. When distributing the software, include this License Header
810.18 * Notice in each file and include the License file at
810.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
810.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
810.21 * particular file as subject to the "Classpath" exception as provided
810.22 - * by Sun in the GPL Version 2 section of the License file that
810.23 + * by Oracle in the GPL Version 2 section of the License file that
810.24 * accompanied this code. If applicable, add the following below the
810.25 * License Header, with the fields enclosed by brackets [] replaced by
810.26 * your own identifying information:
811.1 --- a/visualweb.errorhandler.client/library/src/com/sun/errorhandler/DebugClientTestWindow.java Fri Jul 16 11:47:36 2010 -0400
811.2 +++ b/visualweb.errorhandler.client/library/src/com/sun/errorhandler/DebugClientTestWindow.java Fri Jul 16 14:21:50 2010 -0400
811.3 @@ -1,7 +1,10 @@
811.4 /*
811.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
811.6 *
811.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
811.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
811.9 + *
811.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
811.11 + * Other names may be trademarks of their respective owners.
811.12 *
811.13 * The contents of this file are subject to the terms of either the GNU
811.14 * General Public License Version 2 only ("GPL") or the Common
811.15 @@ -13,9 +16,9 @@
811.16 * specific language governing permissions and limitations under the
811.17 * License. When distributing the software, include this License Header
811.18 * Notice in each file and include the License file at
811.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
811.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
811.21 * particular file as subject to the "Classpath" exception as provided
811.22 - * by Sun in the GPL Version 2 section of the License file that
811.23 + * by Oracle in the GPL Version 2 section of the License file that
811.24 * accompanied this code. If applicable, add the following below the
811.25 * License Header, with the fields enclosed by brackets [] replaced by
811.26 * your own identifying information:
812.1 --- a/visualweb.errorhandler.client/library/src/com/sun/errorhandler/DebugClientThread.java Fri Jul 16 11:47:36 2010 -0400
812.2 +++ b/visualweb.errorhandler.client/library/src/com/sun/errorhandler/DebugClientThread.java Fri Jul 16 14:21:50 2010 -0400
812.3 @@ -1,7 +1,10 @@
812.4 /*
812.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
812.6 *
812.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
812.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
812.9 + *
812.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
812.11 + * Other names may be trademarks of their respective owners.
812.12 *
812.13 * The contents of this file are subject to the terms of either the GNU
812.14 * General Public License Version 2 only ("GPL") or the Common
812.15 @@ -13,9 +16,9 @@
812.16 * specific language governing permissions and limitations under the
812.17 * License. When distributing the software, include this License Header
812.18 * Notice in each file and include the License file at
812.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
812.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
812.21 * particular file as subject to the "Classpath" exception as provided
812.22 - * by Sun in the GPL Version 2 section of the License file that
812.23 + * by Oracle in the GPL Version 2 section of the License file that
812.24 * accompanied this code. If applicable, add the following below the
812.25 * License Header, with the fields enclosed by brackets [] replaced by
812.26 * your own identifying information:
813.1 --- a/visualweb.errorhandler.client/library/src/com/sun/errorhandler/DebugProtocol.java Fri Jul 16 11:47:36 2010 -0400
813.2 +++ b/visualweb.errorhandler.client/library/src/com/sun/errorhandler/DebugProtocol.java Fri Jul 16 14:21:50 2010 -0400
813.3 @@ -1,7 +1,10 @@
813.4 /*
813.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
813.6 *
813.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
813.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
813.9 + *
813.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
813.11 + * Other names may be trademarks of their respective owners.
813.12 *
813.13 * The contents of this file are subject to the terms of either the GNU
813.14 * General Public License Version 2 only ("GPL") or the Common
813.15 @@ -13,9 +16,9 @@
813.16 * specific language governing permissions and limitations under the
813.17 * License. When distributing the software, include this License Header
813.18 * Notice in each file and include the License file at
813.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
813.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
813.21 * particular file as subject to the "Classpath" exception as provided
813.22 - * by Sun in the GPL Version 2 section of the License file that
813.23 + * by Oracle in the GPL Version 2 section of the License file that
813.24 * accompanied this code. If applicable, add the following below the
813.25 * License Header, with the fields enclosed by brackets [] replaced by
813.26 * your own identifying information:
814.1 --- a/visualweb.errorhandler.client/library/src/com/sun/errorhandler/ExceptionHandler.java Fri Jul 16 11:47:36 2010 -0400
814.2 +++ b/visualweb.errorhandler.client/library/src/com/sun/errorhandler/ExceptionHandler.java Fri Jul 16 14:21:50 2010 -0400
814.3 @@ -1,7 +1,10 @@
814.4 /*
814.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
814.6 *
814.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
814.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
814.9 + *
814.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
814.11 + * Other names may be trademarks of their respective owners.
814.12 *
814.13 * The contents of this file are subject to the terms of either the GNU
814.14 * General Public License Version 2 only ("GPL") or the Common
814.15 @@ -13,9 +16,9 @@
814.16 * specific language governing permissions and limitations under the
814.17 * License. When distributing the software, include this License Header
814.18 * Notice in each file and include the License file at
814.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
814.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
814.21 * particular file as subject to the "Classpath" exception as provided
814.22 - * by Sun in the GPL Version 2 section of the License file that
814.23 + * by Oracle in the GPL Version 2 section of the License file that
814.24 * accompanied this code. If applicable, add the following below the
814.25 * License Header, with the fields enclosed by brackets [] replaced by
814.26 * your own identifying information:
815.1 --- a/visualweb.errorhandler.client/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
815.2 +++ b/visualweb.errorhandler.client/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
815.3 @@ -1,6 +1,9 @@
815.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
815.5 #
815.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
815.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
815.8 +#
815.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
815.10 +# Other names may be trademarks of their respective owners.
815.11 #
815.12 # The contents of this file are subject to the terms of either the GNU
815.13 # General Public License Version 2 only ("GPL") or the Common
815.14 @@ -12,9 +15,9 @@
815.15 # specific language governing permissions and limitations under the
815.16 # License. When distributing the software, include this License Header
815.17 # Notice in each file and include the License file at
815.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
815.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
815.20 # particular file as subject to the "Classpath" exception as provided
815.21 -# by Sun in the GPL Version 2 section of the License file that
815.22 +# by Oracle in the GPL Version 2 section of the License file that
815.23 # accompanied this code. If applicable, add the following below the
815.24 # License Header, with the fields enclosed by brackets [] replaced by
815.25 # your own identifying information:
816.1 --- a/visualweb.errorhandler.client/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
816.2 +++ b/visualweb.errorhandler.client/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
816.3 @@ -2,7 +2,10 @@
816.4 <!--
816.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
816.6
816.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
816.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
816.9 +
816.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
816.11 +Other names may be trademarks of their respective owners.
816.12
816.13
816.14 The contents of this file are subject to the terms of either the GNU
816.15 @@ -15,9 +18,9 @@
816.16 specific language governing permissions and limitations under the
816.17 License. When distributing the software, include this License Header
816.18 Notice in each file and include the License file at
816.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
816.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
816.21 particular file as subject to the "Classpath" exception as provided
816.22 -by Sun in the GPL Version 2 section of the License file that
816.23 +by Oracle in the GPL Version 2 section of the License file that
816.24 accompanied this code. If applicable, add the following below the
816.25 License Header, with the fields enclosed by brackets [] replaced by
816.26 your own identifying information:
817.1 --- a/visualweb.errorhandler.client/src/org/netbeans/modules/visualweb/errorhandler/client/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
817.2 +++ b/visualweb.errorhandler.client/src/org/netbeans/modules/visualweb/errorhandler/client/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
817.3 @@ -1,7 +1,10 @@
817.4
817.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
817.6 #
817.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
817.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
817.9 +#
817.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
817.11 +# Other names may be trademarks of their respective owners.
817.12 #
817.13 # The contents of this file are subject to the terms of either the GNU
817.14 # General Public License Version 2 only ("GPL") or the Common
817.15 @@ -13,9 +16,9 @@
817.16 # specific language governing permissions and limitations under the
817.17 # License. When distributing the software, include this License Header
817.18 # Notice in each file and include the License file at
817.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
817.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
817.21 # particular file as subject to the "Classpath" exception as provided
817.22 -# by Sun in the GPL Version 2 section of the License file that
817.23 +# by Oracle in the GPL Version 2 section of the License file that
817.24 # accompanied this code. If applicable, add the following below the
817.25 # License Header, with the fields enclosed by brackets [] replaced by
817.26 # your own identifying information:
818.1 --- a/visualweb.errorhandler.client/src/org/netbeans/modules/visualweb/errorhandler/client/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
818.2 +++ b/visualweb.errorhandler.client/src/org/netbeans/modules/visualweb/errorhandler/client/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
818.3 @@ -1,6 +1,9 @@
818.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
818.5 #
818.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
818.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
818.8 +#
818.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
818.10 +# Other names may be trademarks of their respective owners.
818.11 #
818.12 # The contents of this file are subject to the terms of either the GNU
818.13 # General Public License Version 2 only ("GPL") or the Common
818.14 @@ -12,9 +15,9 @@
818.15 # specific language governing permissions and limitations under the
818.16 # License. When distributing the software, include this License Header
818.17 # Notice in each file and include the License file at
818.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
818.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
818.20 # particular file as subject to the "Classpath" exception as provided
818.21 -# by Sun in the GPL Version 2 section of the License file that
818.22 +# by Oracle in the GPL Version 2 section of the License file that
818.23 # accompanied this code. If applicable, add the following below the
818.24 # License Header, with the fields enclosed by brackets [] replaced by
818.25 # your own identifying information:
819.1 --- a/visualweb.errorhandler.client/src/org/netbeans/modules/visualweb/errorhandler/client/resources/exceptionhandler-runtime.xml Fri Jul 16 11:47:36 2010 -0400
819.2 +++ b/visualweb.errorhandler.client/src/org/netbeans/modules/visualweb/errorhandler/client/resources/exceptionhandler-runtime.xml Fri Jul 16 14:21:50 2010 -0400
819.3 @@ -2,7 +2,10 @@
819.4 <!--
819.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
819.6
819.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
819.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
819.9 +
819.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
819.11 +Other names may be trademarks of their respective owners.
819.12
819.13
819.14 The contents of this file are subject to the terms of either the GNU
819.15 @@ -15,9 +18,9 @@
819.16 specific language governing permissions and limitations under the
819.17 License. When distributing the software, include this License Header
819.18 Notice in each file and include the License file at
819.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
819.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
819.21 particular file as subject to the "Classpath" exception as provided
819.22 -by Sun in the GPL Version 2 section of the License file that
819.23 +by Oracle in the GPL Version 2 section of the License file that
819.24 accompanied this code. If applicable, add the following below the
819.25 License Header, with the fields enclosed by brackets [] replaced by
819.26 your own identifying information:
819.27 @@ -48,6 +51,6 @@
819.28 <localizing-bundle>org.netbeans.modules.visualweb.errorhandler.client.resources.Bundle</localizing-bundle>
819.29 <volume>
819.30 <type>classpath</type>
819.31 - <resource>jar:nbinst:///modules/ext/errorhandler.jar!/</resource>
819.32 + <resource>jar:nbinst://org.netbeans.modules.visualweb.errorhandler.client/modules/ext/errorhandler.jar!/</resource>
819.33 </volume>
819.34 </library>
820.1 --- a/visualweb.errorhandler.client/src/org/netbeans/modules/visualweb/errorhandler/client/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
820.2 +++ b/visualweb.errorhandler.client/src/org/netbeans/modules/visualweb/errorhandler/client/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
820.3 @@ -2,7 +2,10 @@
820.4 <!--
820.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
820.6
820.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
820.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
820.9 +
820.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
820.11 +Other names may be trademarks of their respective owners.
820.12
820.13
820.14 The contents of this file are subject to the terms of either the GNU
820.15 @@ -15,9 +18,9 @@
820.16 specific language governing permissions and limitations under the
820.17 License. When distributing the software, include this License Header
820.18 Notice in each file and include the License file at
820.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
820.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
820.21 particular file as subject to the "Classpath" exception as provided
820.22 -by Sun in the GPL Version 2 section of the License file that
820.23 +by Oracle in the GPL Version 2 section of the License file that
820.24 accompanied this code. If applicable, add the following below the
820.25 License Header, with the fields enclosed by brackets [] replaced by
820.26 your own identifying information:
821.1 --- a/visualweb.errorhandler/build.xml Fri Jul 16 11:47:36 2010 -0400
821.2 +++ b/visualweb.errorhandler/build.xml Fri Jul 16 14:21:50 2010 -0400
821.3 @@ -2,7 +2,10 @@
821.4 <!--
821.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
821.6
821.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
821.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
821.9 +
821.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
821.11 +Other names may be trademarks of their respective owners.
821.12
821.13
821.14 The contents of this file are subject to the terms of either the GNU
821.15 @@ -15,9 +18,9 @@
821.16 specific language governing permissions and limitations under the
821.17 License. When distributing the software, include this License Header
821.18 Notice in each file and include the License file at
821.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
821.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
821.21 particular file as subject to the "Classpath" exception as provided
821.22 -by Sun in the GPL Version 2 section of the License file that
821.23 +by Oracle in the GPL Version 2 section of the License file that
821.24 accompanied this code. If applicable, add the following below the
821.25 License Header, with the fields enclosed by brackets [] replaced by
821.26 your own identifying information:
822.1 --- a/visualweb.errorhandler/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
822.2 +++ b/visualweb.errorhandler/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
822.3 @@ -2,7 +2,10 @@
822.4 <!--
822.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
822.6
822.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
822.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
822.9 +
822.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
822.11 +Other names may be trademarks of their respective owners.
822.12
822.13
822.14 The contents of this file are subject to the terms of either the GNU
822.15 @@ -15,9 +18,9 @@
822.16 specific language governing permissions and limitations under the
822.17 License. When distributing the software, include this License Header
822.18 Notice in each file and include the License file at
822.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
822.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
822.21 particular file as subject to the "Classpath" exception as provided
822.22 -by Sun in the GPL Version 2 section of the License file that
822.23 +by Oracle in the GPL Version 2 section of the License file that
822.24 accompanied this code. If applicable, add the following below the
822.25 License Header, with the fields enclosed by brackets [] replaced by
822.26 your own identifying information:
823.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
823.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
823.3 @@ -1,7 +1,10 @@
823.4
823.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
823.6 #
823.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
823.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
823.9 +#
823.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
823.11 +# Other names may be trademarks of their respective owners.
823.12 #
823.13 # The contents of this file are subject to the terms of either the GNU
823.14 # General Public License Version 2 only ("GPL") or the Common
823.15 @@ -13,9 +16,9 @@
823.16 # specific language governing permissions and limitations under the
823.17 # License. When distributing the software, include this License Header
823.18 # Notice in each file and include the License file at
823.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
823.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
823.21 # particular file as subject to the "Classpath" exception as provided
823.22 -# by Sun in the GPL Version 2 section of the License file that
823.23 +# by Oracle in the GPL Version 2 section of the License file that
823.24 # accompanied this code. If applicable, add the following below the
823.25 # License Header, with the fields enclosed by brackets [] replaced by
823.26 # your own identifying information:
824.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/ClientSocketConnectionThread.java Fri Jul 16 11:47:36 2010 -0400
824.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/ClientSocketConnectionThread.java Fri Jul 16 14:21:50 2010 -0400
824.3 @@ -1,7 +1,10 @@
824.4 /*
824.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
824.6 *
824.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
824.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
824.9 + *
824.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
824.11 + * Other names may be trademarks of their respective owners.
824.12 *
824.13 * The contents of this file are subject to the terms of either the GNU
824.14 * General Public License Version 2 only ("GPL") or the Common
824.15 @@ -13,9 +16,9 @@
824.16 * specific language governing permissions and limitations under the
824.17 * License. When distributing the software, include this License Header
824.18 * Notice in each file and include the License file at
824.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
824.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
824.21 * particular file as subject to the "Classpath" exception as provided
824.22 - * by Sun in the GPL Version 2 section of the License file that
824.23 + * by Oracle in the GPL Version 2 section of the License file that
824.24 * accompanied this code. If applicable, add the following below the
824.25 * License Header, with the fields enclosed by brackets [] replaced by
824.26 * your own identifying information:
825.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/DebugProtocol.java Fri Jul 16 11:47:36 2010 -0400
825.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/DebugProtocol.java Fri Jul 16 14:21:50 2010 -0400
825.3 @@ -1,7 +1,10 @@
825.4 /*
825.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
825.6 *
825.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
825.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
825.9 + *
825.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
825.11 + * Other names may be trademarks of their respective owners.
825.12 *
825.13 * The contents of this file are subject to the terms of either the GNU
825.14 * General Public License Version 2 only ("GPL") or the Common
825.15 @@ -13,9 +16,9 @@
825.16 * specific language governing permissions and limitations under the
825.17 * License. When distributing the software, include this License Header
825.18 * Notice in each file and include the License file at
825.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
825.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
825.21 * particular file as subject to the "Classpath" exception as provided
825.22 - * by Sun in the GPL Version 2 section of the License file that
825.23 + * by Oracle in the GPL Version 2 section of the License file that
825.24 * accompanied this code. If applicable, add the following below the
825.25 * License Header, with the fields enclosed by brackets [] replaced by
825.26 * your own identifying information:
826.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/DebugServerTestWindow.java Fri Jul 16 11:47:36 2010 -0400
826.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/DebugServerTestWindow.java Fri Jul 16 14:21:50 2010 -0400
826.3 @@ -1,7 +1,10 @@
826.4 /*
826.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
826.6 *
826.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
826.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
826.9 + *
826.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
826.11 + * Other names may be trademarks of their respective owners.
826.12 *
826.13 * The contents of this file are subject to the terms of either the GNU
826.14 * General Public License Version 2 only ("GPL") or the Common
826.15 @@ -13,9 +16,9 @@
826.16 * specific language governing permissions and limitations under the
826.17 * License. When distributing the software, include this License Header
826.18 * Notice in each file and include the License file at
826.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
826.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
826.21 * particular file as subject to the "Classpath" exception as provided
826.22 - * by Sun in the GPL Version 2 section of the License file that
826.23 + * by Oracle in the GPL Version 2 section of the License file that
826.24 * accompanied this code. If applicable, add the following below the
826.25 * License Header, with the fields enclosed by brackets [] replaced by
826.26 * your own identifying information:
827.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/DebugServerThread.java Fri Jul 16 11:47:36 2010 -0400
827.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/DebugServerThread.java Fri Jul 16 14:21:50 2010 -0400
827.3 @@ -1,7 +1,10 @@
827.4 /*
827.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
827.6 *
827.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
827.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
827.9 + *
827.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
827.11 + * Other names may be trademarks of their respective owners.
827.12 *
827.13 * The contents of this file are subject to the terms of either the GNU
827.14 * General Public License Version 2 only ("GPL") or the Common
827.15 @@ -13,9 +16,9 @@
827.16 * specific language governing permissions and limitations under the
827.17 * License. When distributing the software, include this License Header
827.18 * Notice in each file and include the License file at
827.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
827.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
827.21 * particular file as subject to the "Classpath" exception as provided
827.22 - * by Sun in the GPL Version 2 section of the License file that
827.23 + * by Oracle in the GPL Version 2 section of the License file that
827.24 * accompanied this code. If applicable, add the following below the
827.25 * License Header, with the fields enclosed by brackets [] replaced by
827.26 * your own identifying information:
828.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/ErrorHandlerModuleInstaller.java Fri Jul 16 11:47:36 2010 -0400
828.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/ErrorHandlerModuleInstaller.java Fri Jul 16 14:21:50 2010 -0400
828.3 @@ -1,7 +1,10 @@
828.4 /*
828.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
828.6 *
828.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
828.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
828.9 + *
828.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
828.11 + * Other names may be trademarks of their respective owners.
828.12 *
828.13 * The contents of this file are subject to the terms of either the GNU
828.14 * General Public License Version 2 only ("GPL") or the Common
828.15 @@ -13,9 +16,9 @@
828.16 * specific language governing permissions and limitations under the
828.17 * License. When distributing the software, include this License Header
828.18 * Notice in each file and include the License file at
828.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
828.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
828.21 * particular file as subject to the "Classpath" exception as provided
828.22 - * by Sun in the GPL Version 2 section of the License file that
828.23 + * by Oracle in the GPL Version 2 section of the License file that
828.24 * accompanied this code. If applicable, add the following below the
828.25 * License Header, with the fields enclosed by brackets [] replaced by
828.26 * your own identifying information:
829.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
829.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
829.3 @@ -1,6 +1,9 @@
829.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
829.5 #
829.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
829.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
829.8 +#
829.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
829.10 +# Other names may be trademarks of their respective owners.
829.11 #
829.12 # The contents of this file are subject to the terms of either the GNU
829.13 # General Public License Version 2 only ("GPL") or the Common
829.14 @@ -12,9 +15,9 @@
829.15 # specific language governing permissions and limitations under the
829.16 # License. When distributing the software, include this License Header
829.17 # Notice in each file and include the License file at
829.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
829.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
829.20 # particular file as subject to the "Classpath" exception as provided
829.21 -# by Sun in the GPL Version 2 section of the License file that
829.22 +# by Oracle in the GPL Version 2 section of the License file that
829.23 # accompanied this code. If applicable, add the following below the
829.24 # License Header, with the fields enclosed by brackets [] replaced by
829.25 # your own identifying information:
830.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/resources/error-annotation.xml Fri Jul 16 11:47:36 2010 -0400
830.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/resources/error-annotation.xml Fri Jul 16 14:21:50 2010 -0400
830.3 @@ -2,7 +2,10 @@
830.4 <!--
830.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
830.6
830.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
830.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
830.9 +
830.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
830.11 +Other names may be trademarks of their respective owners.
830.12
830.13
830.14 The contents of this file are subject to the terms of either the GNU
830.15 @@ -15,9 +18,9 @@
830.16 specific language governing permissions and limitations under the
830.17 License. When distributing the software, include this License Header
830.18 Notice in each file and include the License file at
830.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
830.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
830.21 particular file as subject to the "Classpath" exception as provided
830.22 -by Sun in the GPL Version 2 section of the License file that
830.23 +by Oracle in the GPL Version 2 section of the License file that
830.24 accompanied this code. If applicable, add the following below the
830.25 License Header, with the fields enclosed by brackets [] replaced by
830.26 your own identifying information:
831.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/resources/mf-layer.xml Fri Jul 16 11:47:36 2010 -0400
831.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/resources/mf-layer.xml Fri Jul 16 14:21:50 2010 -0400
831.3 @@ -2,7 +2,10 @@
831.4 <!--
831.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
831.6
831.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
831.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
831.9 +
831.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
831.11 +Other names may be trademarks of their respective owners.
831.12
831.13
831.14 The contents of this file are subject to the terms of either the GNU
831.15 @@ -15,9 +18,9 @@
831.16 specific language governing permissions and limitations under the
831.17 License. When distributing the software, include this License Header
831.18 Notice in each file and include the License file at
831.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
831.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
831.21 particular file as subject to the "Classpath" exception as provided
831.22 -by Sun in the GPL Version 2 section of the License file that
831.23 +by Oracle in the GPL Version 2 section of the License file that
831.24 accompanied this code. If applicable, add the following below the
831.25 License Header, with the fields enclosed by brackets [] replaced by
831.26 your own identifying information:
832.1 --- a/visualweb.extension.openide.loaders/build.xml Fri Jul 16 11:47:36 2010 -0400
832.2 +++ b/visualweb.extension.openide.loaders/build.xml Fri Jul 16 14:21:50 2010 -0400
832.3 @@ -2,7 +2,10 @@
832.4 <!--
832.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
832.6
832.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
832.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
832.9 +
832.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
832.11 +Other names may be trademarks of their respective owners.
832.12
832.13
832.14 The contents of this file are subject to the terms of either the GNU
832.15 @@ -15,9 +18,9 @@
832.16 specific language governing permissions and limitations under the
832.17 License. When distributing the software, include this License Header
832.18 Notice in each file and include the License file at
832.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
832.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
832.21 particular file as subject to the "Classpath" exception as provided
832.22 -by Sun in the GPL Version 2 section of the License file that
832.23 +by Oracle in the GPL Version 2 section of the License file that
832.24 accompanied this code. If applicable, add the following below the
832.25 License Header, with the fields enclosed by brackets [] replaced by
832.26 your own identifying information:
833.1 --- a/visualweb.extension.openide.loaders/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
833.2 +++ b/visualweb.extension.openide.loaders/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
833.3 @@ -2,7 +2,10 @@
833.4 <!--
833.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
833.6
833.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
833.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
833.9 +
833.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
833.11 +Other names may be trademarks of their respective owners.
833.12
833.13
833.14 The contents of this file are subject to the terms of either the GNU
833.15 @@ -15,9 +18,9 @@
833.16 specific language governing permissions and limitations under the
833.17 License. When distributing the software, include this License Header
833.18 Notice in each file and include the License file at
833.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
833.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
833.21 particular file as subject to the "Classpath" exception as provided
833.22 -by Sun in the GPL Version 2 section of the License file that
833.23 +by Oracle in the GPL Version 2 section of the License file that
833.24 accompanied this code. If applicable, add the following below the
833.25 License Header, with the fields enclosed by brackets [] replaced by
833.26 your own identifying information:
833.27 @@ -75,7 +78,15 @@
833.28 <build-prerequisite/>
833.29 <compile-dependency/>
833.30 <run-dependency>
833.31 - <specification-version>6.8.1</specification-version>
833.32 + <specification-version>8.0</specification-version>
833.33 + </run-dependency>
833.34 + </dependency>
833.35 + <dependency>
833.36 + <code-name-base>org.openide.util.lookup</code-name-base>
833.37 + <build-prerequisite/>
833.38 + <compile-dependency/>
833.39 + <run-dependency>
833.40 + <specification-version>8.0</specification-version>
833.41 </run-dependency>
833.42 </dependency>
833.43 </module-dependencies>
834.1 --- a/visualweb.extension.openide.loaders/src/org/netbeans/modules/visualweb/extension/openide/loaders/SystemFileSystemSupport.java Fri Jul 16 11:47:36 2010 -0400
834.2 +++ b/visualweb.extension.openide.loaders/src/org/netbeans/modules/visualweb/extension/openide/loaders/SystemFileSystemSupport.java Fri Jul 16 14:21:50 2010 -0400
834.3 @@ -1,7 +1,10 @@
834.4 /*
834.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
834.6 *
834.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
834.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
834.9 + *
834.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
834.11 + * Other names may be trademarks of their respective owners.
834.12 *
834.13 * The contents of this file are subject to the terms of either the GNU
834.14 * General Public License Version 2 only ("GPL") or the Common
834.15 @@ -13,9 +16,9 @@
834.16 * specific language governing permissions and limitations under the
834.17 * License. When distributing the software, include this License Header
834.18 * Notice in each file and include the License file at
834.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
834.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
834.21 * particular file as subject to the "Classpath" exception as provided
834.22 - * by Sun in the GPL Version 2 section of the License file that
834.23 + * by Oracle in the GPL Version 2 section of the License file that
834.24 * accompanied this code. If applicable, add the following below the
834.25 * License Header, with the fields enclosed by brackets [] replaced by
834.26 * your own identifying information:
835.1 --- a/visualweb.extension.openide.loaders/src/org/netbeans/modules/visualweb/extension/openide/loaders/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
835.2 +++ b/visualweb.extension.openide.loaders/src/org/netbeans/modules/visualweb/extension/openide/loaders/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
835.3 @@ -1,6 +1,9 @@
835.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
835.5 #
835.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
835.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
835.8 +#
835.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
835.10 +# Other names may be trademarks of their respective owners.
835.11 #
835.12 # The contents of this file are subject to the terms of either the GNU
835.13 # General Public License Version 2 only ("GPL") or the Common
835.14 @@ -12,9 +15,9 @@
835.15 # specific language governing permissions and limitations under the
835.16 # License. When distributing the software, include this License Header
835.17 # Notice in each file and include the License file at
835.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
835.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
835.20 # particular file as subject to the "Classpath" exception as provided
835.21 -# by Sun in the GPL Version 2 section of the License file that
835.22 +# by Oracle in the GPL Version 2 section of the License file that
835.23 # accompanied this code. If applicable, add the following below the
835.24 # License Header, with the fields enclosed by brackets [] replaced by
835.25 # your own identifying information:
836.1 --- a/visualweb.extension.openide/build.xml Fri Jul 16 11:47:36 2010 -0400
836.2 +++ b/visualweb.extension.openide/build.xml Fri Jul 16 14:21:50 2010 -0400
836.3 @@ -2,7 +2,10 @@
836.4 <!--
836.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
836.6
836.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
836.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
836.9 +
836.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
836.11 +Other names may be trademarks of their respective owners.
836.12
836.13
836.14 The contents of this file are subject to the terms of either the GNU
836.15 @@ -15,9 +18,9 @@
836.16 specific language governing permissions and limitations under the
836.17 License. When distributing the software, include this License Header
836.18 Notice in each file and include the License file at
836.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
836.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
836.21 particular file as subject to the "Classpath" exception as provided
836.22 -by Sun in the GPL Version 2 section of the License file that
836.23 +by Oracle in the GPL Version 2 section of the License file that
836.24 accompanied this code. If applicable, add the following below the
836.25 License Header, with the fields enclosed by brackets [] replaced by
836.26 your own identifying information:
837.1 --- a/visualweb.extension.openide/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
837.2 +++ b/visualweb.extension.openide/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
837.3 @@ -1,6 +1,9 @@
837.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
837.5 #
837.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
837.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
837.8 +#
837.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
837.10 +# Other names may be trademarks of their respective owners.
837.11 #
837.12 # The contents of this file are subject to the terms of either the GNU
837.13 # General Public License Version 2 only ("GPL") or the Common
837.14 @@ -12,9 +15,9 @@
837.15 # specific language governing permissions and limitations under the
837.16 # License. When distributing the software, include this License Header
837.17 # Notice in each file and include the License file at
837.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
837.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
837.20 # particular file as subject to the "Classpath" exception as provided
837.21 -# by Sun in the GPL Version 2 section of the License file that
837.22 +# by Oracle in the GPL Version 2 section of the License file that
837.23 # accompanied this code. If applicable, add the following below the
837.24 # License Header, with the fields enclosed by brackets [] replaced by
837.25 # your own identifying information:
838.1 --- a/visualweb.extension.openide/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
838.2 +++ b/visualweb.extension.openide/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
838.3 @@ -2,7 +2,10 @@
838.4 <!--
838.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
838.6
838.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
838.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
838.9 +
838.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
838.11 +Other names may be trademarks of their respective owners.
838.12
838.13
838.14 The contents of this file are subject to the terms of either the GNU
838.15 @@ -15,9 +18,9 @@
838.16 specific language governing permissions and limitations under the
838.17 License. When distributing the software, include this License Header
838.18 Notice in each file and include the License file at
838.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
838.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
838.21 particular file as subject to the "Classpath" exception as provided
838.22 -by Sun in the GPL Version 2 section of the License file that
838.23 +by Oracle in the GPL Version 2 section of the License file that
838.24 accompanied this code. If applicable, add the following below the
838.25 License Header, with the fields enclosed by brackets [] replaced by
838.26 your own identifying information:
838.27 @@ -75,7 +78,15 @@
838.28 <build-prerequisite/>
838.29 <compile-dependency/>
838.30 <run-dependency>
838.31 - <specification-version>6.8.2</specification-version>
838.32 + <specification-version>8.0</specification-version>
838.33 + </run-dependency>
838.34 + </dependency>
838.35 + <dependency>
838.36 + <code-name-base>org.openide.util.lookup</code-name-base>
838.37 + <build-prerequisite/>
838.38 + <compile-dependency/>
838.39 + <run-dependency>
838.40 + <specification-version>8.0</specification-version>
838.41 </run-dependency>
838.42 </dependency>
838.43 <dependency>
839.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
839.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
839.3 @@ -1,6 +1,9 @@
839.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
839.5 #
839.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
839.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
839.8 +#
839.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
839.10 +# Other names may be trademarks of their respective owners.
839.11 #
839.12 # The contents of this file are subject to the terms of either the GNU
839.13 # General Public License Version 2 only ("GPL") or the Common
839.14 @@ -12,9 +15,9 @@
839.15 # specific language governing permissions and limitations under the
839.16 # License. When distributing the software, include this License Header
839.17 # Notice in each file and include the License file at
839.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
839.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
839.20 # particular file as subject to the "Classpath" exception as provided
839.21 -# by Sun in the GPL Version 2 section of the License file that
839.22 +# by Oracle in the GPL Version 2 section of the License file that
839.23 # accompanied this code. If applicable, add the following below the
839.24 # License Header, with the fields enclosed by brackets [] replaced by
839.25 # your own identifying information:
840.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/awt/JFileChooser_RAVE.java Fri Jul 16 11:47:36 2010 -0400
840.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/awt/JFileChooser_RAVE.java Fri Jul 16 14:21:50 2010 -0400
840.3 @@ -1,7 +1,10 @@
840.4 /*
840.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
840.6 *
840.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
840.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
840.9 + *
840.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
840.11 + * Other names may be trademarks of their respective owners.
840.12 *
840.13 * The contents of this file are subject to the terms of either the GNU
840.14 * General Public License Version 2 only ("GPL") or the Common
840.15 @@ -13,9 +16,9 @@
840.16 * specific language governing permissions and limitations under the
840.17 * License. When distributing the software, include this License Header
840.18 * Notice in each file and include the License file at
840.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
840.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
840.21 * particular file as subject to the "Classpath" exception as provided
840.22 - * by Sun in the GPL Version 2 section of the License file that
840.23 + * by Oracle in the GPL Version 2 section of the License file that
840.24 * accompanied this code. If applicable, add the following below the
840.25 * License Header, with the fields enclosed by brackets [] replaced by
840.26 * your own identifying information:
841.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/awt/MouseUtils_RAVE.java Fri Jul 16 11:47:36 2010 -0400
841.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/awt/MouseUtils_RAVE.java Fri Jul 16 14:21:50 2010 -0400
841.3 @@ -1,7 +1,10 @@
841.4 /*
841.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
841.6 *
841.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
841.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
841.9 + *
841.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
841.11 + * Other names may be trademarks of their respective owners.
841.12 *
841.13 * The contents of this file are subject to the terms of either the GNU
841.14 * General Public License Version 2 only ("GPL") or the Common
841.15 @@ -13,9 +16,9 @@
841.16 * specific language governing permissions and limitations under the
841.17 * License. When distributing the software, include this License Header
841.18 * Notice in each file and include the License file at
841.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
841.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
841.21 * particular file as subject to the "Classpath" exception as provided
841.22 - * by Sun in the GPL Version 2 section of the License file that
841.23 + * by Oracle in the GPL Version 2 section of the License file that
841.24 * accompanied this code. If applicable, add the following below the
841.25 * License Header, with the fields enclosed by brackets [] replaced by
841.26 * your own identifying information:
842.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/awt/StatusDisplayer_RAVE.java Fri Jul 16 11:47:36 2010 -0400
842.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/awt/StatusDisplayer_RAVE.java Fri Jul 16 14:21:50 2010 -0400
842.3 @@ -1,7 +1,10 @@
842.4 /*
842.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
842.6 *
842.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
842.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
842.9 + *
842.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
842.11 + * Other names may be trademarks of their respective owners.
842.12 *
842.13 * The contents of this file are subject to the terms of either the GNU
842.14 * General Public License Version 2 only ("GPL") or the Common
842.15 @@ -13,9 +16,9 @@
842.16 * specific language governing permissions and limitations under the
842.17 * License. When distributing the software, include this License Header
842.18 * Notice in each file and include the License file at
842.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
842.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
842.21 * particular file as subject to the "Classpath" exception as provided
842.22 - * by Sun in the GPL Version 2 section of the License file that
842.23 + * by Oracle in the GPL Version 2 section of the License file that
842.24 * accompanied this code. If applicable, add the following below the
842.25 * License Header, with the fields enclosed by brackets [] replaced by
842.26 * your own identifying information:
843.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/cookies/RavePaletteItemSetCookie.java Fri Jul 16 11:47:36 2010 -0400
843.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/cookies/RavePaletteItemSetCookie.java Fri Jul 16 14:21:50 2010 -0400
843.3 @@ -1,7 +1,10 @@
843.4 /*
843.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
843.6 *
843.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
843.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
843.9 + *
843.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
843.11 + * Other names may be trademarks of their respective owners.
843.12 *
843.13 * The contents of this file are subject to the terms of either the GNU
843.14 * General Public License Version 2 only ("GPL") or the Common
843.15 @@ -13,9 +16,9 @@
843.16 * specific language governing permissions and limitations under the
843.17 * License. When distributing the software, include this License Header
843.18 * Notice in each file and include the License file at
843.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
843.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
843.21 * particular file as subject to the "Classpath" exception as provided
843.22 - * by Sun in the GPL Version 2 section of the License file that
843.23 + * by Oracle in the GPL Version 2 section of the License file that
843.24 * accompanied this code. If applicable, add the following below the
843.25 * License Header, with the fields enclosed by brackets [] replaced by
843.26 * your own identifying information:
844.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/io/RaveFileCopy.java Fri Jul 16 11:47:36 2010 -0400
844.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/io/RaveFileCopy.java Fri Jul 16 14:21:50 2010 -0400
844.3 @@ -1,7 +1,10 @@
844.4 /*
844.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
844.6 *
844.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
844.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
844.9 + *
844.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
844.11 + * Other names may be trademarks of their respective owners.
844.12 *
844.13 * The contents of this file are subject to the terms of either the GNU
844.14 * General Public License Version 2 only ("GPL") or the Common
844.15 @@ -13,9 +16,9 @@
844.16 * specific language governing permissions and limitations under the
844.17 * License. When distributing the software, include this License Header
844.18 * Notice in each file and include the License file at
844.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
844.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
844.21 * particular file as subject to the "Classpath" exception as provided
844.22 - * by Sun in the GPL Version 2 section of the License file that
844.23 + * by Oracle in the GPL Version 2 section of the License file that
844.24 * accompanied this code. If applicable, add the following below the
844.25 * License Header, with the fields enclosed by brackets [] replaced by
844.26 * your own identifying information:
845.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/text/RaveDnDSupportFactory.java Fri Jul 16 11:47:36 2010 -0400
845.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/text/RaveDnDSupportFactory.java Fri Jul 16 14:21:50 2010 -0400
845.3 @@ -1,7 +1,10 @@
845.4 /*
845.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
845.6 *
845.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
845.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
845.9 + *
845.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
845.11 + * Other names may be trademarks of their respective owners.
845.12 *
845.13 * The contents of this file are subject to the terms of either the GNU
845.14 * General Public License Version 2 only ("GPL") or the Common
845.15 @@ -13,9 +16,9 @@
845.16 * specific language governing permissions and limitations under the
845.17 * License. When distributing the software, include this License Header
845.18 * Notice in each file and include the License file at
845.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
845.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
845.21 * particular file as subject to the "Classpath" exception as provided
845.22 - * by Sun in the GPL Version 2 section of the License file that
845.23 + * by Oracle in the GPL Version 2 section of the License file that
845.24 * accompanied this code. If applicable, add the following below the
845.25 * License Header, with the fields enclosed by brackets [] replaced by
845.26 * your own identifying information:
846.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/text/TextDropTargetListener.java Fri Jul 16 11:47:36 2010 -0400
846.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/text/TextDropTargetListener.java Fri Jul 16 14:21:50 2010 -0400
846.3 @@ -1,7 +1,10 @@
846.4 /*
846.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
846.6 *
846.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
846.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
846.9 + *
846.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
846.11 + * Other names may be trademarks of their respective owners.
846.12 *
846.13 * The contents of this file are subject to the terms of either the GNU
846.14 * General Public License Version 2 only ("GPL") or the Common
846.15 @@ -13,9 +16,9 @@
846.16 * specific language governing permissions and limitations under the
846.17 * License. When distributing the software, include this License Header
846.18 * Notice in each file and include the License file at
846.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
846.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
846.21 * particular file as subject to the "Classpath" exception as provided
846.22 - * by Sun in the GPL Version 2 section of the License file that
846.23 + * by Oracle in the GPL Version 2 section of the License file that
846.24 * accompanied this code. If applicable, add the following below the
846.25 * License Header, with the fields enclosed by brackets [] replaced by
846.26 * your own identifying information:
847.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/text/TextTransferHandler.java Fri Jul 16 11:47:36 2010 -0400
847.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/text/TextTransferHandler.java Fri Jul 16 14:21:50 2010 -0400
847.3 @@ -1,7 +1,10 @@
847.4 /*
847.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
847.6 *
847.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
847.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
847.9 + *
847.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
847.11 + * Other names may be trademarks of their respective owners.
847.12 *
847.13 * The contents of this file are subject to the terms of either the GNU
847.14 * General Public License Version 2 only ("GPL") or the Common
847.15 @@ -13,9 +16,9 @@
847.16 * specific language governing permissions and limitations under the
847.17 * License. When distributing the software, include this License Header
847.18 * Notice in each file and include the License file at
847.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
847.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
847.21 * particular file as subject to the "Classpath" exception as provided
847.22 - * by Sun in the GPL Version 2 section of the License file that
847.23 + * by Oracle in the GPL Version 2 section of the License file that
847.24 * accompanied this code. If applicable, add the following below the
847.25 * License Header, with the fields enclosed by brackets [] replaced by
847.26 * your own identifying information:
848.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/Trace.java Fri Jul 16 11:47:36 2010 -0400
848.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/Trace.java Fri Jul 16 14:21:50 2010 -0400
848.3 @@ -1,7 +1,10 @@
848.4 /*
848.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
848.6 *
848.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
848.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
848.9 + *
848.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
848.11 + * Other names may be trademarks of their respective owners.
848.12 *
848.13 * The contents of this file are subject to the terms of either the GNU
848.14 * General Public License Version 2 only ("GPL") or the Common
848.15 @@ -13,9 +16,9 @@
848.16 * specific language governing permissions and limitations under the
848.17 * License. When distributing the software, include this License Header
848.18 * Notice in each file and include the License file at
848.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
848.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
848.21 * particular file as subject to the "Classpath" exception as provided
848.22 - * by Sun in the GPL Version 2 section of the License file that
848.23 + * by Oracle in the GPL Version 2 section of the License file that
848.24 * accompanied this code. If applicable, add the following below the
848.25 * License Header, with the fields enclosed by brackets [] replaced by
848.26 * your own identifying information:
849.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/TraceBase.java Fri Jul 16 11:47:36 2010 -0400
849.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/TraceBase.java Fri Jul 16 14:21:50 2010 -0400
849.3 @@ -1,7 +1,10 @@
849.4 /*
849.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
849.6 *
849.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
849.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
849.9 + *
849.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
849.11 + * Other names may be trademarks of their respective owners.
849.12 *
849.13 * The contents of this file are subject to the terms of either the GNU
849.14 * General Public License Version 2 only ("GPL") or the Common
849.15 @@ -13,9 +16,9 @@
849.16 * specific language governing permissions and limitations under the
849.17 * License. When distributing the software, include this License Header
849.18 * Notice in each file and include the License file at
849.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
849.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
849.21 * particular file as subject to the "Classpath" exception as provided
849.22 - * by Sun in the GPL Version 2 section of the License file that
849.23 + * by Oracle in the GPL Version 2 section of the License file that
849.24 * accompanied this code. If applicable, add the following below the
849.25 * License Header, with the fields enclosed by brackets [] replaced by
849.26 * your own identifying information:
850.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/TraceBase_OFF.javax Fri Jul 16 11:47:36 2010 -0400
850.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/TraceBase_OFF.javax Fri Jul 16 14:21:50 2010 -0400
850.3 @@ -1,7 +1,10 @@
850.4 /*
850.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
850.6 *
850.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
850.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
850.9 + *
850.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
850.11 + * Other names may be trademarks of their respective owners.
850.12 *
850.13 * The contents of this file are subject to the terms of either the GNU
850.14 * General Public License Version 2 only ("GPL") or the Common
850.15 @@ -13,9 +16,9 @@
850.16 * specific language governing permissions and limitations under the
850.17 * License. When distributing the software, include this License Header
850.18 * Notice in each file and include the License file at
850.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
850.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
850.21 * particular file as subject to the "Classpath" exception as provided
850.22 - * by Sun in the GPL Version 2 section of the License file that
850.23 + * by Oracle in the GPL Version 2 section of the License file that
850.24 * accompanied this code. If applicable, add the following below the
850.25 * License Header, with the fields enclosed by brackets [] replaced by
850.26 * your own identifying information:
851.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/TraceBase_ON.javax Fri Jul 16 11:47:36 2010 -0400
851.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/TraceBase_ON.javax Fri Jul 16 14:21:50 2010 -0400
851.3 @@ -1,7 +1,10 @@
851.4 /*
851.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
851.6 *
851.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
851.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
851.9 + *
851.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
851.11 + * Other names may be trademarks of their respective owners.
851.12 *
851.13 * The contents of this file are subject to the terms of either the GNU
851.14 * General Public License Version 2 only ("GPL") or the Common
851.15 @@ -13,9 +16,9 @@
851.16 * specific language governing permissions and limitations under the
851.17 * License. When distributing the software, include this License Header
851.18 * Notice in each file and include the License file at
851.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
851.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
851.21 * particular file as subject to the "Classpath" exception as provided
851.22 - * by Sun in the GPL Version 2 section of the License file that
851.23 + * by Oracle in the GPL Version 2 section of the License file that
851.24 * accompanied this code. If applicable, add the following below the
851.25 * License Header, with the fields enclosed by brackets [] replaced by
851.26 * your own identifying information:
852.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/TraceUI.java Fri Jul 16 11:47:36 2010 -0400
852.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/TraceUI.java Fri Jul 16 14:21:50 2010 -0400
852.3 @@ -1,7 +1,10 @@
852.4 /*
852.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
852.6 *
852.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
852.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
852.9 + *
852.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
852.11 + * Other names may be trademarks of their respective owners.
852.12 *
852.13 * The contents of this file are subject to the terms of either the GNU
852.14 * General Public License Version 2 only ("GPL") or the Common
852.15 @@ -13,9 +16,9 @@
852.16 * specific language governing permissions and limitations under the
852.17 * License. When distributing the software, include this License Header
852.18 * Notice in each file and include the License file at
852.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
852.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
852.21 * particular file as subject to the "Classpath" exception as provided
852.22 - * by Sun in the GPL Version 2 section of the License file that
852.23 + * by Oracle in the GPL Version 2 section of the License file that
852.24 * accompanied this code. If applicable, add the following below the
852.25 * License Header, with the fields enclosed by brackets [] replaced by
852.26 * your own identifying information:
853.1 --- a/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/Utilities_RAVE.java Fri Jul 16 11:47:36 2010 -0400
853.2 +++ b/visualweb.extension.openide/src/org/netbeans/modules/visualweb/extension/openide/util/Utilities_RAVE.java Fri Jul 16 14:21:50 2010 -0400
853.3 @@ -1,7 +1,10 @@
853.4 /*
853.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
853.6 *
853.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
853.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
853.9 + *
853.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
853.11 + * Other names may be trademarks of their respective owners.
853.12 *
853.13 * The contents of this file are subject to the terms of either the GNU
853.14 * General Public License Version 2 only ("GPL") or the Common
853.15 @@ -13,9 +16,9 @@
853.16 * specific language governing permissions and limitations under the
853.17 * License. When distributing the software, include this License Header
853.18 * Notice in each file and include the License file at
853.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
853.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
853.21 * particular file as subject to the "Classpath" exception as provided
853.22 - * by Sun in the GPL Version 2 section of the License file that
853.23 + * by Oracle in the GPL Version 2 section of the License file that
853.24 * accompanied this code. If applicable, add the following below the
853.25 * License Header, with the fields enclosed by brackets [] replaced by
853.26 * your own identifying information:
854.1 --- a/visualweb.gravy/build.xml Fri Jul 16 11:47:36 2010 -0400
854.2 +++ b/visualweb.gravy/build.xml Fri Jul 16 14:21:50 2010 -0400
854.3 @@ -2,7 +2,10 @@
854.4 <!--
854.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
854.6
854.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
854.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
854.9 +
854.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
854.11 +Other names may be trademarks of their respective owners.
854.12
854.13
854.14 The contents of this file are subject to the terms of either the GNU
854.15 @@ -15,7 +18,7 @@
854.16 specific language governing permissions and limitations under the
854.17 License. When distributing the software, include this License Header
854.18 Notice in each file and include the License file at
854.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
854.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
854.21 particular file as subject to the "Classpath" exception as provided
854.22 by Sun in the GPL Version 2 section of the License file that
854.23 accompanied this code. If applicable, add the following below the
855.1 --- a/visualweb.gravy/manifest.mf Fri Jul 16 11:47:36 2010 -0400
855.2 +++ b/visualweb.gravy/manifest.mf Fri Jul 16 14:21:50 2010 -0400
855.3 @@ -1,6 +1,6 @@
855.4 Manifest-Version: 1.0
855.5 OpenIDE-Module: org.netbeans.modules.visualweb.gravy
855.6 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/visualweb/gravy/Bundle.properties
855.7 -OpenIDE-Module-Specification-Version: 1.4
855.8 +OpenIDE-Module-Specification-Version: 1.5
855.9 AutoUpdate-Show-In-Client: false
855.10
856.1 --- a/visualweb.gravy/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
856.2 +++ b/visualweb.gravy/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
856.3 @@ -1,6 +1,9 @@
856.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
856.5 #
856.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
856.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
856.8 +#
856.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
856.10 +# Other names may be trademarks of their respective owners.
856.11 #
856.12 # The contents of this file are subject to the terms of either the GNU
856.13 # General Public License Version 2 only ("GPL") or the Common
856.14 @@ -12,7 +15,7 @@
856.15 # specific language governing permissions and limitations under the
856.16 # License. When distributing the software, include this License Header
856.17 # Notice in each file and include the License file at
856.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
856.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
856.20 # particular file as subject to the "Classpath" exception as provided
856.21 # by Sun in the GPL Version 2 section of the License file that
856.22 # accompanied this code. If applicable, add the following below the
856.23 @@ -38,5 +41,5 @@
856.24 # made subject to such option by the copyright holder.
856.25
856.26 is.autoload=true
856.27 -javac.source=1.5
856.28 +javac.source=1.6
856.29 javac.compilerargs=-Xlint -Xlint:-serial
857.1 --- a/visualweb.gravy/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
857.2 +++ b/visualweb.gravy/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
857.3 @@ -2,7 +2,10 @@
857.4 <!--
857.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
857.6
857.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
857.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
857.9 +
857.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
857.11 +Other names may be trademarks of their respective owners.
857.12
857.13
857.14 The contents of this file are subject to the terms of either the GNU
857.15 @@ -15,7 +18,7 @@
857.16 specific language governing permissions and limitations under the
857.17 License. When distributing the software, include this License Header
857.18 Notice in each file and include the License file at
857.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
857.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
857.21 particular file as subject to the "Classpath" exception as provided
857.22 by Sun in the GPL Version 2 section of the License file that
857.23 accompanied this code. If applicable, add the following below the
857.24 @@ -86,8 +89,8 @@
857.25 <build-prerequisite/>
857.26 <compile-dependency/>
857.27 <run-dependency>
857.28 - <release-version>1</release-version>
857.29 - <specification-version>1.27</specification-version>
857.30 + <release-version>2</release-version>
857.31 + <specification-version>2.1</specification-version>
857.32 </run-dependency>
857.33 </dependency>
857.34 <dependency>
857.35 @@ -288,7 +291,15 @@
857.36 <build-prerequisite/>
857.37 <compile-dependency/>
857.38 <run-dependency>
857.39 - <specification-version>7.15</specification-version>
857.40 + <specification-version>8.0</specification-version>
857.41 + </run-dependency>
857.42 + </dependency>
857.43 + <dependency>
857.44 + <code-name-base>org.openide.util.lookup</code-name-base>
857.45 + <build-prerequisite/>
857.46 + <compile-dependency/>
857.47 + <run-dependency>
857.48 + <specification-version>8.0</specification-version>
857.49 </run-dependency>
857.50 </dependency>
857.51 <dependency>
858.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Action.java Fri Jul 16 11:47:36 2010 -0400
858.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Action.java Fri Jul 16 14:21:50 2010 -0400
858.3 @@ -1,7 +1,10 @@
858.4 /*
858.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
858.6 *
858.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
858.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
858.9 + *
858.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
858.11 + * Other names may be trademarks of their respective owners.
858.12 *
858.13 * The contents of this file are subject to the terms of either the GNU
858.14 * General Public License Version 2 only ("GPL") or the Common
858.15 @@ -13,9 +16,9 @@
858.16 * specific language governing permissions and limitations under the
858.17 * License. When distributing the software, include this License Header
858.18 * Notice in each file and include the License file at
858.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
858.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
858.21 * particular file as subject to the "Classpath" exception as provided
858.22 - * by Sun in the GPL Version 2 section of the License file that
858.23 + * by Oracle in the GPL Version 2 section of the License file that
858.24 * accompanied this code. If applicable, add the following below the
858.25 * License Header, with the fields enclosed by brackets [] replaced by
858.26 * your own identifying information:
859.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Bundle.java Fri Jul 16 11:47:36 2010 -0400
859.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Bundle.java Fri Jul 16 14:21:50 2010 -0400
859.3 @@ -1,7 +1,10 @@
859.4 /*
859.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
859.6 *
859.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
859.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
859.9 + *
859.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
859.11 + * Other names may be trademarks of their respective owners.
859.12 *
859.13 * The contents of this file are subject to the terms of either the GNU
859.14 * General Public License Version 2 only ("GPL") or the Common
859.15 @@ -13,9 +16,9 @@
859.16 * specific language governing permissions and limitations under the
859.17 * License. When distributing the software, include this License Header
859.18 * Notice in each file and include the License file at
859.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
859.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
859.21 * particular file as subject to the "Classpath" exception as provided
859.22 - * by Sun in the GPL Version 2 section of the License file that
859.23 + * by Oracle in the GPL Version 2 section of the License file that
859.24 * accompanied this code. If applicable, add the following below the
859.25 * License Header, with the fields enclosed by brackets [] replaced by
859.26 * your own identifying information:
860.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
860.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
860.3 @@ -1,6 +1,9 @@
860.4 #DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
860.5 #
860.6 -#Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
860.7 +#Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
860.8 +#
860.9 +#Oracle and Java are registered trademarks of Oracle and/or its affiliates.
860.10 +#Other names may be trademarks of their respective owners.
860.11 #
860.12 #The contents of this file are subject to the terms of either the GNU
860.13 #General Public License Version 2 only ("GPL") or the Common
860.14 @@ -12,9 +15,9 @@
860.15 #specific language governing permissions and limitations under the
860.16 #License. When distributing the software, include this License Header
860.17 #Notice in each file and include the License file at
860.18 -#nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
860.19 +#nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
860.20 #particular file as subject to the "Classpath" exception as provided
860.21 -#by Sun in the GPL Version 2 section of the License file that
860.22 +#by Oracle in the GPL Version 2 section of the License file that
860.23 #accompanied this code. If applicable, add the following below the
860.24 #License Header, with the fields enclosed by brackets [] replaced by
860.25 #your own identifying information:
861.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/CompletionPaneOperator.java Fri Jul 16 11:47:36 2010 -0400
861.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/CompletionPaneOperator.java Fri Jul 16 14:21:50 2010 -0400
861.3 @@ -1,7 +1,10 @@
861.4 /*
861.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
861.6 *
861.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
861.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
861.9 + *
861.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
861.11 + * Other names may be trademarks of their respective owners.
861.12 *
861.13 * The contents of this file are subject to the terms of either the GNU
861.14 * General Public License Version 2 only ("GPL") or the Common
861.15 @@ -13,9 +16,9 @@
861.16 * specific language governing permissions and limitations under the
861.17 * License. When distributing the software, include this License Header
861.18 * Notice in each file and include the License file at
861.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
861.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
861.21 * particular file as subject to the "Classpath" exception as provided
861.22 - * by Sun in the GPL Version 2 section of the License file that
861.23 + * by Oracle in the GPL Version 2 section of the License file that
861.24 * accompanied this code. If applicable, add the following below the
861.25 * License Header, with the fields enclosed by brackets [] replaced by
861.26 * your own identifying information:
862.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/DNDDriver.java Fri Jul 16 11:47:36 2010 -0400
862.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/DNDDriver.java Fri Jul 16 14:21:50 2010 -0400
862.3 @@ -1,7 +1,10 @@
862.4 /*
862.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
862.6 *
862.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
862.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
862.9 +*
862.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
862.11 +* Other names may be trademarks of their respective owners.
862.12 *
862.13 * The contents of this file are subject to the terms of either the GNU
862.14 * General Public License Version 2 only ("GPL") or the Common
862.15 @@ -13,9 +16,9 @@
862.16 * specific language governing permissions and limitations under the
862.17 * License. When distributing the software, include this License Header
862.18 * Notice in each file and include the License file at
862.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
862.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
862.21 * particular file as subject to the "Classpath" exception as provided
862.22 -* by Sun in the GPL Version 2 section of the License file that
862.23 +* by Oracle in the GPL Version 2 section of the License file that
862.24 * accompanied this code. If applicable, add the following below the
862.25 * License Header, with the fields enclosed by brackets [] replaced by
862.26 * your own identifying information:
863.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/DeploymentDialogOperator.java Fri Jul 16 11:47:36 2010 -0400
863.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/DeploymentDialogOperator.java Fri Jul 16 14:21:50 2010 -0400
863.3 @@ -1,7 +1,10 @@
863.4 /*
863.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
863.6 *
863.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
863.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
863.9 + *
863.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
863.11 + * Other names may be trademarks of their respective owners.
863.12 *
863.13 * The contents of this file are subject to the terms of either the GNU
863.14 * General Public License Version 2 only ("GPL") or the Common
863.15 @@ -13,9 +16,9 @@
863.16 * specific language governing permissions and limitations under the
863.17 * License. When distributing the software, include this License Header
863.18 * Notice in each file and include the License file at
863.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
863.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
863.21 * particular file as subject to the "Classpath" exception as provided
863.22 - * by Sun in the GPL Version 2 section of the License file that
863.23 + * by Oracle in the GPL Version 2 section of the License file that
863.24 * accompanied this code. If applicable, add the following below the
863.25 * License Header, with the fields enclosed by brackets [] replaced by
863.26 * your own identifying information:
864.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/DeploymentUtils.java Fri Jul 16 11:47:36 2010 -0400
864.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/DeploymentUtils.java Fri Jul 16 14:21:50 2010 -0400
864.3 @@ -1,7 +1,10 @@
864.4 /*
864.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
864.6 *
864.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
864.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
864.9 + *
864.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
864.11 + * Other names may be trademarks of their respective owners.
864.12 *
864.13 * The contents of this file are subject to the terms of either the GNU
864.14 * General Public License Version 2 only ("GPL") or the Common
864.15 @@ -13,9 +16,9 @@
864.16 * specific language governing permissions and limitations under the
864.17 * License. When distributing the software, include this License Header
864.18 * Notice in each file and include the License file at
864.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
864.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
864.21 * particular file as subject to the "Classpath" exception as provided
864.22 - * by Sun in the GPL Version 2 section of the License file that
864.23 + * by Oracle in the GPL Version 2 section of the License file that
864.24 * accompanied this code. If applicable, add the following below the
864.25 * License Header, with the fields enclosed by brackets [] replaced by
864.26 * your own identifying information:
865.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/DocumentOutlineOperator.java Fri Jul 16 11:47:36 2010 -0400
865.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/DocumentOutlineOperator.java Fri Jul 16 14:21:50 2010 -0400
865.3 @@ -1,7 +1,10 @@
865.4 /*
865.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
865.6 *
865.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
865.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
865.9 + *
865.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
865.11 + * Other names may be trademarks of their respective owners.
865.12 *
865.13 * The contents of this file are subject to the terms of either the GNU
865.14 * General Public License Version 2 only ("GPL") or the Common
865.15 @@ -13,9 +16,9 @@
865.16 * specific language governing permissions and limitations under the
865.17 * License. When distributing the software, include this License Header
865.18 * Notice in each file and include the License file at
865.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
865.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
865.21 * particular file as subject to the "Classpath" exception as provided
865.22 - * by Sun in the GPL Version 2 section of the License file that
865.23 + * by Oracle in the GPL Version 2 section of the License file that
865.24 * accompanied this code. If applicable, add the following below the
865.25 * License Header, with the fields enclosed by brackets [] replaced by
865.26 * your own identifying information:
866.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/EditorOperator.java Fri Jul 16 11:47:36 2010 -0400
866.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/EditorOperator.java Fri Jul 16 14:21:50 2010 -0400
866.3 @@ -1,7 +1,10 @@
866.4 /*
866.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
866.6 *
866.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
866.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
866.9 + *
866.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
866.11 + * Other names may be trademarks of their respective owners.
866.12 *
866.13 * The contents of this file are subject to the terms of either the GNU
866.14 * General Public License Version 2 only ("GPL") or the Common
866.15 @@ -13,9 +16,9 @@
866.16 * specific language governing permissions and limitations under the
866.17 * License. When distributing the software, include this License Header
866.18 * Notice in each file and include the License file at
866.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
866.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
866.21 * particular file as subject to the "Classpath" exception as provided
866.22 - * by Sun in the GPL Version 2 section of the License file that
866.23 + * by Oracle in the GPL Version 2 section of the License file that
866.24 * accompanied this code. If applicable, add the following below the
866.25 * License Header, with the fields enclosed by brackets [] replaced by
866.26 * your own identifying information:
867.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Flasher.java Fri Jul 16 11:47:36 2010 -0400
867.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Flasher.java Fri Jul 16 14:21:50 2010 -0400
867.3 @@ -1,7 +1,10 @@
867.4 /*
867.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
867.6 *
867.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
867.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
867.9 + *
867.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
867.11 + * Other names may be trademarks of their respective owners.
867.12 *
867.13 * The contents of this file are subject to the terms of either the GNU
867.14 * General Public License Version 2 only ("GPL") or the Common
867.15 @@ -13,9 +16,9 @@
867.16 * specific language governing permissions and limitations under the
867.17 * License. When distributing the software, include this License Header
867.18 * Notice in each file and include the License file at
867.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
867.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
867.21 * particular file as subject to the "Classpath" exception as provided
867.22 - * by Sun in the GPL Version 2 section of the License file that
867.23 + * by Oracle in the GPL Version 2 section of the License file that
867.24 * accompanied this code. If applicable, add the following below the
867.25 * License Header, with the fields enclosed by brackets [] replaced by
867.26 * your own identifying information:
868.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/HelpOperator.java Fri Jul 16 11:47:36 2010 -0400
868.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/HelpOperator.java Fri Jul 16 14:21:50 2010 -0400
868.3 @@ -1,7 +1,10 @@
868.4 /*
868.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
868.6 *
868.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
868.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
868.9 + *
868.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
868.11 + * Other names may be trademarks of their respective owners.
868.12 *
868.13 * The contents of this file are subject to the terms of either the GNU
868.14 * General Public License Version 2 only ("GPL") or the Common
868.15 @@ -13,9 +16,9 @@
868.16 * specific language governing permissions and limitations under the
868.17 * License. When distributing the software, include this License Header
868.18 * Notice in each file and include the License file at
868.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
868.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
868.21 * particular file as subject to the "Classpath" exception as provided
868.22 - * by Sun in the GPL Version 2 section of the License file that
868.23 + * by Oracle in the GPL Version 2 section of the License file that
868.24 * accompanied this code. If applicable, add the following below the
868.25 * License Header, with the fields enclosed by brackets [] replaced by
868.26 * your own identifying information:
869.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/HttpTestCaseXXX.java Fri Jul 16 11:47:36 2010 -0400
869.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/HttpTestCaseXXX.java Fri Jul 16 14:21:50 2010 -0400
869.3 @@ -1,7 +1,10 @@
869.4 /*
869.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
869.6 *
869.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
869.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
869.9 +*
869.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
869.11 +* Other names may be trademarks of their respective owners.
869.12 *
869.13 * The contents of this file are subject to the terms of either the GNU
869.14 * General Public License Version 2 only ("GPL") or the Common
869.15 @@ -13,9 +16,9 @@
869.16 * specific language governing permissions and limitations under the
869.17 * License. When distributing the software, include this License Header
869.18 * Notice in each file and include the License file at
869.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
869.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
869.21 * particular file as subject to the "Classpath" exception as provided
869.22 -* by Sun in the GPL Version 2 section of the License file that
869.23 +* by Oracle in the GPL Version 2 section of the License file that
869.24 * accompanied this code. If applicable, add the following below the
869.25 * License Header, with the fields enclosed by brackets [] replaced by
869.26 * your own identifying information:
870.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/LineDiff.java Fri Jul 16 11:47:36 2010 -0400
870.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/LineDiff.java Fri Jul 16 14:21:50 2010 -0400
870.3 @@ -1,7 +1,10 @@
870.4 /*
870.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
870.6 *
870.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
870.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
870.9 +*
870.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
870.11 +* Other names may be trademarks of their respective owners.
870.12 *
870.13 * The contents of this file are subject to the terms of either the GNU
870.14 * General Public License Version 2 only ("GPL") or the Common
870.15 @@ -13,9 +16,9 @@
870.16 * specific language governing permissions and limitations under the
870.17 * License. When distributing the software, include this License Header
870.18 * Notice in each file and include the License file at
870.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
870.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
870.21 * particular file as subject to the "Classpath" exception as provided
870.22 -* by Sun in the GPL Version 2 section of the License file that
870.23 +* by Oracle in the GPL Version 2 section of the License file that
870.24 * accompanied this code. If applicable, add the following below the
870.25 * License Header, with the fields enclosed by brackets [] replaced by
870.26 * your own identifying information:
871.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/MainWindowOperator.java Fri Jul 16 11:47:36 2010 -0400
871.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/MainWindowOperator.java Fri Jul 16 14:21:50 2010 -0400
871.3 @@ -1,7 +1,10 @@
871.4 /*
871.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
871.6 *
871.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
871.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
871.9 + *
871.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
871.11 + * Other names may be trademarks of their respective owners.
871.12 *
871.13 * The contents of this file are subject to the terms of either the GNU
871.14 * General Public License Version 2 only ("GPL") or the Common
871.15 @@ -13,9 +16,9 @@
871.16 * specific language governing permissions and limitations under the
871.17 * License. When distributing the software, include this License Header
871.18 * Notice in each file and include the License file at
871.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
871.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
871.21 * particular file as subject to the "Classpath" exception as provided
871.22 - * by Sun in the GPL Version 2 section of the License file that
871.23 + * by Oracle in the GPL Version 2 section of the License file that
871.24 * accompanied this code. If applicable, add the following below the
871.25 * License Header, with the fields enclosed by brackets [] replaced by
871.26 * your own identifying information:
872.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/NbDialogOperator.java Fri Jul 16 11:47:36 2010 -0400
872.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/NbDialogOperator.java Fri Jul 16 14:21:50 2010 -0400
872.3 @@ -1,7 +1,10 @@
872.4 /*
872.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
872.6 *
872.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
872.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
872.9 + *
872.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
872.11 + * Other names may be trademarks of their respective owners.
872.12 *
872.13 * The contents of this file are subject to the terms of either the GNU
872.14 * General Public License Version 2 only ("GPL") or the Common
872.15 @@ -13,9 +16,9 @@
872.16 * specific language governing permissions and limitations under the
872.17 * License. When distributing the software, include this License Header
872.18 * Notice in each file and include the License file at
872.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
872.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
872.21 * particular file as subject to the "Classpath" exception as provided
872.22 - * by Sun in the GPL Version 2 section of the License file that
872.23 + * by Oracle in the GPL Version 2 section of the License file that
872.24 * accompanied this code. If applicable, add the following below the
872.25 * License Header, with the fields enclosed by brackets [] replaced by
872.26 * your own identifying information:
873.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/OptionsOperator.java Fri Jul 16 11:47:36 2010 -0400
873.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/OptionsOperator.java Fri Jul 16 14:21:50 2010 -0400
873.3 @@ -1,7 +1,10 @@
873.4 /*
873.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
873.6 *
873.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
873.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
873.9 + *
873.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
873.11 + * Other names may be trademarks of their respective owners.
873.12 *
873.13 * The contents of this file are subject to the terms of either the GNU
873.14 * General Public License Version 2 only ("GPL") or the Common
873.15 @@ -13,9 +16,9 @@
873.16 * specific language governing permissions and limitations under the
873.17 * License. When distributing the software, include this License Header
873.18 * Notice in each file and include the License file at
873.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
873.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
873.21 * particular file as subject to the "Classpath" exception as provided
873.22 - * by Sun in the GPL Version 2 section of the License file that
873.23 + * by Oracle in the GPL Version 2 section of the License file that
873.24 * accompanied this code. If applicable, add the following below the
873.25 * License Header, with the fields enclosed by brackets [] replaced by
873.26 * your own identifying information:
874.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/PageTopComponentOperator.java Fri Jul 16 11:47:36 2010 -0400
874.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/PageTopComponentOperator.java Fri Jul 16 14:21:50 2010 -0400
874.3 @@ -1,7 +1,10 @@
874.4 /*
874.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
874.6 *
874.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
874.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
874.9 + *
874.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
874.11 + * Other names may be trademarks of their respective owners.
874.12 *
874.13 * The contents of this file are subject to the terms of either the GNU
874.14 * General Public License Version 2 only ("GPL") or the Common
874.15 @@ -13,9 +16,9 @@
874.16 * specific language governing permissions and limitations under the
874.17 * License. When distributing the software, include this License Header
874.18 * Notice in each file and include the License file at
874.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
874.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
874.21 * particular file as subject to the "Classpath" exception as provided
874.22 - * by Sun in the GPL Version 2 section of the License file that
874.23 + * by Oracle in the GPL Version 2 section of the License file that
874.24 * accompanied this code. If applicable, add the following below the
874.25 * License Header, with the fields enclosed by brackets [] replaced by
874.26 * your own identifying information:
875.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/ProjectNavigatorOperator.java Fri Jul 16 11:47:36 2010 -0400
875.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/ProjectNavigatorOperator.java Fri Jul 16 14:21:50 2010 -0400
875.3 @@ -1,7 +1,10 @@
875.4 /*
875.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
875.6 *
875.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
875.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
875.9 + *
875.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
875.11 + * Other names may be trademarks of their respective owners.
875.12 *
875.13 * The contents of this file are subject to the terms of either the GNU
875.14 * General Public License Version 2 only ("GPL") or the Common
875.15 @@ -13,9 +16,9 @@
875.16 * specific language governing permissions and limitations under the
875.17 * License. When distributing the software, include this License Header
875.18 * Notice in each file and include the License file at
875.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
875.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
875.21 * particular file as subject to the "Classpath" exception as provided
875.22 - * by Sun in the GPL Version 2 section of the License file that
875.23 + * by Oracle in the GPL Version 2 section of the License file that
875.24 * accompanied this code. If applicable, add the following below the
875.25 * License Header, with the fields enclosed by brackets [] replaced by
875.26 * your own identifying information:
876.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/RaveTestCase.java Fri Jul 16 11:47:36 2010 -0400
876.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/RaveTestCase.java Fri Jul 16 14:21:50 2010 -0400
876.3 @@ -1,7 +1,10 @@
876.4 /*
876.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
876.6
876.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
876.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
876.9 +
876.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
876.11 +Other names may be trademarks of their respective owners.
876.12
876.13 The contents of this file are subject to the terms of either the GNU
876.14 General Public License Version 2 only ("GPL") or the Common
876.15 @@ -13,9 +16,9 @@
876.16 specific language governing permissions and limitations under the
876.17 License. When distributing the software, include this License Header
876.18 Notice in each file and include the License file at
876.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
876.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
876.21 particular file as subject to the "Classpath" exception as provided
876.22 -by Sun in the GPL Version 2 section of the License file that
876.23 +by Oracle in the GPL Version 2 section of the License file that
876.24 accompanied this code. If applicable, add the following below the
876.25 License Header, with the fields enclosed by brackets [] replaced by
876.26 your own identifying information:
877.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/RaveWindowOperator.java Fri Jul 16 11:47:36 2010 -0400
877.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/RaveWindowOperator.java Fri Jul 16 14:21:50 2010 -0400
877.3 @@ -1,7 +1,10 @@
877.4 /*
877.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
877.6 *
877.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
877.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
877.9 + *
877.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
877.11 + * Other names may be trademarks of their respective owners.
877.12 *
877.13 * The contents of this file are subject to the terms of either the GNU
877.14 * General Public License Version 2 only ("GPL") or the Common
877.15 @@ -13,9 +16,9 @@
877.16 * specific language governing permissions and limitations under the
877.17 * License. When distributing the software, include this License Header
877.18 * Notice in each file and include the License file at
877.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
877.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
877.21 * particular file as subject to the "Classpath" exception as provided
877.22 - * by Sun in the GPL Version 2 section of the License file that
877.23 + * by Oracle in the GPL Version 2 section of the License file that
877.24 * accompanied this code. If applicable, add the following below the
877.25 * License Header, with the fields enclosed by brackets [] replaced by
877.26 * your own identifying information:
878.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Repeater.java Fri Jul 16 11:47:36 2010 -0400
878.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Repeater.java Fri Jul 16 14:21:50 2010 -0400
878.3 @@ -1,7 +1,10 @@
878.4 /*
878.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
878.6 *
878.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
878.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
878.9 +*
878.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
878.11 +* Other names may be trademarks of their respective owners.
878.12 *
878.13 * The contents of this file are subject to the terms of either the GNU
878.14 * General Public License Version 2 only ("GPL") or the Common
878.15 @@ -13,9 +16,9 @@
878.16 * specific language governing permissions and limitations under the
878.17 * License. When distributing the software, include this License Header
878.18 * Notice in each file and include the License file at
878.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
878.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
878.21 * particular file as subject to the "Classpath" exception as provided
878.22 -* by Sun in the GPL Version 2 section of the License file that
878.23 +* by Oracle in the GPL Version 2 section of the License file that
878.24 * accompanied this code. If applicable, add the following below the
878.25 * License Header, with the fields enclosed by brackets [] replaced by
878.26 * your own identifying information:
879.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/StartStopDialogOperator.java Fri Jul 16 11:47:36 2010 -0400
879.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/StartStopDialogOperator.java Fri Jul 16 14:21:50 2010 -0400
879.3 @@ -1,7 +1,10 @@
879.4 /*
879.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
879.6 *
879.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
879.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
879.9 +*
879.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
879.11 +* Other names may be trademarks of their respective owners.
879.12 *
879.13 * The contents of this file are subject to the terms of either the GNU
879.14 * General Public License Version 2 only ("GPL") or the Common
879.15 @@ -13,9 +16,9 @@
879.16 * specific language governing permissions and limitations under the
879.17 * License. When distributing the software, include this License Header
879.18 * Notice in each file and include the License file at
879.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
879.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
879.21 * particular file as subject to the "Classpath" exception as provided
879.22 -* by Sun in the GPL Version 2 section of the License file that
879.23 +* by Oracle in the GPL Version 2 section of the License file that
879.24 * accompanied this code. If applicable, add the following below the
879.25 * License Header, with the fields enclosed by brackets [] replaced by
879.26 * your own identifying information:
880.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/StatusWaitable.java Fri Jul 16 11:47:36 2010 -0400
880.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/StatusWaitable.java Fri Jul 16 14:21:50 2010 -0400
880.3 @@ -1,7 +1,10 @@
880.4 /*
880.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
880.6 *
880.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
880.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
880.9 +*
880.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
880.11 +* Other names may be trademarks of their respective owners.
880.12 *
880.13 * The contents of this file are subject to the terms of either the GNU
880.14 * General Public License Version 2 only ("GPL") or the Common
880.15 @@ -13,9 +16,9 @@
880.16 * specific language governing permissions and limitations under the
880.17 * License. When distributing the software, include this License Header
880.18 * Notice in each file and include the License file at
880.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
880.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
880.21 * particular file as subject to the "Classpath" exception as provided
880.22 -* by Sun in the GPL Version 2 section of the License file that
880.23 +* by Oracle in the GPL Version 2 section of the License file that
880.24 * accompanied this code. If applicable, add the following below the
880.25 * License Header, with the fields enclosed by brackets [] replaced by
880.26 * your own identifying information:
881.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TestProperties.java Fri Jul 16 11:47:36 2010 -0400
881.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TestProperties.java Fri Jul 16 14:21:50 2010 -0400
881.3 @@ -1,7 +1,10 @@
881.4 /*
881.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
881.6 *
881.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
881.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
881.9 +*
881.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
881.11 +* Other names may be trademarks of their respective owners.
881.12 *
881.13 * The contents of this file are subject to the terms of either the GNU
881.14 * General Public License Version 2 only ("GPL") or the Common
881.15 @@ -13,9 +16,9 @@
881.16 * specific language governing permissions and limitations under the
881.17 * License. When distributing the software, include this License Header
881.18 * Notice in each file and include the License file at
881.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
881.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
881.21 * particular file as subject to the "Classpath" exception as provided
881.22 -* by Sun in the GPL Version 2 section of the License file that
881.23 +* by Oracle in the GPL Version 2 section of the License file that
881.24 * accompanied this code. If applicable, add the following below the
881.25 * License Header, with the fields enclosed by brackets [] replaced by
881.26 * your own identifying information:
882.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TestUtils.java Fri Jul 16 11:47:36 2010 -0400
882.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TestUtils.java Fri Jul 16 14:21:50 2010 -0400
882.3 @@ -1,7 +1,10 @@
882.4 /*
882.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
882.6 *
882.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
882.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
882.9 + *
882.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
882.11 + * Other names may be trademarks of their respective owners.
882.12 *
882.13 * The contents of this file are subject to the terms of either the GNU
882.14 * General Public License Version 2 only ("GPL") or the Common
882.15 @@ -13,9 +16,9 @@
882.16 * specific language governing permissions and limitations under the
882.17 * License. When distributing the software, include this License Header
882.18 * Notice in each file and include the License file at
882.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
882.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
882.21 * particular file as subject to the "Classpath" exception as provided
882.22 - * by Sun in the GPL Version 2 section of the License file that
882.23 + * by Oracle in the GPL Version 2 section of the License file that
882.24 * accompanied this code. If applicable, add the following below the
882.25 * License Header, with the fields enclosed by brackets [] replaced by
882.26 * your own identifying information:
882.27 @@ -984,7 +987,7 @@
882.28 }
882.29
882.30 private static final String
882.31 - CREATOR_SYSTEM_DIR = "visualweb1" + File.separator + "config",
882.32 + CREATOR_SYSTEM_DIR = "visualweb" + File.separator + "config",
882.33 CREATOR_INSTALL_PROPERTIES_FILE_NAME = "com-sun-rave-install.properties";
882.34 // CREATOR_SYSTEM_DIR = "system",
882.35 // CREATOR_INSTALL_PROPERTIES_FILE_NAME = "install.properties";
883.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TopComponentByIdChooser.java Fri Jul 16 11:47:36 2010 -0400
883.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TopComponentByIdChooser.java Fri Jul 16 14:21:50 2010 -0400
883.3 @@ -1,7 +1,10 @@
883.4 /*
883.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
883.6 *
883.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
883.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
883.9 + *
883.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
883.11 + * Other names may be trademarks of their respective owners.
883.12 *
883.13 * The contents of this file are subject to the terms of either the GNU
883.14 * General Public License Version 2 only ("GPL") or the Common
883.15 @@ -13,9 +16,9 @@
883.16 * specific language governing permissions and limitations under the
883.17 * License. When distributing the software, include this License Header
883.18 * Notice in each file and include the License file at
883.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
883.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
883.21 * particular file as subject to the "Classpath" exception as provided
883.22 - * by Sun in the GPL Version 2 section of the License file that
883.23 + * by Oracle in the GPL Version 2 section of the License file that
883.24 * accompanied this code. If applicable, add the following below the
883.25 * License Header, with the fields enclosed by brackets [] replaced by
883.26 * your own identifying information:
884.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TopComponentOperator.java Fri Jul 16 11:47:36 2010 -0400
884.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TopComponentOperator.java Fri Jul 16 14:21:50 2010 -0400
884.3 @@ -1,7 +1,10 @@
884.4 /*
884.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
884.6 *
884.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
884.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
884.9 + *
884.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
884.11 + * Other names may be trademarks of their respective owners.
884.12 *
884.13 * The contents of this file are subject to the terms of either the GNU
884.14 * General Public License Version 2 only ("GPL") or the Common
884.15 @@ -13,9 +16,9 @@
884.16 * specific language governing permissions and limitations under the
884.17 * License. When distributing the software, include this License Header
884.18 * Notice in each file and include the License file at
884.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
884.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
884.21 * particular file as subject to the "Classpath" exception as provided
884.22 - * by Sun in the GPL Version 2 section of the License file that
884.23 + * by Oracle in the GPL Version 2 section of the License file that
884.24 * accompanied this code. If applicable, add the following below the
884.25 * License Header, with the fields enclosed by brackets [] replaced by
884.26 * your own identifying information:
885.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TreeTableOperator.java Fri Jul 16 11:47:36 2010 -0400
885.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/TreeTableOperator.java Fri Jul 16 14:21:50 2010 -0400
885.3 @@ -1,7 +1,10 @@
885.4 /*
885.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
885.6 *
885.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
885.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
885.9 +*
885.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
885.11 +* Other names may be trademarks of their respective owners.
885.12 *
885.13 * The contents of this file are subject to the terms of either the GNU
885.14 * General Public License Version 2 only ("GPL") or the Common
885.15 @@ -13,9 +16,9 @@
885.16 * specific language governing permissions and limitations under the
885.17 * License. When distributing the software, include this License Header
885.18 * Notice in each file and include the License file at
885.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
885.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
885.21 * particular file as subject to the "Classpath" exception as provided
885.22 -* by Sun in the GPL Version 2 section of the License file that
885.23 +* by Oracle in the GPL Version 2 section of the License file that
885.24 * accompanied this code. If applicable, add the following below the
885.25 * License Header, with the fields enclosed by brackets [] replaced by
885.26 * your own identifying information:
886.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Util.java Fri Jul 16 11:47:36 2010 -0400
886.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/Util.java Fri Jul 16 14:21:50 2010 -0400
886.3 @@ -1,7 +1,10 @@
886.4 /*
886.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
886.6 *
886.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
886.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
886.9 + *
886.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
886.11 + * Other names may be trademarks of their respective owners.
886.12 *
886.13 * The contents of this file are subject to the terms of either the GNU
886.14 * General Public License Version 2 only ("GPL") or the Common
886.15 @@ -13,9 +16,9 @@
886.16 * specific language governing permissions and limitations under the
886.17 * License. When distributing the software, include this License Header
886.18 * Notice in each file and include the License file at
886.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
886.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
886.21 * particular file as subject to the "Classpath" exception as provided
886.22 - * by Sun in the GPL Version 2 section of the License file that
886.23 + * by Oracle in the GPL Version 2 section of the License file that
886.24 * accompanied this code. If applicable, add the following below the
886.25 * License Header, with the fields enclosed by brackets [] replaced by
886.26 * your own identifying information:
887.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/Action.java Fri Jul 16 11:47:36 2010 -0400
887.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/Action.java Fri Jul 16 14:21:50 2010 -0400
887.3 @@ -1,7 +1,10 @@
887.4 /*
887.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
887.6 *
887.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
887.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
887.9 + *
887.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
887.11 + * Other names may be trademarks of their respective owners.
887.12 *
887.13 * The contents of this file are subject to the terms of either the GNU
887.14 * General Public License Version 2 only ("GPL") or the Common
887.15 @@ -13,9 +16,9 @@
887.16 * specific language governing permissions and limitations under the
887.17 * License. When distributing the software, include this License Header
887.18 * Notice in each file and include the License file at
887.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
887.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
887.21 * particular file as subject to the "Classpath" exception as provided
887.22 - * by Sun in the GPL Version 2 section of the License file that
887.23 + * by Oracle in the GPL Version 2 section of the License file that
887.24 * accompanied this code. If applicable, add the following below the
887.25 * License Header, with the fields enclosed by brackets [] replaced by
887.26 * your own identifying information:
888.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/ActionNoBlock.java Fri Jul 16 11:47:36 2010 -0400
888.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/ActionNoBlock.java Fri Jul 16 14:21:50 2010 -0400
888.3 @@ -1,7 +1,10 @@
888.4 /*
888.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
888.6 *
888.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
888.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
888.9 + *
888.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
888.11 + * Other names may be trademarks of their respective owners.
888.12 *
888.13 * The contents of this file are subject to the terms of either the GNU
888.14 * General Public License Version 2 only ("GPL") or the Common
888.15 @@ -13,9 +16,9 @@
888.16 * specific language governing permissions and limitations under the
888.17 * License. When distributing the software, include this License Header
888.18 * Notice in each file and include the License file at
888.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
888.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
888.21 * particular file as subject to the "Classpath" exception as provided
888.22 - * by Sun in the GPL Version 2 section of the License file that
888.23 + * by Oracle in the GPL Version 2 section of the License file that
888.24 * accompanied this code. If applicable, add the following below the
888.25 * License Header, with the fields enclosed by brackets [] replaced by
888.26 * your own identifying information:
889.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/BuildProjectAction.java Fri Jul 16 11:47:36 2010 -0400
889.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/BuildProjectAction.java Fri Jul 16 14:21:50 2010 -0400
889.3 @@ -1,7 +1,10 @@
889.4 /*
889.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
889.6 *
889.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
889.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
889.9 + *
889.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
889.11 + * Other names may be trademarks of their respective owners.
889.12 *
889.13 * The contents of this file are subject to the terms of either the GNU
889.14 * General Public License Version 2 only ("GPL") or the Common
889.15 @@ -13,9 +16,9 @@
889.16 * specific language governing permissions and limitations under the
889.17 * License. When distributing the software, include this License Header
889.18 * Notice in each file and include the License file at
889.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
889.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
889.21 * particular file as subject to the "Classpath" exception as provided
889.22 - * by Sun in the GPL Version 2 section of the License file that
889.23 + * by Oracle in the GPL Version 2 section of the License file that
889.24 * accompanied this code. If applicable, add the following below the
889.25 * License Header, with the fields enclosed by brackets [] replaced by
889.26 * your own identifying information:
890.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/CloseProjectAction.java Fri Jul 16 11:47:36 2010 -0400
890.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/CloseProjectAction.java Fri Jul 16 14:21:50 2010 -0400
890.3 @@ -1,7 +1,10 @@
890.4 /*
890.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
890.6 *
890.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
890.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
890.9 + *
890.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
890.11 + * Other names may be trademarks of their respective owners.
890.12 *
890.13 * The contents of this file are subject to the terms of either the GNU
890.14 * General Public License Version 2 only ("GPL") or the Common
890.15 @@ -13,9 +16,9 @@
890.16 * specific language governing permissions and limitations under the
890.17 * License. When distributing the software, include this License Header
890.18 * Notice in each file and include the License file at
890.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
890.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
890.21 * particular file as subject to the "Classpath" exception as provided
890.22 - * by Sun in the GPL Version 2 section of the License file that
890.23 + * by Oracle in the GPL Version 2 section of the License file that
890.24 * accompanied this code. If applicable, add the following below the
890.25 * License Header, with the fields enclosed by brackets [] replaced by
890.26 * your own identifying information:
891.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/DeleteAction.java Fri Jul 16 11:47:36 2010 -0400
891.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/DeleteAction.java Fri Jul 16 14:21:50 2010 -0400
891.3 @@ -1,7 +1,10 @@
891.4 /*
891.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
891.6 *
891.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
891.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
891.9 + *
891.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
891.11 + * Other names may be trademarks of their respective owners.
891.12 *
891.13 * The contents of this file are subject to the terms of either the GNU
891.14 * General Public License Version 2 only ("GPL") or the Common
891.15 @@ -13,9 +16,9 @@
891.16 * specific language governing permissions and limitations under the
891.17 * License. When distributing the software, include this License Header
891.18 * Notice in each file and include the License file at
891.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
891.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
891.21 * particular file as subject to the "Classpath" exception as provided
891.22 - * by Sun in the GPL Version 2 section of the License file that
891.23 + * by Oracle in the GPL Version 2 section of the License file that
891.24 * accompanied this code. If applicable, add the following below the
891.25 * License Header, with the fields enclosed by brackets [] replaced by
891.26 * your own identifying information:
892.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/FindAction.java Fri Jul 16 11:47:36 2010 -0400
892.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/FindAction.java Fri Jul 16 14:21:50 2010 -0400
892.3 @@ -1,7 +1,10 @@
892.4 /*
892.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
892.6 *
892.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
892.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
892.9 + *
892.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
892.11 + * Other names may be trademarks of their respective owners.
892.12 *
892.13 * The contents of this file are subject to the terms of either the GNU
892.14 * General Public License Version 2 only ("GPL") or the Common
892.15 @@ -13,9 +16,9 @@
892.16 * specific language governing permissions and limitations under the
892.17 * License. When distributing the software, include this License Header
892.18 * Notice in each file and include the License file at
892.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
892.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
892.21 * particular file as subject to the "Classpath" exception as provided
892.22 - * by Sun in the GPL Version 2 section of the License file that
892.23 + * by Oracle in the GPL Version 2 section of the License file that
892.24 * accompanied this code. If applicable, add the following below the
892.25 * License Header, with the fields enclosed by brackets [] replaced by
892.26 * your own identifying information:
893.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/HelpAction.java Fri Jul 16 11:47:36 2010 -0400
893.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/HelpAction.java Fri Jul 16 14:21:50 2010 -0400
893.3 @@ -1,7 +1,10 @@
893.4 /*
893.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
893.6 *
893.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
893.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
893.9 + *
893.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
893.11 + * Other names may be trademarks of their respective owners.
893.12 *
893.13 * The contents of this file are subject to the terms of either the GNU
893.14 * General Public License Version 2 only ("GPL") or the Common
893.15 @@ -13,9 +16,9 @@
893.16 * specific language governing permissions and limitations under the
893.17 * License. When distributing the software, include this License Header
893.18 * Notice in each file and include the License file at
893.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
893.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
893.21 * particular file as subject to the "Classpath" exception as provided
893.22 - * by Sun in the GPL Version 2 section of the License file that
893.23 + * by Oracle in the GPL Version 2 section of the License file that
893.24 * accompanied this code. If applicable, add the following below the
893.25 * License Header, with the fields enclosed by brackets [] replaced by
893.26 * your own identifying information:
894.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/OptionsViewAction.java Fri Jul 16 11:47:36 2010 -0400
894.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/OptionsViewAction.java Fri Jul 16 14:21:50 2010 -0400
894.3 @@ -1,7 +1,10 @@
894.4 /*
894.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
894.6 *
894.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
894.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
894.9 + *
894.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
894.11 + * Other names may be trademarks of their respective owners.
894.12 *
894.13 * The contents of this file are subject to the terms of either the GNU
894.14 * General Public License Version 2 only ("GPL") or the Common
894.15 @@ -13,9 +16,9 @@
894.16 * specific language governing permissions and limitations under the
894.17 * License. When distributing the software, include this License Header
894.18 * Notice in each file and include the License file at
894.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
894.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
894.21 * particular file as subject to the "Classpath" exception as provided
894.22 - * by Sun in the GPL Version 2 section of the License file that
894.23 + * by Oracle in the GPL Version 2 section of the License file that
894.24 * accompanied this code. If applicable, add the following below the
894.25 * License Header, with the fields enclosed by brackets [] replaced by
894.26 * your own identifying information:
895.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/PropertiesAction.java Fri Jul 16 11:47:36 2010 -0400
895.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/PropertiesAction.java Fri Jul 16 14:21:50 2010 -0400
895.3 @@ -1,7 +1,10 @@
895.4 /*
895.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
895.6 *
895.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
895.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
895.9 + *
895.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
895.11 + * Other names may be trademarks of their respective owners.
895.12 *
895.13 * The contents of this file are subject to the terms of either the GNU
895.14 * General Public License Version 2 only ("GPL") or the Common
895.15 @@ -13,9 +16,9 @@
895.16 * specific language governing permissions and limitations under the
895.17 * License. When distributing the software, include this License Header
895.18 * Notice in each file and include the License file at
895.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
895.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
895.21 * particular file as subject to the "Classpath" exception as provided
895.22 - * by Sun in the GPL Version 2 section of the License file that
895.23 + * by Oracle in the GPL Version 2 section of the License file that
895.24 * accompanied this code. If applicable, add the following below the
895.25 * License Header, with the fields enclosed by brackets [] replaced by
895.26 * your own identifying information:
896.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/SaveAction.java Fri Jul 16 11:47:36 2010 -0400
896.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/SaveAction.java Fri Jul 16 14:21:50 2010 -0400
896.3 @@ -1,7 +1,10 @@
896.4 /*
896.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
896.6 *
896.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
896.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
896.9 + *
896.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
896.11 + * Other names may be trademarks of their respective owners.
896.12 *
896.13 * The contents of this file are subject to the terms of either the GNU
896.14 * General Public License Version 2 only ("GPL") or the Common
896.15 @@ -13,9 +16,9 @@
896.16 * specific language governing permissions and limitations under the
896.17 * License. When distributing the software, include this License Header
896.18 * Notice in each file and include the License file at
896.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
896.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
896.21 * particular file as subject to the "Classpath" exception as provided
896.22 - * by Sun in the GPL Version 2 section of the License file that
896.23 + * by Oracle in the GPL Version 2 section of the License file that
896.24 * accompanied this code. If applicable, add the following below the
896.25 * License Header, with the fields enclosed by brackets [] replaced by
896.26 * your own identifying information:
897.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/ShowDescriptionAreaAction.java Fri Jul 16 11:47:36 2010 -0400
897.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/ShowDescriptionAreaAction.java Fri Jul 16 14:21:50 2010 -0400
897.3 @@ -1,7 +1,10 @@
897.4 /*
897.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
897.6 *
897.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
897.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
897.9 + *
897.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
897.11 + * Other names may be trademarks of their respective owners.
897.12 *
897.13 * The contents of this file are subject to the terms of either the GNU
897.14 * General Public License Version 2 only ("GPL") or the Common
897.15 @@ -13,9 +16,9 @@
897.16 * specific language governing permissions and limitations under the
897.17 * License. When distributing the software, include this License Header
897.18 * Notice in each file and include the License file at
897.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
897.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
897.21 * particular file as subject to the "Classpath" exception as provided
897.22 - * by Sun in the GPL Version 2 section of the License file that
897.23 + * by Oracle in the GPL Version 2 section of the License file that
897.24 * accompanied this code. If applicable, add the following below the
897.25 * License Header, with the fields enclosed by brackets [] replaced by
897.26 * your own identifying information:
898.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/ShowFilesAction.java Fri Jul 16 11:47:36 2010 -0400
898.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/ShowFilesAction.java Fri Jul 16 14:21:50 2010 -0400
898.3 @@ -1,7 +1,10 @@
898.4 /*
898.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
898.6 *
898.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
898.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
898.9 + *
898.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
898.11 + * Other names may be trademarks of their respective owners.
898.12 *
898.13 * The contents of this file are subject to the terms of either the GNU
898.14 * General Public License Version 2 only ("GPL") or the Common
898.15 @@ -13,9 +16,9 @@
898.16 * specific language governing permissions and limitations under the
898.17 * License. When distributing the software, include this License Header
898.18 * Notice in each file and include the License file at
898.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
898.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
898.21 * particular file as subject to the "Classpath" exception as provided
898.22 - * by Sun in the GPL Version 2 section of the License file that
898.23 + * by Oracle in the GPL Version 2 section of the License file that
898.24 * accompanied this code. If applicable, add the following below the
898.25 * License Header, with the fields enclosed by brackets [] replaced by
898.26 * your own identifying information:
899.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/ShowProjectsAction.java Fri Jul 16 11:47:36 2010 -0400
899.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/ShowProjectsAction.java Fri Jul 16 14:21:50 2010 -0400
899.3 @@ -1,7 +1,10 @@
899.4 /*
899.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
899.6 *
899.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
899.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
899.9 + *
899.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
899.11 + * Other names may be trademarks of their respective owners.
899.12 *
899.13 * The contents of this file are subject to the terms of either the GNU
899.14 * General Public License Version 2 only ("GPL") or the Common
899.15 @@ -13,9 +16,9 @@
899.16 * specific language governing permissions and limitations under the
899.17 * License. When distributing the software, include this License Header
899.18 * Notice in each file and include the License file at
899.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
899.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
899.21 * particular file as subject to the "Classpath" exception as provided
899.22 - * by Sun in the GPL Version 2 section of the License file that
899.23 + * by Oracle in the GPL Version 2 section of the License file that
899.24 * accompanied this code. If applicable, add the following below the
899.25 * License Header, with the fields enclosed by brackets [] replaced by
899.26 * your own identifying information:
900.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/SortByCategoryAction.java Fri Jul 16 11:47:36 2010 -0400
900.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/SortByCategoryAction.java Fri Jul 16 14:21:50 2010 -0400
900.3 @@ -1,7 +1,10 @@
900.4 /*
900.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
900.6 *
900.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
900.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
900.9 + *
900.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
900.11 + * Other names may be trademarks of their respective owners.
900.12 *
900.13 * The contents of this file are subject to the terms of either the GNU
900.14 * General Public License Version 2 only ("GPL") or the Common
900.15 @@ -13,9 +16,9 @@
900.16 * specific language governing permissions and limitations under the
900.17 * License. When distributing the software, include this License Header
900.18 * Notice in each file and include the License file at
900.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
900.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
900.21 * particular file as subject to the "Classpath" exception as provided
900.22 - * by Sun in the GPL Version 2 section of the License file that
900.23 + * by Oracle in the GPL Version 2 section of the License file that
900.24 * accompanied this code. If applicable, add the following below the
900.25 * License Header, with the fields enclosed by brackets [] replaced by
900.26 * your own identifying information:
901.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/SortByNameAction.java Fri Jul 16 11:47:36 2010 -0400
901.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/actions/SortByNameAction.java Fri Jul 16 14:21:50 2010 -0400
901.3 @@ -1,7 +1,10 @@
901.4 /*
901.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
901.6 *
901.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
901.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
901.9 + *
901.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
901.11 + * Other names may be trademarks of their respective owners.
901.12 *
901.13 * The contents of this file are subject to the terms of either the GNU
901.14 * General Public License Version 2 only ("GPL") or the Common
901.15 @@ -13,9 +16,9 @@
901.16 * specific language governing permissions and limitations under the
901.17 * License. When distributing the software, include this License Header
901.18 * Notice in each file and include the License file at
901.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
901.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
901.21 * particular file as subject to the "Classpath" exception as provided
901.22 - * by Sun in the GPL Version 2 section of the License file that
901.23 + * by Oracle in the GPL Version 2 section of the License file that
901.24 * accompanied this code. If applicable, add the following below the
901.25 * License Header, with the fields enclosed by brackets [] replaced by
901.26 * your own identifying information:
902.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/AddDataSourceOperator.java Fri Jul 16 11:47:36 2010 -0400
902.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/AddDataSourceOperator.java Fri Jul 16 14:21:50 2010 -0400
902.3 @@ -1,7 +1,10 @@
902.4 /*
902.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
902.6 *
902.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
902.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
902.9 +*
902.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
902.11 +* Other names may be trademarks of their respective owners.
902.12 *
902.13 * The contents of this file are subject to the terms of either the GNU
902.14 * General Public License Version 2 only ("GPL") or the Common
902.15 @@ -13,9 +16,9 @@
902.16 * specific language governing permissions and limitations under the
902.17 * License. When distributing the software, include this License Header
902.18 * Notice in each file and include the License file at
902.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
902.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
902.21 * particular file as subject to the "Classpath" exception as provided
902.22 -* by Sun in the GPL Version 2 section of the License file that
902.23 +* by Oracle in the GPL Version 2 section of the License file that
902.24 * accompanied this code. If applicable, add the following below the
902.25 * License Header, with the fields enclosed by brackets [] replaced by
902.26 * your own identifying information:
903.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/AddQueryCriteriaOperator.java Fri Jul 16 11:47:36 2010 -0400
903.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/AddQueryCriteriaOperator.java Fri Jul 16 14:21:50 2010 -0400
903.3 @@ -1,7 +1,10 @@
903.4 /*
903.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
903.6 *
903.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
903.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
903.9 +*
903.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
903.11 +* Other names may be trademarks of their respective owners.
903.12 *
903.13 * The contents of this file are subject to the terms of either the GNU
903.14 * General Public License Version 2 only ("GPL") or the Common
903.15 @@ -13,9 +16,9 @@
903.16 * specific language governing permissions and limitations under the
903.17 * License. When distributing the software, include this License Header
903.18 * Notice in each file and include the License file at
903.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
903.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
903.21 * particular file as subject to the "Classpath" exception as provided
903.22 -* by Sun in the GPL Version 2 section of the License file that
903.23 +* by Oracle in the GPL Version 2 section of the License file that
903.24 * accompanied this code. If applicable, add the following below the
903.25 * License Header, with the fields enclosed by brackets [] replaced by
903.26 * your own identifying information:
904.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/DataSource.java Fri Jul 16 11:47:36 2010 -0400
904.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/DataSource.java Fri Jul 16 14:21:50 2010 -0400
904.3 @@ -1,7 +1,10 @@
904.4 /*
904.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
904.6 *
904.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
904.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
904.9 +*
904.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
904.11 +* Other names may be trademarks of their respective owners.
904.12 *
904.13 * The contents of this file are subject to the terms of either the GNU
904.14 * General Public License Version 2 only ("GPL") or the Common
904.15 @@ -13,9 +16,9 @@
904.16 * specific language governing permissions and limitations under the
904.17 * License. When distributing the software, include this License Header
904.18 * Notice in each file and include the License file at
904.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
904.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
904.21 * particular file as subject to the "Classpath" exception as provided
904.22 -* by Sun in the GPL Version 2 section of the License file that
904.23 +* by Oracle in the GPL Version 2 section of the License file that
904.24 * accompanied this code. If applicable, add the following below the
904.25 * License Header, with the fields enclosed by brackets [] replaced by
904.26 * your own identifying information:
905.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/EditServerTypesOperator.java Fri Jul 16 11:47:36 2010 -0400
905.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/EditServerTypesOperator.java Fri Jul 16 14:21:50 2010 -0400
905.3 @@ -1,7 +1,10 @@
905.4 /*
905.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
905.6 *
905.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
905.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
905.9 +*
905.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
905.11 +* Other names may be trademarks of their respective owners.
905.12 *
905.13 * The contents of this file are subject to the terms of either the GNU
905.14 * General Public License Version 2 only ("GPL") or the Common
905.15 @@ -13,9 +16,9 @@
905.16 * specific language governing permissions and limitations under the
905.17 * License. When distributing the software, include this License Header
905.18 * Notice in each file and include the License file at
905.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
905.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
905.21 * particular file as subject to the "Classpath" exception as provided
905.22 -* by Sun in the GPL Version 2 section of the License file that
905.23 +* by Oracle in the GPL Version 2 section of the License file that
905.24 * accompanied this code. If applicable, add the following below the
905.25 * License Header, with the fields enclosed by brackets [] replaced by
905.26 * your own identifying information:
906.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ExportDataSourcesOperator.java Fri Jul 16 11:47:36 2010 -0400
906.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ExportDataSourcesOperator.java Fri Jul 16 14:21:50 2010 -0400
906.3 @@ -1,7 +1,10 @@
906.4 /*
906.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
906.6 *
906.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
906.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
906.9 +*
906.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
906.11 +* Other names may be trademarks of their respective owners.
906.12 *
906.13 * The contents of this file are subject to the terms of either the GNU
906.14 * General Public License Version 2 only ("GPL") or the Common
906.15 @@ -13,9 +16,9 @@
906.16 * specific language governing permissions and limitations under the
906.17 * License. When distributing the software, include this License Header
906.18 * Notice in each file and include the License file at
906.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
906.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
906.21 * particular file as subject to the "Classpath" exception as provided
906.22 -* by Sun in the GPL Version 2 section of the License file that
906.23 +* by Oracle in the GPL Version 2 section of the License file that
906.24 * accompanied this code. If applicable, add the following below the
906.25 * License Header, with the fields enclosed by brackets [] replaced by
906.26 * your own identifying information:
907.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ExportImportDataSourcesOperator.java Fri Jul 16 11:47:36 2010 -0400
907.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ExportImportDataSourcesOperator.java Fri Jul 16 14:21:50 2010 -0400
907.3 @@ -1,7 +1,10 @@
907.4 /*
907.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
907.6 *
907.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
907.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
907.9 +*
907.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
907.11 +* Other names may be trademarks of their respective owners.
907.12 *
907.13 * The contents of this file are subject to the terms of either the GNU
907.14 * General Public License Version 2 only ("GPL") or the Common
907.15 @@ -13,9 +16,9 @@
907.16 * specific language governing permissions and limitations under the
907.17 * License. When distributing the software, include this License Header
907.18 * Notice in each file and include the License file at
907.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
907.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
907.21 * particular file as subject to the "Classpath" exception as provided
907.22 -* by Sun in the GPL Version 2 section of the License file that
907.23 +* by Oracle in the GPL Version 2 section of the License file that
907.24 * accompanied this code. If applicable, add the following below the
907.25 * License Header, with the fields enclosed by brackets [] replaced by
907.26 * your own identifying information:
908.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ImportDataSourcesOperator.java Fri Jul 16 11:47:36 2010 -0400
908.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ImportDataSourcesOperator.java Fri Jul 16 14:21:50 2010 -0400
908.3 @@ -1,7 +1,10 @@
908.4 /*
908.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
908.6 *
908.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
908.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
908.9 +*
908.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
908.11 +* Other names may be trademarks of their respective owners.
908.12 *
908.13 * The contents of this file are subject to the terms of either the GNU
908.14 * General Public License Version 2 only ("GPL") or the Common
908.15 @@ -13,9 +16,9 @@
908.16 * specific language governing permissions and limitations under the
908.17 * License. When distributing the software, include this License Header
908.18 * Notice in each file and include the License file at
908.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
908.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
908.21 * particular file as subject to the "Classpath" exception as provided
908.22 -* by Sun in the GPL Version 2 section of the License file that
908.23 +* by Oracle in the GPL Version 2 section of the License file that
908.24 * accompanied this code. If applicable, add the following below the
908.25 * License Header, with the fields enclosed by brackets [] replaced by
908.26 * your own identifying information:
909.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ModifyDataSourceOperator.java Fri Jul 16 11:47:36 2010 -0400
909.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ModifyDataSourceOperator.java Fri Jul 16 14:21:50 2010 -0400
909.3 @@ -1,7 +1,10 @@
909.4 /*
909.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
909.6 *
909.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
909.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
909.9 +*
909.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
909.11 +* Other names may be trademarks of their respective owners.
909.12 *
909.13 * The contents of this file are subject to the terms of either the GNU
909.14 * General Public License Version 2 only ("GPL") or the Common
909.15 @@ -13,9 +16,9 @@
909.16 * specific language governing permissions and limitations under the
909.17 * License. When distributing the software, include this License Header
909.18 * Notice in each file and include the License file at
909.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
909.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
909.21 * particular file as subject to the "Classpath" exception as provided
909.22 -* by Sun in the GPL Version 2 section of the License file that
909.23 +* by Oracle in the GPL Version 2 section of the License file that
909.24 * accompanied this code. If applicable, add the following below the
909.25 * License Header, with the fields enclosed by brackets [] replaced by
909.26 * your own identifying information:
910.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/QueryBuilderOperator.java Fri Jul 16 11:47:36 2010 -0400
910.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/QueryBuilderOperator.java Fri Jul 16 14:21:50 2010 -0400
910.3 @@ -1,7 +1,10 @@
910.4 /*
910.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
910.6 *
910.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
910.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
910.9 + *
910.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
910.11 + * Other names may be trademarks of their respective owners.
910.12 *
910.13 * The contents of this file are subject to the terms of either the GNU
910.14 * General Public License Version 2 only ("GPL") or the Common
910.15 @@ -13,9 +16,9 @@
910.16 * specific language governing permissions and limitations under the
910.17 * License. When distributing the software, include this License Header
910.18 * Notice in each file and include the License file at
910.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
910.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
910.21 * particular file as subject to the "Classpath" exception as provided
910.22 - * by Sun in the GPL Version 2 section of the License file that
910.23 + * by Oracle in the GPL Version 2 section of the License file that
910.24 * accompanied this code. If applicable, add the following below the
910.25 * License Header, with the fields enclosed by brackets [] replaced by
910.26 * your own identifying information:
911.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ServerExplorerOperator.java Fri Jul 16 11:47:36 2010 -0400
911.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ServerExplorerOperator.java Fri Jul 16 14:21:50 2010 -0400
911.3 @@ -1,7 +1,10 @@
911.4 /*
911.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
911.6 *
911.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
911.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
911.9 +*
911.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
911.11 +* Other names may be trademarks of their respective owners.
911.12 *
911.13 * The contents of this file are subject to the terms of either the GNU
911.14 * General Public License Version 2 only ("GPL") or the Common
911.15 @@ -13,9 +16,9 @@
911.16 * specific language governing permissions and limitations under the
911.17 * License. When distributing the software, include this License Header
911.18 * Notice in each file and include the License file at
911.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
911.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
911.21 * particular file as subject to the "Classpath" exception as provided
911.22 -* by Sun in the GPL Version 2 section of the License file that
911.23 +* by Oracle in the GPL Version 2 section of the License file that
911.24 * accompanied this code. If applicable, add the following below the
911.25 * License Header, with the fields enclosed by brackets [] replaced by
911.26 * your own identifying information:
912.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ServerNavigatorOperator.java Fri Jul 16 11:47:36 2010 -0400
912.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/dataconnectivity/ServerNavigatorOperator.java Fri Jul 16 14:21:50 2010 -0400
912.3 @@ -1,7 +1,10 @@
912.4 /*
912.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
912.6 *
912.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
912.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
912.9 + *
912.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
912.11 + * Other names may be trademarks of their respective owners.
912.12 *
912.13 * The contents of this file are subject to the terms of either the GNU
912.14 * General Public License Version 2 only ("GPL") or the Common
912.15 @@ -13,9 +16,9 @@
912.16 * specific language governing permissions and limitations under the
912.17 * License. When distributing the software, include this License Header
912.18 * Notice in each file and include the License file at
912.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
912.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
912.21 * particular file as subject to the "Classpath" exception as provided
912.22 - * by Sun in the GPL Version 2 section of the License file that
912.23 + * by Oracle in the GPL Version 2 section of the License file that
912.24 * accompanied this code. If applicable, add the following below the
912.25 * License Header, with the fields enclosed by brackets [] replaced by
912.26 * your own identifying information:
913.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/BuildOutputOperator.java Fri Jul 16 11:47:36 2010 -0400
913.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/BuildOutputOperator.java Fri Jul 16 14:21:50 2010 -0400
913.3 @@ -1,7 +1,10 @@
913.4 /*
913.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
913.6 *
913.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
913.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
913.9 + *
913.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
913.11 + * Other names may be trademarks of their respective owners.
913.12 *
913.13 * The contents of this file are subject to the terms of either the GNU
913.14 * General Public License Version 2 only ("GPL") or the Common
913.15 @@ -13,9 +16,9 @@
913.16 * specific language governing permissions and limitations under the
913.17 * License. When distributing the software, include this License Header
913.18 * Notice in each file and include the License file at
913.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
913.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
913.21 * particular file as subject to the "Classpath" exception as provided
913.22 - * by Sun in the GPL Version 2 section of the License file that
913.23 + * by Oracle in the GPL Version 2 section of the License file that
913.24 * accompanied this code. If applicable, add the following below the
913.25 * License Header, with the fields enclosed by brackets [] replaced by
913.26 * your own identifying information:
914.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/DebuggerConsoleOperator.java Fri Jul 16 11:47:36 2010 -0400
914.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/DebuggerConsoleOperator.java Fri Jul 16 14:21:50 2010 -0400
914.3 @@ -1,7 +1,10 @@
914.4 /*
914.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
914.6 *
914.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
914.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
914.9 + *
914.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
914.11 + * Other names may be trademarks of their respective owners.
914.12 *
914.13 * The contents of this file are subject to the terms of either the GNU
914.14 * General Public License Version 2 only ("GPL") or the Common
914.15 @@ -13,9 +16,9 @@
914.16 * specific language governing permissions and limitations under the
914.17 * License. When distributing the software, include this License Header
914.18 * Notice in each file and include the License file at
914.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
914.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
914.21 * particular file as subject to the "Classpath" exception as provided
914.22 - * by Sun in the GPL Version 2 section of the License file that
914.23 + * by Oracle in the GPL Version 2 section of the License file that
914.24 * accompanied this code. If applicable, add the following below the
914.25 * License Header, with the fields enclosed by brackets [] replaced by
914.26 * your own identifying information:
915.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/DebuggerWindowOperator.java Fri Jul 16 11:47:36 2010 -0400
915.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/DebuggerWindowOperator.java Fri Jul 16 14:21:50 2010 -0400
915.3 @@ -1,7 +1,10 @@
915.4 /*
915.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
915.6 *
915.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
915.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
915.9 + *
915.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
915.11 + * Other names may be trademarks of their respective owners.
915.12 *
915.13 * The contents of this file are subject to the terms of either the GNU
915.14 * General Public License Version 2 only ("GPL") or the Common
915.15 @@ -13,9 +16,9 @@
915.16 * specific language governing permissions and limitations under the
915.17 * License. When distributing the software, include this License Header
915.18 * Notice in each file and include the License file at
915.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
915.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
915.21 * particular file as subject to the "Classpath" exception as provided
915.22 - * by Sun in the GPL Version 2 section of the License file that
915.23 + * by Oracle in the GPL Version 2 section of the License file that
915.24 * accompanied this code. If applicable, add the following below the
915.25 * License Header, with the fields enclosed by brackets [] replaced by
915.26 * your own identifying information:
916.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/TermOperator.java Fri Jul 16 11:47:36 2010 -0400
916.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/TermOperator.java Fri Jul 16 14:21:50 2010 -0400
916.3 @@ -1,7 +1,10 @@
916.4 /*
916.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
916.6 *
916.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
916.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
916.9 + *
916.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
916.11 + * Other names may be trademarks of their respective owners.
916.12 *
916.13 * The contents of this file are subject to the terms of either the GNU
916.14 * General Public License Version 2 only ("GPL") or the Common
916.15 @@ -13,9 +16,9 @@
916.16 * specific language governing permissions and limitations under the
916.17 * License. When distributing the software, include this License Header
916.18 * Notice in each file and include the License file at
916.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
916.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
916.21 * particular file as subject to the "Classpath" exception as provided
916.22 - * by Sun in the GPL Version 2 section of the License file that
916.23 + * by Oracle in the GPL Version 2 section of the License file that
916.24 * accompanied this code. If applicable, add the following below the
916.25 * License Header, with the fields enclosed by brackets [] replaced by
916.26 * your own identifying information:
917.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/AddBreakpointAction.java Fri Jul 16 11:47:36 2010 -0400
917.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/AddBreakpointAction.java Fri Jul 16 14:21:50 2010 -0400
917.3 @@ -1,7 +1,10 @@
917.4 /*
917.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
917.6 *
917.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
917.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
917.9 + *
917.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
917.11 + * Other names may be trademarks of their respective owners.
917.12 *
917.13 * The contents of this file are subject to the terms of either the GNU
917.14 * General Public License Version 2 only ("GPL") or the Common
917.15 @@ -13,9 +16,9 @@
917.16 * specific language governing permissions and limitations under the
917.17 * License. When distributing the software, include this License Header
917.18 * Notice in each file and include the License file at
917.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
917.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
917.21 * particular file as subject to the "Classpath" exception as provided
917.22 - * by Sun in the GPL Version 2 section of the License file that
917.23 + * by Oracle in the GPL Version 2 section of the License file that
917.24 * accompanied this code. If applicable, add the following below the
917.25 * License Header, with the fields enclosed by brackets [] replaced by
917.26 * your own identifying information:
918.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/AddWatchAction.java Fri Jul 16 11:47:36 2010 -0400
918.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/AddWatchAction.java Fri Jul 16 14:21:50 2010 -0400
918.3 @@ -1,7 +1,10 @@
918.4 /*
918.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
918.6 *
918.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
918.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
918.9 + *
918.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
918.11 + * Other names may be trademarks of their respective owners.
918.12 *
918.13 * The contents of this file are subject to the terms of either the GNU
918.14 * General Public License Version 2 only ("GPL") or the Common
918.15 @@ -13,9 +16,9 @@
918.16 * specific language governing permissions and limitations under the
918.17 * License. When distributing the software, include this License Header
918.18 * Notice in each file and include the License file at
918.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
918.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
918.21 * particular file as subject to the "Classpath" exception as provided
918.22 - * by Sun in the GPL Version 2 section of the License file that
918.23 + * by Oracle in the GPL Version 2 section of the License file that
918.24 * accompanied this code. If applicable, add the following below the
918.25 * License Header, with the fields enclosed by brackets [] replaced by
918.26 * your own identifying information:
919.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/ContinueDebugAction.java Fri Jul 16 11:47:36 2010 -0400
919.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/ContinueDebugAction.java Fri Jul 16 14:21:50 2010 -0400
919.3 @@ -1,7 +1,10 @@
919.4 /*
919.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
919.6 *
919.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
919.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
919.9 + *
919.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
919.11 + * Other names may be trademarks of their respective owners.
919.12 *
919.13 * The contents of this file are subject to the terms of either the GNU
919.14 * General Public License Version 2 only ("GPL") or the Common
919.15 @@ -13,9 +16,9 @@
919.16 * specific language governing permissions and limitations under the
919.17 * License. When distributing the software, include this License Header
919.18 * Notice in each file and include the License file at
919.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
919.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
919.21 * particular file as subject to the "Classpath" exception as provided
919.22 - * by Sun in the GPL Version 2 section of the License file that
919.23 + * by Oracle in the GPL Version 2 section of the License file that
919.24 * accompanied this code. If applicable, add the following below the
919.25 * License Header, with the fields enclosed by brackets [] replaced by
919.26 * your own identifying information:
920.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/DebuggerWindowAction.java Fri Jul 16 11:47:36 2010 -0400
920.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/DebuggerWindowAction.java Fri Jul 16 14:21:50 2010 -0400
920.3 @@ -1,7 +1,10 @@
920.4 /*
920.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
920.6 *
920.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
920.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
920.9 + *
920.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
920.11 + * Other names may be trademarks of their respective owners.
920.12 *
920.13 * The contents of this file are subject to the terms of either the GNU
920.14 * General Public License Version 2 only ("GPL") or the Common
920.15 @@ -13,9 +16,9 @@
920.16 * specific language governing permissions and limitations under the
920.17 * License. When distributing the software, include this License Header
920.18 * Notice in each file and include the License file at
920.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
920.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
920.21 * particular file as subject to the "Classpath" exception as provided
920.22 - * by Sun in the GPL Version 2 section of the License file that
920.23 + * by Oracle in the GPL Version 2 section of the License file that
920.24 * accompanied this code. If applicable, add the following below the
920.25 * License Header, with the fields enclosed by brackets [] replaced by
920.26 * your own identifying information:
921.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/FinishDebugAction.java Fri Jul 16 11:47:36 2010 -0400
921.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/FinishDebugAction.java Fri Jul 16 14:21:50 2010 -0400
921.3 @@ -1,7 +1,10 @@
921.4 /*
921.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
921.6 *
921.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
921.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
921.9 + *
921.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
921.11 + * Other names may be trademarks of their respective owners.
921.12 *
921.13 * The contents of this file are subject to the terms of either the GNU
921.14 * General Public License Version 2 only ("GPL") or the Common
921.15 @@ -13,9 +16,9 @@
921.16 * specific language governing permissions and limitations under the
921.17 * License. When distributing the software, include this License Header
921.18 * Notice in each file and include the License file at
921.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
921.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
921.21 * particular file as subject to the "Classpath" exception as provided
921.22 - * by Sun in the GPL Version 2 section of the License file that
921.23 + * by Oracle in the GPL Version 2 section of the License file that
921.24 * accompanied this code. If applicable, add the following below the
921.25 * License Header, with the fields enclosed by brackets [] replaced by
921.26 * your own identifying information:
922.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/PauseDebugAction.java Fri Jul 16 11:47:36 2010 -0400
922.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/PauseDebugAction.java Fri Jul 16 14:21:50 2010 -0400
922.3 @@ -1,7 +1,10 @@
922.4 /*
922.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
922.6 *
922.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
922.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
922.9 + *
922.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
922.11 + * Other names may be trademarks of their respective owners.
922.12 *
922.13 * The contents of this file are subject to the terms of either the GNU
922.14 * General Public License Version 2 only ("GPL") or the Common
922.15 @@ -13,9 +16,9 @@
922.16 * specific language governing permissions and limitations under the
922.17 * License. When distributing the software, include this License Header
922.18 * Notice in each file and include the License file at
922.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
922.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
922.21 * particular file as subject to the "Classpath" exception as provided
922.22 - * by Sun in the GPL Version 2 section of the License file that
922.23 + * by Oracle in the GPL Version 2 section of the License file that
922.24 * accompanied this code. If applicable, add the following below the
922.25 * License Header, with the fields enclosed by brackets [] replaced by
922.26 * your own identifying information:
923.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/RunToCursorAction.java Fri Jul 16 11:47:36 2010 -0400
923.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/RunToCursorAction.java Fri Jul 16 14:21:50 2010 -0400
923.3 @@ -1,7 +1,10 @@
923.4 /*
923.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
923.6 *
923.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
923.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
923.9 + *
923.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
923.11 + * Other names may be trademarks of their respective owners.
923.12 *
923.13 * The contents of this file are subject to the terms of either the GNU
923.14 * General Public License Version 2 only ("GPL") or the Common
923.15 @@ -13,9 +16,9 @@
923.16 * specific language governing permissions and limitations under the
923.17 * License. When distributing the software, include this License Header
923.18 * Notice in each file and include the License file at
923.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
923.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
923.21 * particular file as subject to the "Classpath" exception as provided
923.22 - * by Sun in the GPL Version 2 section of the License file that
923.23 + * by Oracle in the GPL Version 2 section of the License file that
923.24 * accompanied this code. If applicable, add the following below the
923.25 * License Header, with the fields enclosed by brackets [] replaced by
923.26 * your own identifying information:
924.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/StartDebugAction.java Fri Jul 16 11:47:36 2010 -0400
924.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/StartDebugAction.java Fri Jul 16 14:21:50 2010 -0400
924.3 @@ -1,7 +1,10 @@
924.4 /*
924.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
924.6 *
924.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
924.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
924.9 + *
924.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
924.11 + * Other names may be trademarks of their respective owners.
924.12 *
924.13 * The contents of this file are subject to the terms of either the GNU
924.14 * General Public License Version 2 only ("GPL") or the Common
924.15 @@ -13,9 +16,9 @@
924.16 * specific language governing permissions and limitations under the
924.17 * License. When distributing the software, include this License Header
924.18 * Notice in each file and include the License file at
924.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
924.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
924.21 * particular file as subject to the "Classpath" exception as provided
924.22 - * by Sun in the GPL Version 2 section of the License file that
924.23 + * by Oracle in the GPL Version 2 section of the License file that
924.24 * accompanied this code. If applicable, add the following below the
924.25 * License Header, with the fields enclosed by brackets [] replaced by
924.26 * your own identifying information:
925.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/StepIntoAction.java Fri Jul 16 11:47:36 2010 -0400
925.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/StepIntoAction.java Fri Jul 16 14:21:50 2010 -0400
925.3 @@ -1,7 +1,10 @@
925.4 /*
925.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
925.6 *
925.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
925.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
925.9 + *
925.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
925.11 + * Other names may be trademarks of their respective owners.
925.12 *
925.13 * The contents of this file are subject to the terms of either the GNU
925.14 * General Public License Version 2 only ("GPL") or the Common
925.15 @@ -13,9 +16,9 @@
925.16 * specific language governing permissions and limitations under the
925.17 * License. When distributing the software, include this License Header
925.18 * Notice in each file and include the License file at
925.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
925.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
925.21 * particular file as subject to the "Classpath" exception as provided
925.22 - * by Sun in the GPL Version 2 section of the License file that
925.23 + * by Oracle in the GPL Version 2 section of the License file that
925.24 * accompanied this code. If applicable, add the following below the
925.25 * License Header, with the fields enclosed by brackets [] replaced by
925.26 * your own identifying information:
926.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/StepOutAction.java Fri Jul 16 11:47:36 2010 -0400
926.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/StepOutAction.java Fri Jul 16 14:21:50 2010 -0400
926.3 @@ -1,7 +1,10 @@
926.4 /*
926.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
926.6 *
926.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
926.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
926.9 + *
926.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
926.11 + * Other names may be trademarks of their respective owners.
926.12 *
926.13 * The contents of this file are subject to the terms of either the GNU
926.14 * General Public License Version 2 only ("GPL") or the Common
926.15 @@ -13,9 +16,9 @@
926.16 * specific language governing permissions and limitations under the
926.17 * License. When distributing the software, include this License Header
926.18 * Notice in each file and include the License file at
926.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
926.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
926.21 * particular file as subject to the "Classpath" exception as provided
926.22 - * by Sun in the GPL Version 2 section of the License file that
926.23 + * by Oracle in the GPL Version 2 section of the License file that
926.24 * accompanied this code. If applicable, add the following below the
926.25 * License Header, with the fields enclosed by brackets [] replaced by
926.26 * your own identifying information:
927.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/StepOverAction.java Fri Jul 16 11:47:36 2010 -0400
927.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/StepOverAction.java Fri Jul 16 14:21:50 2010 -0400
927.3 @@ -1,7 +1,10 @@
927.4 /*
927.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
927.6 *
927.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
927.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
927.9 + *
927.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
927.11 + * Other names may be trademarks of their respective owners.
927.12 *
927.13 * The contents of this file are subject to the terms of either the GNU
927.14 * General Public License Version 2 only ("GPL") or the Common
927.15 @@ -13,9 +16,9 @@
927.16 * specific language governing permissions and limitations under the
927.17 * License. When distributing the software, include this License Header
927.18 * Notice in each file and include the License file at
927.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
927.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
927.21 * particular file as subject to the "Classpath" exception as provided
927.22 - * by Sun in the GPL Version 2 section of the License file that
927.23 + * by Oracle in the GPL Version 2 section of the License file that
927.24 * accompanied this code. If applicable, add the following below the
927.25 * License Header, with the fields enclosed by brackets [] replaced by
927.26 * your own identifying information:
928.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/ToggleBreakpointAction.java Fri Jul 16 11:47:36 2010 -0400
928.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/debugger/actions/ToggleBreakpointAction.java Fri Jul 16 14:21:50 2010 -0400
928.3 @@ -1,7 +1,10 @@
928.4 /*
928.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
928.6 *
928.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
928.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
928.9 + *
928.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
928.11 + * Other names may be trademarks of their respective owners.
928.12 *
928.13 * The contents of this file are subject to the terms of either the GNU
928.14 * General Public License Version 2 only ("GPL") or the Common
928.15 @@ -13,9 +16,9 @@
928.16 * specific language governing permissions and limitations under the
928.17 * License. When distributing the software, include this License Header
928.18 * Notice in each file and include the License file at
928.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
928.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
928.21 * particular file as subject to the "Classpath" exception as provided
928.22 - * by Sun in the GPL Version 2 section of the License file that
928.23 + * by Oracle in the GPL Version 2 section of the License file that
928.24 * accompanied this code. If applicable, add the following below the
928.25 * License Header, with the fields enclosed by brackets [] replaced by
928.26 * your own identifying information:
929.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/BHTableLayoutOperator.java Fri Jul 16 11:47:36 2010 -0400
929.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/BHTableLayoutOperator.java Fri Jul 16 14:21:50 2010 -0400
929.3 @@ -1,7 +1,10 @@
929.4 /*
929.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
929.6 *
929.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
929.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
929.9 +*
929.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
929.11 +* Other names may be trademarks of their respective owners.
929.12 *
929.13 * The contents of this file are subject to the terms of either the GNU
929.14 * General Public License Version 2 only ("GPL") or the Common
929.15 @@ -13,9 +16,9 @@
929.16 * specific language governing permissions and limitations under the
929.17 * License. When distributing the software, include this License Header
929.18 * Notice in each file and include the License file at
929.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
929.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
929.21 * particular file as subject to the "Classpath" exception as provided
929.22 -* by Sun in the GPL Version 2 section of the License file that
929.23 +* by Oracle in the GPL Version 2 section of the License file that
929.24 * accompanied this code. If applicable, add the following below the
929.25 * License Header, with the fields enclosed by brackets [] replaced by
929.26 * your own identifying information:
930.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/DesignerPaneOperator.java Fri Jul 16 11:47:36 2010 -0400
930.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/DesignerPaneOperator.java Fri Jul 16 14:21:50 2010 -0400
930.3 @@ -1,7 +1,10 @@
930.4 /*
930.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
930.6 *
930.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
930.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
930.9 +*
930.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
930.11 +* Other names may be trademarks of their respective owners.
930.12 *
930.13 * The contents of this file are subject to the terms of either the GNU
930.14 * General Public License Version 2 only ("GPL") or the Common
930.15 @@ -13,9 +16,9 @@
930.16 * specific language governing permissions and limitations under the
930.17 * License. When distributing the software, include this License Header
930.18 * Notice in each file and include the License file at
930.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
930.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
930.21 * particular file as subject to the "Classpath" exception as provided
930.22 -* by Sun in the GPL Version 2 section of the License file that
930.23 +* by Oracle in the GPL Version 2 section of the License file that
930.24 * accompanied this code. If applicable, add the following below the
930.25 * License Header, with the fields enclosed by brackets [] replaced by
930.26 * your own identifying information:
931.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/GeneralTableLayoutOperator.java Fri Jul 16 11:47:36 2010 -0400
931.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/GeneralTableLayoutOperator.java Fri Jul 16 14:21:50 2010 -0400
931.3 @@ -1,7 +1,10 @@
931.4 /*
931.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
931.6 *
931.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
931.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
931.9 +*
931.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
931.11 +* Other names may be trademarks of their respective owners.
931.12 *
931.13 * The contents of this file are subject to the terms of either the GNU
931.14 * General Public License Version 2 only ("GPL") or the Common
931.15 @@ -13,9 +16,9 @@
931.16 * specific language governing permissions and limitations under the
931.17 * License. When distributing the software, include this License Header
931.18 * Notice in each file and include the License file at
931.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
931.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
931.21 * particular file as subject to the "Classpath" exception as provided
931.22 -* by Sun in the GPL Version 2 section of the License file that
931.23 +* by Oracle in the GPL Version 2 section of the License file that
931.24 * accompanied this code. If applicable, add the following below the
931.25 * License Header, with the fields enclosed by brackets [] replaced by
931.26 * your own identifying information:
932.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/TableLayoutOperator.java Fri Jul 16 11:47:36 2010 -0400
932.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/TableLayoutOperator.java Fri Jul 16 14:21:50 2010 -0400
932.3 @@ -1,7 +1,10 @@
932.4 /*
932.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
932.6 *
932.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
932.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
932.9 +*
932.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
932.11 +* Other names may be trademarks of their respective owners.
932.12 *
932.13 * The contents of this file are subject to the terms of either the GNU
932.14 * General Public License Version 2 only ("GPL") or the Common
932.15 @@ -13,9 +16,9 @@
932.16 * specific language governing permissions and limitations under the
932.17 * License. When distributing the software, include this License Header
932.18 * Notice in each file and include the License file at
932.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
932.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
932.21 * particular file as subject to the "Classpath" exception as provided
932.22 -* by Sun in the GPL Version 2 section of the License file that
932.23 +* by Oracle in the GPL Version 2 section of the License file that
932.24 * accompanied this code. If applicable, add the following below the
932.25 * License Header, with the fields enclosed by brackets [] replaced by
932.26 * your own identifying information:
933.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/TrayOperator.java Fri Jul 16 11:47:36 2010 -0400
933.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/designer/TrayOperator.java Fri Jul 16 14:21:50 2010 -0400
933.3 @@ -1,7 +1,10 @@
933.4 /*
933.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
933.6 *
933.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
933.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
933.9 +*
933.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
933.11 +* Other names may be trademarks of their respective owners.
933.12 *
933.13 * The contents of this file are subject to the terms of either the GNU
933.14 * General Public License Version 2 only ("GPL") or the Common
933.15 @@ -13,9 +16,9 @@
933.16 * specific language governing permissions and limitations under the
933.17 * License. When distributing the software, include this License Header
933.18 * Notice in each file and include the License file at
933.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
933.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
933.21 * particular file as subject to the "Classpath" exception as provided
933.22 -* by Sun in the GPL Version 2 section of the License file that
933.23 +* by Oracle in the GPL Version 2 section of the License file that
933.24 * accompanied this code. If applicable, add the following below the
933.25 * License Header, with the fields enclosed by brackets [] replaced by
933.26 * your own identifying information:
934.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/Descriptor.java Fri Jul 16 11:47:36 2010 -0400
934.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/Descriptor.java Fri Jul 16 14:21:50 2010 -0400
934.3 @@ -1,7 +1,10 @@
934.4 /*
934.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
934.6 *
934.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
934.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
934.9 + *
934.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
934.11 + * Other names may be trademarks of their respective owners.
934.12 *
934.13 * The contents of this file are subject to the terms of either the GNU
934.14 * General Public License Version 2 only ("GPL") or the Common
934.15 @@ -13,9 +16,9 @@
934.16 * specific language governing permissions and limitations under the
934.17 * License. When distributing the software, include this License Header
934.18 * Notice in each file and include the License file at
934.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
934.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
934.21 * particular file as subject to the "Classpath" exception as provided
934.22 - * by Sun in the GPL Version 2 section of the License file that
934.23 + * by Oracle in the GPL Version 2 section of the License file that
934.24 * accompanied this code. If applicable, add the following below the
934.25 * License Header, with the fields enclosed by brackets [] replaced by
934.26 * your own identifying information:
935.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/ExternalProcess.java Fri Jul 16 11:47:36 2010 -0400
935.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/ExternalProcess.java Fri Jul 16 14:21:50 2010 -0400
935.3 @@ -1,7 +1,10 @@
935.4 /*
935.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
935.6 *
935.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
935.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
935.9 + *
935.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
935.11 + * Other names may be trademarks of their respective owners.
935.12 *
935.13 * The contents of this file are subject to the terms of either the GNU
935.14 * General Public License Version 2 only ("GPL") or the Common
935.15 @@ -13,9 +16,9 @@
935.16 * specific language governing permissions and limitations under the
935.17 * License. When distributing the software, include this License Header
935.18 * Notice in each file and include the License file at
935.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
935.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
935.21 * particular file as subject to the "Classpath" exception as provided
935.22 - * by Sun in the GPL Version 2 section of the License file that
935.23 + * by Oracle in the GPL Version 2 section of the License file that
935.24 * accompanied this code. If applicable, add the following below the
935.25 * License Header, with the fields enclosed by brackets [] replaced by
935.26 * your own identifying information:
936.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/IDE.java Fri Jul 16 11:47:36 2010 -0400
936.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/IDE.java Fri Jul 16 14:21:50 2010 -0400
936.3 @@ -1,7 +1,10 @@
936.4 /*
936.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
936.6 *
936.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
936.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
936.9 + *
936.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
936.11 + * Other names may be trademarks of their respective owners.
936.12 *
936.13 * The contents of this file are subject to the terms of either the GNU
936.14 * General Public License Version 2 only ("GPL") or the Common
936.15 @@ -13,9 +16,9 @@
936.16 * specific language governing permissions and limitations under the
936.17 * License. When distributing the software, include this License Header
936.18 * Notice in each file and include the License file at
936.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
936.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
936.21 * particular file as subject to the "Classpath" exception as provided
936.22 - * by Sun in the GPL Version 2 section of the License file that
936.23 + * by Oracle in the GPL Version 2 section of the License file that
936.24 * accompanied this code. If applicable, add the following below the
936.25 * License Header, with the fields enclosed by brackets [] replaced by
936.26 * your own identifying information:
937.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/BasicComponentSet.java Fri Jul 16 11:47:36 2010 -0400
937.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/BasicComponentSet.java Fri Jul 16 14:21:50 2010 -0400
937.3 @@ -1,7 +1,10 @@
937.4 /*
937.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
937.6 *
937.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
937.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
937.9 + *
937.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
937.11 + * Other names may be trademarks of their respective owners.
937.12 *
937.13 * The contents of this file are subject to the terms of either the GNU
937.14 * General Public License Version 2 only ("GPL") or the Common
937.15 @@ -13,9 +16,9 @@
937.16 * specific language governing permissions and limitations under the
937.17 * License. When distributing the software, include this License Header
937.18 * Notice in each file and include the License file at
937.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
937.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
937.21 * particular file as subject to the "Classpath" exception as provided
937.22 - * by Sun in the GPL Version 2 section of the License file that
937.23 + * by Oracle in the GPL Version 2 section of the License file that
937.24 * accompanied this code. If applicable, add the following below the
937.25 * License Header, with the fields enclosed by brackets [] replaced by
937.26 * your own identifying information:
938.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
938.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
938.3 @@ -2,7 +2,10 @@
938.4
938.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
938.6 *
938.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
938.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
938.9 + *
938.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
938.11 + * Other names may be trademarks of their respective owners.
938.12
938.13 *
938.14 * The contents of this file are subject to the terms of either the GNU
938.15 @@ -15,9 +18,9 @@
938.16 * specific language governing permissions and limitations under the
938.17 * License. When distributing the software, include this License Header
938.18 * Notice in each file and include the License file at
938.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
938.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
938.21 * particular file as subject to the "Classpath" exception as provided
938.22 - * by Sun in the GPL Version 2 section of the License file that
938.23 + * by Oracle in the GPL Version 2 section of the License file that
938.24 * accompanied this code. If applicable, add the following below the
938.25 * License Header, with the fields enclosed by brackets [] replaced by
938.26 * your own identifying information:
939.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/ButtonComponent.java Fri Jul 16 11:47:36 2010 -0400
939.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/ButtonComponent.java Fri Jul 16 14:21:50 2010 -0400
939.3 @@ -1,7 +1,10 @@
939.4 /*
939.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
939.6 *
939.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
939.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
939.9 + *
939.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
939.11 + * Other names may be trademarks of their respective owners.
939.12 *
939.13 * The contents of this file are subject to the terms of either the GNU
939.14 * General Public License Version 2 only ("GPL") or the Common
939.15 @@ -13,9 +16,9 @@
939.16 * specific language governing permissions and limitations under the
939.17 * License. When distributing the software, include this License Header
939.18 * Notice in each file and include the License file at
939.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
939.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
939.21 * particular file as subject to the "Classpath" exception as provided
939.22 - * by Sun in the GPL Version 2 section of the License file that
939.23 + * by Oracle in the GPL Version 2 section of the License file that
939.24 * accompanied this code. If applicable, add the following below the
939.25 * License Header, with the fields enclosed by brackets [] replaced by
939.26 * your own identifying information:
940.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/CodeClipComponent.java Fri Jul 16 11:47:36 2010 -0400
940.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/CodeClipComponent.java Fri Jul 16 14:21:50 2010 -0400
940.3 @@ -1,7 +1,10 @@
940.4 /*
940.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
940.6 *
940.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
940.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
940.9 + *
940.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
940.11 + * Other names may be trademarks of their respective owners.
940.12 *
940.13 * The contents of this file are subject to the terms of either the GNU
940.14 * General Public License Version 2 only ("GPL") or the Common
940.15 @@ -13,9 +16,9 @@
940.16 * specific language governing permissions and limitations under the
940.17 * License. When distributing the software, include this License Header
940.18 * Notice in each file and include the License file at
940.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
940.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
940.21 * particular file as subject to the "Classpath" exception as provided
940.22 - * by Sun in the GPL Version 2 section of the License file that
940.23 + * by Oracle in the GPL Version 2 section of the License file that
940.24 * accompanied this code. If applicable, add the following below the
940.25 * License Header, with the fields enclosed by brackets [] replaced by
940.26 * your own identifying information:
941.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/ComponentSet.java Fri Jul 16 11:47:36 2010 -0400
941.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/ComponentSet.java Fri Jul 16 14:21:50 2010 -0400
941.3 @@ -1,7 +1,10 @@
941.4 /*
941.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
941.6 *
941.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
941.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
941.9 + *
941.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
941.11 + * Other names may be trademarks of their respective owners.
941.12 *
941.13 * The contents of this file are subject to the terms of either the GNU
941.14 * General Public License Version 2 only ("GPL") or the Common
941.15 @@ -13,9 +16,9 @@
941.16 * specific language governing permissions and limitations under the
941.17 * License. When distributing the software, include this License Header
941.18 * Notice in each file and include the License file at
941.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
941.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
941.21 * particular file as subject to the "Classpath" exception as provided
941.22 - * by Sun in the GPL Version 2 section of the License file that
941.23 + * by Oracle in the GPL Version 2 section of the License file that
941.24 * accompanied this code. If applicable, add the following below the
941.25 * License Header, with the fields enclosed by brackets [] replaced by
941.26 * your own identifying information:
942.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/DropDownListComponent.java Fri Jul 16 11:47:36 2010 -0400
942.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/DropDownListComponent.java Fri Jul 16 14:21:50 2010 -0400
942.3 @@ -1,7 +1,10 @@
942.4 /*
942.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
942.6 *
942.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
942.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
942.9 + *
942.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
942.11 + * Other names may be trademarks of their respective owners.
942.12 *
942.13 * The contents of this file are subject to the terms of either the GNU
942.14 * General Public License Version 2 only ("GPL") or the Common
942.15 @@ -13,9 +16,9 @@
942.16 * specific language governing permissions and limitations under the
942.17 * License. When distributing the software, include this License Header
942.18 * Notice in each file and include the License file at
942.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
942.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
942.21 * particular file as subject to the "Classpath" exception as provided
942.22 - * by Sun in the GPL Version 2 section of the License file that
942.23 + * by Oracle in the GPL Version 2 section of the License file that
942.24 * accompanied this code. If applicable, add the following below the
942.25 * License Header, with the fields enclosed by brackets [] replaced by
942.26 * your own identifying information:
943.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/LabelComponent.java Fri Jul 16 11:47:36 2010 -0400
943.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/LabelComponent.java Fri Jul 16 14:21:50 2010 -0400
943.3 @@ -1,7 +1,10 @@
943.4 /*
943.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
943.6 *
943.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
943.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
943.9 + *
943.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
943.11 + * Other names may be trademarks of their respective owners.
943.12 *
943.13 * The contents of this file are subject to the terms of either the GNU
943.14 * General Public License Version 2 only ("GPL") or the Common
943.15 @@ -13,9 +16,9 @@
943.16 * specific language governing permissions and limitations under the
943.17 * License. When distributing the software, include this License Header
943.18 * Notice in each file and include the License file at
943.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
943.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
943.21 * particular file as subject to the "Classpath" exception as provided
943.22 - * by Sun in the GPL Version 2 section of the License file that
943.23 + * by Oracle in the GPL Version 2 section of the License file that
943.24 * accompanied this code. If applicable, add the following below the
943.25 * License Header, with the fields enclosed by brackets [] replaced by
943.26 * your own identifying information:
944.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/PaletteComponent.java Fri Jul 16 11:47:36 2010 -0400
944.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/PaletteComponent.java Fri Jul 16 14:21:50 2010 -0400
944.3 @@ -1,7 +1,10 @@
944.4 /*
944.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
944.6 *
944.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
944.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
944.9 + *
944.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
944.11 + * Other names may be trademarks of their respective owners.
944.12 *
944.13 * The contents of this file are subject to the terms of either the GNU
944.14 * General Public License Version 2 only ("GPL") or the Common
944.15 @@ -13,9 +16,9 @@
944.16 * specific language governing permissions and limitations under the
944.17 * License. When distributing the software, include this License Header
944.18 * Notice in each file and include the License file at
944.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
944.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
944.21 * particular file as subject to the "Classpath" exception as provided
944.22 - * by Sun in the GPL Version 2 section of the License file that
944.23 + * by Oracle in the GPL Version 2 section of the License file that
944.24 * accompanied this code. If applicable, add the following below the
944.25 * License Header, with the fields enclosed by brackets [] replaced by
944.26 * your own identifying information:
945.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/StaticTextComponent.java Fri Jul 16 11:47:36 2010 -0400
945.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/StaticTextComponent.java Fri Jul 16 14:21:50 2010 -0400
945.3 @@ -1,7 +1,10 @@
945.4 /*
945.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
945.6 *
945.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
945.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
945.9 + *
945.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
945.11 + * Other names may be trademarks of their respective owners.
945.12 *
945.13 * The contents of this file are subject to the terms of either the GNU
945.14 * General Public License Version 2 only ("GPL") or the Common
945.15 @@ -13,9 +16,9 @@
945.16 * specific language governing permissions and limitations under the
945.17 * License. When distributing the software, include this License Header
945.18 * Notice in each file and include the License file at
945.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
945.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
945.21 * particular file as subject to the "Classpath" exception as provided
945.22 - * by Sun in the GPL Version 2 section of the License file that
945.23 + * by Oracle in the GPL Version 2 section of the License file that
945.24 * accompanied this code. If applicable, add the following below the
945.25 * License Header, with the fields enclosed by brackets [] replaced by
945.26 * your own identifying information:
946.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/TableComponent.java Fri Jul 16 11:47:36 2010 -0400
946.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/TableComponent.java Fri Jul 16 14:21:50 2010 -0400
946.3 @@ -1,7 +1,10 @@
946.4 /*
946.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
946.6 *
946.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
946.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
946.9 + *
946.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
946.11 + * Other names may be trademarks of their respective owners.
946.12 *
946.13 * The contents of this file are subject to the terms of either the GNU
946.14 * General Public License Version 2 only ("GPL") or the Common
946.15 @@ -13,9 +16,9 @@
946.16 * specific language governing permissions and limitations under the
946.17 * License. When distributing the software, include this License Header
946.18 * Notice in each file and include the License file at
946.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
946.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
946.21 * particular file as subject to the "Classpath" exception as provided
946.22 - * by Sun in the GPL Version 2 section of the License file that
946.23 + * by Oracle in the GPL Version 2 section of the License file that
946.24 * accompanied this code. If applicable, add the following below the
946.25 * License Header, with the fields enclosed by brackets [] replaced by
946.26 * your own identifying information:
947.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/TextFieldComponent.java Fri Jul 16 11:47:36 2010 -0400
947.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/TextFieldComponent.java Fri Jul 16 14:21:50 2010 -0400
947.3 @@ -1,7 +1,10 @@
947.4 /*
947.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
947.6 *
947.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
947.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
947.9 + *
947.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
947.11 + * Other names may be trademarks of their respective owners.
947.12 *
947.13 * The contents of this file are subject to the terms of either the GNU
947.14 * General Public License Version 2 only ("GPL") or the Common
947.15 @@ -13,9 +16,9 @@
947.16 * specific language governing permissions and limitations under the
947.17 * License. When distributing the software, include this License Header
947.18 * Notice in each file and include the License file at
947.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
947.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
947.21 * particular file as subject to the "Classpath" exception as provided
947.22 - * by Sun in the GPL Version 2 section of the License file that
947.23 + * by Oracle in the GPL Version 2 section of the License file that
947.24 * accompanied this code. If applicable, add the following below the
947.25 * License Header, with the fields enclosed by brackets [] replaced by
947.26 * your own identifying information:
948.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/WebComponent.java Fri Jul 16 11:47:36 2010 -0400
948.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/components/WebComponent.java Fri Jul 16 14:21:50 2010 -0400
948.3 @@ -1,7 +1,10 @@
948.4 /*
948.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
948.6 *
948.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
948.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
948.9 + *
948.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
948.11 + * Other names may be trademarks of their respective owners.
948.12 *
948.13 * The contents of this file are subject to the terms of either the GNU
948.14 * General Public License Version 2 only ("GPL") or the Common
948.15 @@ -13,9 +16,9 @@
948.16 * specific language governing permissions and limitations under the
948.17 * License. When distributing the software, include this License Header
948.18 * Notice in each file and include the License file at
948.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
948.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
948.21 * particular file as subject to the "Classpath" exception as provided
948.22 - * by Sun in the GPL Version 2 section of the License file that
948.23 + * by Oracle in the GPL Version 2 section of the License file that
948.24 * accompanied this code. If applicable, add the following below the
948.25 * License Header, with the fields enclosed by brackets [] replaced by
948.26 * your own identifying information:
949.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/ApplicationServer.java Fri Jul 16 11:47:36 2010 -0400
949.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/ApplicationServer.java Fri Jul 16 14:21:50 2010 -0400
949.3 @@ -1,7 +1,10 @@
949.4 /*
949.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
949.6 *
949.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
949.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
949.9 + *
949.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
949.11 + * Other names may be trademarks of their respective owners.
949.12 *
949.13 * The contents of this file are subject to the terms of either the GNU
949.14 * General Public License Version 2 only ("GPL") or the Common
949.15 @@ -13,9 +16,9 @@
949.16 * specific language governing permissions and limitations under the
949.17 * License. When distributing the software, include this License Header
949.18 * Notice in each file and include the License file at
949.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
949.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
949.21 * particular file as subject to the "Classpath" exception as provided
949.22 - * by Sun in the GPL Version 2 section of the License file that
949.23 + * by Oracle in the GPL Version 2 section of the License file that
949.24 * accompanied this code. If applicable, add the following below the
949.25 * License Header, with the fields enclosed by brackets [] replaced by
949.26 * your own identifying information:
950.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DefaultDeploymentTargetFactory.java Fri Jul 16 11:47:36 2010 -0400
950.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DefaultDeploymentTargetFactory.java Fri Jul 16 14:21:50 2010 -0400
950.3 @@ -1,7 +1,10 @@
950.4 /*
950.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
950.6 *
950.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
950.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
950.9 + *
950.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
950.11 + * Other names may be trademarks of their respective owners.
950.12 *
950.13 * The contents of this file are subject to the terms of either the GNU
950.14 * General Public License Version 2 only ("GPL") or the Common
950.15 @@ -13,9 +16,9 @@
950.16 * specific language governing permissions and limitations under the
950.17 * License. When distributing the software, include this License Header
950.18 * Notice in each file and include the License file at
950.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
950.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
950.21 * particular file as subject to the "Classpath" exception as provided
950.22 - * by Sun in the GPL Version 2 section of the License file that
950.23 + * by Oracle in the GPL Version 2 section of the License file that
950.24 * accompanied this code. If applicable, add the following below the
950.25 * License Header, with the fields enclosed by brackets [] replaced by
950.26 * your own identifying information:
951.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DeploymentTarget.java Fri Jul 16 11:47:36 2010 -0400
951.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DeploymentTarget.java Fri Jul 16 14:21:50 2010 -0400
951.3 @@ -1,7 +1,10 @@
951.4 /*
951.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
951.6 *
951.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
951.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
951.9 + *
951.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
951.11 + * Other names may be trademarks of their respective owners.
951.12 *
951.13 * The contents of this file are subject to the terms of either the GNU
951.14 * General Public License Version 2 only ("GPL") or the Common
951.15 @@ -13,9 +16,9 @@
951.16 * specific language governing permissions and limitations under the
951.17 * License. When distributing the software, include this License Header
951.18 * Notice in each file and include the License file at
951.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
951.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
951.21 * particular file as subject to the "Classpath" exception as provided
951.22 - * by Sun in the GPL Version 2 section of the License file that
951.23 + * by Oracle in the GPL Version 2 section of the License file that
951.24 * accompanied this code. If applicable, add the following below the
951.25 * License Header, with the fields enclosed by brackets [] replaced by
951.26 * your own identifying information:
952.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DeploymentTargetDescriptor.java Fri Jul 16 11:47:36 2010 -0400
952.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DeploymentTargetDescriptor.java Fri Jul 16 14:21:50 2010 -0400
952.3 @@ -1,7 +1,10 @@
952.4 /*
952.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
952.6 *
952.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
952.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
952.9 + *
952.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
952.11 + * Other names may be trademarks of their respective owners.
952.12 *
952.13 * The contents of this file are subject to the terms of either the GNU
952.14 * General Public License Version 2 only ("GPL") or the Common
952.15 @@ -13,9 +16,9 @@
952.16 * specific language governing permissions and limitations under the
952.17 * License. When distributing the software, include this License Header
952.18 * Notice in each file and include the License file at
952.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
952.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
952.21 * particular file as subject to the "Classpath" exception as provided
952.22 - * by Sun in the GPL Version 2 section of the License file that
952.23 + * by Oracle in the GPL Version 2 section of the License file that
952.24 * accompanied this code. If applicable, add the following below the
952.25 * License Header, with the fields enclosed by brackets [] replaced by
952.26 * your own identifying information:
953.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DeploymentTargetFactory.java Fri Jul 16 11:47:36 2010 -0400
953.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DeploymentTargetFactory.java Fri Jul 16 14:21:50 2010 -0400
953.3 @@ -1,7 +1,10 @@
953.4 /*
953.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
953.6 *
953.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
953.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
953.9 + *
953.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
953.11 + * Other names may be trademarks of their respective owners.
953.12 *
953.13 * The contents of this file are subject to the terms of either the GNU
953.14 * General Public License Version 2 only ("GPL") or the Common
953.15 @@ -13,9 +16,9 @@
953.16 * specific language governing permissions and limitations under the
953.17 * License. When distributing the software, include this License Header
953.18 * Notice in each file and include the License file at
953.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
953.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
953.21 * particular file as subject to the "Classpath" exception as provided
953.22 - * by Sun in the GPL Version 2 section of the License file that
953.23 + * by Oracle in the GPL Version 2 section of the License file that
953.24 * accompanied this code. If applicable, add the following below the
953.25 * License Header, with the fields enclosed by brackets [] replaced by
953.26 * your own identifying information:
954.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DeploymentTargetList.java Fri Jul 16 11:47:36 2010 -0400
954.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/DeploymentTargetList.java Fri Jul 16 14:21:50 2010 -0400
954.3 @@ -1,7 +1,10 @@
954.4 /*
954.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
954.6 *
954.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
954.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
954.9 + *
954.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
954.11 + * Other names may be trademarks of their respective owners.
954.12 *
954.13 * The contents of this file are subject to the terms of either the GNU
954.14 * General Public License Version 2 only ("GPL") or the Common
954.15 @@ -13,9 +16,9 @@
954.16 * specific language governing permissions and limitations under the
954.17 * License. When distributing the software, include this License Header
954.18 * Notice in each file and include the License file at
954.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
954.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
954.21 * particular file as subject to the "Classpath" exception as provided
954.22 - * by Sun in the GPL Version 2 section of the License file that
954.23 + * by Oracle in the GPL Version 2 section of the License file that
954.24 * accompanied this code. If applicable, add the following below the
954.25 * License Header, with the fields enclosed by brackets [] replaced by
954.26 * your own identifying information:
955.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/JBoss4.java Fri Jul 16 11:47:36 2010 -0400
955.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/JBoss4.java Fri Jul 16 14:21:50 2010 -0400
955.3 @@ -1,7 +1,10 @@
955.4 /*
955.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
955.6 *
955.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
955.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
955.9 + *
955.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
955.11 + * Other names may be trademarks of their respective owners.
955.12 *
955.13 * The contents of this file are subject to the terms of either the GNU
955.14 * General Public License Version 2 only ("GPL") or the Common
955.15 @@ -13,9 +16,9 @@
955.16 * specific language governing permissions and limitations under the
955.17 * License. When distributing the software, include this License Header
955.18 * Notice in each file and include the License file at
955.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
955.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
955.21 * particular file as subject to the "Classpath" exception as provided
955.22 - * by Sun in the GPL Version 2 section of the License file that
955.23 + * by Oracle in the GPL Version 2 section of the License file that
955.24 * accompanied this code. If applicable, add the following below the
955.25 * License Header, with the fields enclosed by brackets [] replaced by
955.26 * your own identifying information:
956.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/SunApplicationServer.java Fri Jul 16 11:47:36 2010 -0400
956.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/SunApplicationServer.java Fri Jul 16 14:21:50 2010 -0400
956.3 @@ -1,7 +1,10 @@
956.4 /*
956.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
956.6 *
956.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
956.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
956.9 + *
956.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
956.11 + * Other names may be trademarks of their respective owners.
956.12 *
956.13 * The contents of this file are subject to the terms of either the GNU
956.14 * General Public License Version 2 only ("GPL") or the Common
956.15 @@ -13,9 +16,9 @@
956.16 * specific language governing permissions and limitations under the
956.17 * License. When distributing the software, include this License Header
956.18 * Notice in each file and include the License file at
956.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
956.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
956.21 * particular file as subject to the "Classpath" exception as provided
956.22 - * by Sun in the GPL Version 2 section of the License file that
956.23 + * by Oracle in the GPL Version 2 section of the License file that
956.24 * accompanied this code. If applicable, add the following below the
956.25 * License Header, with the fields enclosed by brackets [] replaced by
956.26 * your own identifying information:
957.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/Tomcat50.java Fri Jul 16 11:47:36 2010 -0400
957.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/Tomcat50.java Fri Jul 16 14:21:50 2010 -0400
957.3 @@ -1,7 +1,10 @@
957.4 /*
957.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
957.6 *
957.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
957.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
957.9 + *
957.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
957.11 + * Other names may be trademarks of their respective owners.
957.12 *
957.13 * The contents of this file are subject to the terms of either the GNU
957.14 * General Public License Version 2 only ("GPL") or the Common
957.15 @@ -13,9 +16,9 @@
957.16 * specific language governing permissions and limitations under the
957.17 * License. When distributing the software, include this License Header
957.18 * Notice in each file and include the License file at
957.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
957.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
957.21 * particular file as subject to the "Classpath" exception as provided
957.22 - * by Sun in the GPL Version 2 section of the License file that
957.23 + * by Oracle in the GPL Version 2 section of the License file that
957.24 * accompanied this code. If applicable, add the following below the
957.25 * License Header, with the fields enclosed by brackets [] replaced by
957.26 * your own identifying information:
958.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/Tomcat55.java Fri Jul 16 11:47:36 2010 -0400
958.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/Tomcat55.java Fri Jul 16 14:21:50 2010 -0400
958.3 @@ -1,7 +1,10 @@
958.4 /*
958.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
958.6 *
958.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
958.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
958.9 + *
958.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
958.11 + * Other names may be trademarks of their respective owners.
958.12 *
958.13 * The contents of this file are subject to the terms of either the GNU
958.14 * General Public License Version 2 only ("GPL") or the Common
958.15 @@ -13,9 +16,9 @@
958.16 * specific language governing permissions and limitations under the
958.17 * License. When distributing the software, include this License Header
958.18 * Notice in each file and include the License file at
958.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
958.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
958.21 * particular file as subject to the "Classpath" exception as provided
958.22 - * by Sun in the GPL Version 2 section of the License file that
958.23 + * by Oracle in the GPL Version 2 section of the License file that
958.24 * accompanied this code. If applicable, add the following below the
958.25 * License Header, with the fields enclosed by brackets [] replaced by
958.26 * your own identifying information:
959.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/Tomcat60.java Fri Jul 16 11:47:36 2010 -0400
959.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/Tomcat60.java Fri Jul 16 14:21:50 2010 -0400
959.3 @@ -1,7 +1,10 @@
959.4 /*
959.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
959.6 *
959.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
959.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
959.9 + *
959.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
959.11 + * Other names may be trademarks of their respective owners.
959.12 *
959.13 * The contents of this file are subject to the terms of either the GNU
959.14 * General Public License Version 2 only ("GPL") or the Common
959.15 @@ -13,9 +16,9 @@
959.16 * specific language governing permissions and limitations under the
959.17 * License. When distributing the software, include this License Header
959.18 * Notice in each file and include the License file at
959.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
959.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
959.21 * particular file as subject to the "Classpath" exception as provided
959.22 - * by Sun in the GPL Version 2 section of the License file that
959.23 + * by Oracle in the GPL Version 2 section of the License file that
959.24 * accompanied this code. If applicable, add the following below the
959.25 * License Header, with the fields enclosed by brackets [] replaced by
959.26 * your own identifying information:
960.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/WebLogic9.java Fri Jul 16 11:47:36 2010 -0400
960.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/deployment/WebLogic9.java Fri Jul 16 14:21:50 2010 -0400
960.3 @@ -1,7 +1,10 @@
960.4 /*
960.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
960.6 *
960.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
960.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
960.9 + *
960.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
960.11 + * Other names may be trademarks of their respective owners.
960.12 *
960.13 * The contents of this file are subject to the terms of either the GNU
960.14 * General Public License Version 2 only ("GPL") or the Common
960.15 @@ -13,9 +16,9 @@
960.16 * specific language governing permissions and limitations under the
960.17 * License. When distributing the software, include this License Header
960.18 * Notice in each file and include the License file at
960.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
960.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
960.21 * particular file as subject to the "Classpath" exception as provided
960.22 - * by Sun in the GPL Version 2 section of the License file that
960.23 + * by Oracle in the GPL Version 2 section of the License file that
960.24 * accompanied this code. If applicable, add the following below the
960.25 * License Header, with the fields enclosed by brackets [] replaced by
960.26 * your own identifying information:
961.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
961.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
961.3 @@ -2,7 +2,10 @@
961.4
961.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
961.6 *
961.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
961.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
961.9 + *
961.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
961.11 + * Other names may be trademarks of their respective owners.
961.12
961.13 *
961.14 * The contents of this file are subject to the terms of either the GNU
961.15 @@ -15,9 +18,9 @@
961.16 * specific language governing permissions and limitations under the
961.17 * License. When distributing the software, include this License Header
961.18 * Notice in each file and include the License file at
961.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
961.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
961.21 * particular file as subject to the "Classpath" exception as provided
961.22 - * by Sun in the GPL Version 2 section of the License file that
961.23 + * by Oracle in the GPL Version 2 section of the License file that
961.24 * accompanied this code. If applicable, add the following below the
961.25 * License Header, with the fields enclosed by brackets [] replaced by
961.26 * your own identifying information:
962.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/Link.java Fri Jul 16 11:47:36 2010 -0400
962.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/Link.java Fri Jul 16 14:21:50 2010 -0400
962.3 @@ -1,7 +1,10 @@
962.4 /*
962.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
962.6 *
962.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
962.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
962.9 + *
962.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
962.11 + * Other names may be trademarks of their respective owners.
962.12 *
962.13 * The contents of this file are subject to the terms of either the GNU
962.14 * General Public License Version 2 only ("GPL") or the Common
962.15 @@ -13,9 +16,9 @@
962.16 * specific language governing permissions and limitations under the
962.17 * License. When distributing the software, include this License Header
962.18 * Notice in each file and include the License file at
962.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
962.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
962.21 * particular file as subject to the "Classpath" exception as provided
962.22 - * by Sun in the GPL Version 2 section of the License file that
962.23 + * by Oracle in the GPL Version 2 section of the License file that
962.24 * accompanied this code. If applicable, add the following below the
962.25 * License Header, with the fields enclosed by brackets [] replaced by
962.26 * your own identifying information:
963.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/LinkManager.java Fri Jul 16 11:47:36 2010 -0400
963.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/LinkManager.java Fri Jul 16 14:21:50 2010 -0400
963.3 @@ -1,7 +1,10 @@
963.4 /*
963.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
963.6 *
963.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
963.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
963.9 + *
963.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
963.11 + * Other names may be trademarks of their respective owners.
963.12 *
963.13 * The contents of this file are subject to the terms of either the GNU
963.14 * General Public License Version 2 only ("GPL") or the Common
963.15 @@ -13,9 +16,9 @@
963.16 * specific language governing permissions and limitations under the
963.17 * License. When distributing the software, include this License Header
963.18 * Notice in each file and include the License file at
963.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
963.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
963.21 * particular file as subject to the "Classpath" exception as provided
963.22 - * by Sun in the GPL Version 2 section of the License file that
963.23 + * by Oracle in the GPL Version 2 section of the License file that
963.24 * accompanied this code. If applicable, add the following below the
963.25 * License Header, with the fields enclosed by brackets [] replaced by
963.26 * your own identifying information:
964.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/LinkableSource.java Fri Jul 16 11:47:36 2010 -0400
964.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/LinkableSource.java Fri Jul 16 14:21:50 2010 -0400
964.3 @@ -1,7 +1,10 @@
964.4 /*
964.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
964.6 *
964.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
964.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
964.9 + *
964.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
964.11 + * Other names may be trademarks of their respective owners.
964.12 *
964.13 * The contents of this file are subject to the terms of either the GNU
964.14 * General Public License Version 2 only ("GPL") or the Common
964.15 @@ -13,9 +16,9 @@
964.16 * specific language governing permissions and limitations under the
964.17 * License. When distributing the software, include this License Header
964.18 * Notice in each file and include the License file at
964.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
964.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
964.21 * particular file as subject to the "Classpath" exception as provided
964.22 - * by Sun in the GPL Version 2 section of the License file that
964.23 + * by Oracle in the GPL Version 2 section of the License file that
964.24 * accompanied this code. If applicable, add the following below the
964.25 * License Header, with the fields enclosed by brackets [] replaced by
964.26 * your own identifying information:
965.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/LinkableTarget.java Fri Jul 16 11:47:36 2010 -0400
965.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/navigation/LinkableTarget.java Fri Jul 16 14:21:50 2010 -0400
965.3 @@ -1,7 +1,10 @@
965.4 /*
965.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
965.6 *
965.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
965.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
965.9 + *
965.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
965.11 + * Other names may be trademarks of their respective owners.
965.12 *
965.13 * The contents of this file are subject to the terms of either the GNU
965.14 * General Public License Version 2 only ("GPL") or the Common
965.15 @@ -13,9 +16,9 @@
965.16 * specific language governing permissions and limitations under the
965.17 * License. When distributing the software, include this License Header
965.18 * Notice in each file and include the License file at
965.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
965.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
965.21 * particular file as subject to the "Classpath" exception as provided
965.22 - * by Sun in the GPL Version 2 section of the License file that
965.23 + * by Oracle in the GPL Version 2 section of the License file that
965.24 * accompanied this code. If applicable, add the following below the
965.25 * License Header, with the fields enclosed by brackets [] replaced by
965.26 * your own identifying information:
966.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
966.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
966.3 @@ -2,7 +2,10 @@
966.4
966.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
966.6 *
966.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
966.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
966.9 + *
966.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
966.11 + * Other names may be trademarks of their respective owners.
966.12
966.13 *
966.14 * The contents of this file are subject to the terms of either the GNU
966.15 @@ -15,9 +18,9 @@
966.16 * specific language governing permissions and limitations under the
966.17 * License. When distributing the software, include this License Header
966.18 * Notice in each file and include the License file at
966.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
966.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
966.21 * particular file as subject to the "Classpath" exception as provided
966.22 - * by Sun in the GPL Version 2 section of the License file that
966.23 + * by Oracle in the GPL Version 2 section of the License file that
966.24 * accompanied this code. If applicable, add the following below the
966.25 * License Header, with the fields enclosed by brackets [] replaced by
966.26 * your own identifying information:
967.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/DefaultProjectFactory.java Fri Jul 16 11:47:36 2010 -0400
967.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/DefaultProjectFactory.java Fri Jul 16 14:21:50 2010 -0400
967.3 @@ -1,7 +1,10 @@
967.4 /*
967.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
967.6 *
967.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
967.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
967.9 + *
967.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
967.11 + * Other names may be trademarks of their respective owners.
967.12 *
967.13 * The contents of this file are subject to the terms of either the GNU
967.14 * General Public License Version 2 only ("GPL") or the Common
967.15 @@ -13,9 +16,9 @@
967.16 * specific language governing permissions and limitations under the
967.17 * License. When distributing the software, include this License Header
967.18 * Notice in each file and include the License file at
967.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
967.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
967.21 * particular file as subject to the "Classpath" exception as provided
967.22 - * by Sun in the GPL Version 2 section of the License file that
967.23 + * by Oracle in the GPL Version 2 section of the License file that
967.24 * accompanied this code. If applicable, add the following below the
967.25 * License Header, with the fields enclosed by brackets [] replaced by
967.26 * your own identifying information:
968.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/Folder.java Fri Jul 16 11:47:36 2010 -0400
968.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/Folder.java Fri Jul 16 14:21:50 2010 -0400
968.3 @@ -1,7 +1,10 @@
968.4 /*
968.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
968.6 *
968.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
968.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
968.9 + *
968.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
968.11 + * Other names may be trademarks of their respective owners.
968.12 *
968.13 * The contents of this file are subject to the terms of either the GNU
968.14 * General Public License Version 2 only ("GPL") or the Common
968.15 @@ -13,9 +16,9 @@
968.16 * specific language governing permissions and limitations under the
968.17 * License. When distributing the software, include this License Header
968.18 * Notice in each file and include the License file at
968.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
968.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
968.21 * particular file as subject to the "Classpath" exception as provided
968.22 - * by Sun in the GPL Version 2 section of the License file that
968.23 + * by Oracle in the GPL Version 2 section of the License file that
968.24 * accompanied this code. If applicable, add the following below the
968.25 * License Header, with the fields enclosed by brackets [] replaced by
968.26 * your own identifying information:
969.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/JSFWebProject.java Fri Jul 16 11:47:36 2010 -0400
969.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/JSFWebProject.java Fri Jul 16 14:21:50 2010 -0400
969.3 @@ -1,7 +1,10 @@
969.4 /*
969.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
969.6 *
969.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
969.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
969.9 + *
969.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
969.11 + * Other names may be trademarks of their respective owners.
969.12 *
969.13 * The contents of this file are subject to the terms of either the GNU
969.14 * General Public License Version 2 only ("GPL") or the Common
969.15 @@ -13,9 +16,9 @@
969.16 * specific language governing permissions and limitations under the
969.17 * License. When distributing the software, include this License Header
969.18 * Notice in each file and include the License file at
969.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
969.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
969.21 * particular file as subject to the "Classpath" exception as provided
969.22 - * by Sun in the GPL Version 2 section of the License file that
969.23 + * by Oracle in the GPL Version 2 section of the License file that
969.24 * accompanied this code. If applicable, add the following below the
969.25 * License Header, with the fields enclosed by brackets [] replaced by
969.26 * your own identifying information:
970.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/JSPFile.java Fri Jul 16 11:47:36 2010 -0400
970.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/JSPFile.java Fri Jul 16 14:21:50 2010 -0400
970.3 @@ -1,7 +1,10 @@
970.4 /*
970.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
970.6 *
970.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
970.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
970.9 + *
970.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
970.11 + * Other names may be trademarks of their respective owners.
970.12 *
970.13 * The contents of this file are subject to the terms of either the GNU
970.14 * General Public License Version 2 only ("GPL") or the Common
970.15 @@ -13,9 +16,9 @@
970.16 * specific language governing permissions and limitations under the
970.17 * License. When distributing the software, include this License Header
970.18 * Notice in each file and include the License file at
970.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
970.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
970.21 * particular file as subject to the "Classpath" exception as provided
970.22 - * by Sun in the GPL Version 2 section of the License file that
970.23 + * by Oracle in the GPL Version 2 section of the License file that
970.24 * accompanied this code. If applicable, add the following below the
970.25 * License Header, with the fields enclosed by brackets [] replaced by
970.26 * your own identifying information:
971.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/JavaFile.java Fri Jul 16 11:47:36 2010 -0400
971.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/JavaFile.java Fri Jul 16 14:21:50 2010 -0400
971.3 @@ -1,7 +1,10 @@
971.4 /*
971.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
971.6 *
971.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
971.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
971.9 + *
971.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
971.11 + * Other names may be trademarks of their respective owners.
971.12 *
971.13 * The contents of this file are subject to the terms of either the GNU
971.14 * General Public License Version 2 only ("GPL") or the Common
971.15 @@ -13,9 +16,9 @@
971.16 * specific language governing permissions and limitations under the
971.17 * License. When distributing the software, include this License Header
971.18 * Notice in each file and include the License file at
971.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
971.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
971.21 * particular file as subject to the "Classpath" exception as provided
971.22 - * by Sun in the GPL Version 2 section of the License file that
971.23 + * by Oracle in the GPL Version 2 section of the License file that
971.24 * accompanied this code. If applicable, add the following below the
971.25 * License Header, with the fields enclosed by brackets [] replaced by
971.26 * your own identifying information:
972.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/Project.java Fri Jul 16 11:47:36 2010 -0400
972.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/Project.java Fri Jul 16 14:21:50 2010 -0400
972.3 @@ -1,7 +1,10 @@
972.4 /*
972.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
972.6 *
972.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
972.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
972.9 + *
972.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
972.11 + * Other names may be trademarks of their respective owners.
972.12 *
972.13 * The contents of this file are subject to the terms of either the GNU
972.14 * General Public License Version 2 only ("GPL") or the Common
972.15 @@ -13,9 +16,9 @@
972.16 * specific language governing permissions and limitations under the
972.17 * License. When distributing the software, include this License Header
972.18 * Notice in each file and include the License file at
972.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
972.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
972.21 * particular file as subject to the "Classpath" exception as provided
972.22 - * by Sun in the GPL Version 2 section of the License file that
972.23 + * by Oracle in the GPL Version 2 section of the License file that
972.24 * accompanied this code. If applicable, add the following below the
972.25 * License Header, with the fields enclosed by brackets [] replaced by
972.26 * your own identifying information:
973.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/ProjectDescriptor.java Fri Jul 16 11:47:36 2010 -0400
973.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/ProjectDescriptor.java Fri Jul 16 14:21:50 2010 -0400
973.3 @@ -1,7 +1,10 @@
973.4 /*
973.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
973.6 *
973.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
973.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
973.9 + *
973.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
973.11 + * Other names may be trademarks of their respective owners.
973.12 *
973.13 * The contents of this file are subject to the terms of either the GNU
973.14 * General Public License Version 2 only ("GPL") or the Common
973.15 @@ -13,9 +16,9 @@
973.16 * specific language governing permissions and limitations under the
973.17 * License. When distributing the software, include this License Header
973.18 * Notice in each file and include the License file at
973.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
973.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
973.21 * particular file as subject to the "Classpath" exception as provided
973.22 - * by Sun in the GPL Version 2 section of the License file that
973.23 + * by Oracle in the GPL Version 2 section of the License file that
973.24 * accompanied this code. If applicable, add the following below the
973.25 * License Header, with the fields enclosed by brackets [] replaced by
973.26 * your own identifying information:
974.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/ProjectEntry.java Fri Jul 16 11:47:36 2010 -0400
974.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/ProjectEntry.java Fri Jul 16 14:21:50 2010 -0400
974.3 @@ -1,7 +1,10 @@
974.4 /*
974.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
974.6 *
974.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
974.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
974.9 + *
974.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
974.11 + * Other names may be trademarks of their respective owners.
974.12 *
974.13 * The contents of this file are subject to the terms of either the GNU
974.14 * General Public License Version 2 only ("GPL") or the Common
974.15 @@ -13,9 +16,9 @@
974.16 * specific language governing permissions and limitations under the
974.17 * License. When distributing the software, include this License Header
974.18 * Notice in each file and include the License file at
974.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
974.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
974.21 * particular file as subject to the "Classpath" exception as provided
974.22 - * by Sun in the GPL Version 2 section of the License file that
974.23 + * by Oracle in the GPL Version 2 section of the License file that
974.24 * accompanied this code. If applicable, add the following below the
974.25 * License Header, with the fields enclosed by brackets [] replaced by
974.26 * your own identifying information:
975.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/ProjectFactory.java Fri Jul 16 11:47:36 2010 -0400
975.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/ProjectFactory.java Fri Jul 16 14:21:50 2010 -0400
975.3 @@ -1,7 +1,10 @@
975.4 /*
975.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
975.6 *
975.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
975.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
975.9 + *
975.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
975.11 + * Other names may be trademarks of their respective owners.
975.12 *
975.13 * The contents of this file are subject to the terms of either the GNU
975.14 * General Public License Version 2 only ("GPL") or the Common
975.15 @@ -13,9 +16,9 @@
975.16 * specific language governing permissions and limitations under the
975.17 * License. When distributing the software, include this License Header
975.18 * Notice in each file and include the License file at
975.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
975.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
975.21 * particular file as subject to the "Classpath" exception as provided
975.22 - * by Sun in the GPL Version 2 section of the License file that
975.23 + * by Oracle in the GPL Version 2 section of the License file that
975.24 * accompanied this code. If applicable, add the following below the
975.25 * License Header, with the fields enclosed by brackets [] replaced by
975.26 * your own identifying information:
976.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/ProjectList.java Fri Jul 16 11:47:36 2010 -0400
976.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/ProjectList.java Fri Jul 16 14:21:50 2010 -0400
976.3 @@ -1,7 +1,10 @@
976.4 /*
976.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
976.6 *
976.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
976.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
976.9 + *
976.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
976.11 + * Other names may be trademarks of their respective owners.
976.12 *
976.13 * The contents of this file are subject to the terms of either the GNU
976.14 * General Public License Version 2 only ("GPL") or the Common
976.15 @@ -13,9 +16,9 @@
976.16 * specific language governing permissions and limitations under the
976.17 * License. When distributing the software, include this License Header
976.18 * Notice in each file and include the License file at
976.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
976.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
976.21 * particular file as subject to the "Classpath" exception as provided
976.22 - * by Sun in the GPL Version 2 section of the License file that
976.23 + * by Oracle in the GPL Version 2 section of the License file that
976.24 * accompanied this code. If applicable, add the following below the
976.25 * License Header, with the fields enclosed by brackets [] replaced by
976.26 * your own identifying information:
977.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/RootEntry.java Fri Jul 16 11:47:36 2010 -0400
977.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/RootEntry.java Fri Jul 16 14:21:50 2010 -0400
977.3 @@ -1,7 +1,10 @@
977.4 /*
977.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
977.6 *
977.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
977.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
977.9 + *
977.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
977.11 + * Other names may be trademarks of their respective owners.
977.12 *
977.13 * The contents of this file are subject to the terms of either the GNU
977.14 * General Public License Version 2 only ("GPL") or the Common
977.15 @@ -13,9 +16,9 @@
977.16 * specific language governing permissions and limitations under the
977.17 * License. When distributing the software, include this License Header
977.18 * Notice in each file and include the License file at
977.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
977.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
977.21 * particular file as subject to the "Classpath" exception as provided
977.22 - * by Sun in the GPL Version 2 section of the License file that
977.23 + * by Oracle in the GPL Version 2 section of the License file that
977.24 * accompanied this code. If applicable, add the following below the
977.25 * License Header, with the fields enclosed by brackets [] replaced by
977.26 * your own identifying information:
978.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/SourceFile.java Fri Jul 16 11:47:36 2010 -0400
978.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/SourceFile.java Fri Jul 16 14:21:50 2010 -0400
978.3 @@ -1,7 +1,10 @@
978.4 /*
978.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
978.6 *
978.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
978.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
978.9 + *
978.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
978.11 + * Other names may be trademarks of their respective owners.
978.12 *
978.13 * The contents of this file are subject to the terms of either the GNU
978.14 * General Public License Version 2 only ("GPL") or the Common
978.15 @@ -13,9 +16,9 @@
978.16 * specific language governing permissions and limitations under the
978.17 * License. When distributing the software, include this License Header
978.18 * Notice in each file and include the License file at
978.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
978.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
978.21 * particular file as subject to the "Classpath" exception as provided
978.22 - * by Sun in the GPL Version 2 section of the License file that
978.23 + * by Oracle in the GPL Version 2 section of the License file that
978.24 * accompanied this code. If applicable, add the following below the
978.25 * License Header, with the fields enclosed by brackets [] replaced by
978.26 * your own identifying information:
979.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/SourceFolder.java Fri Jul 16 11:47:36 2010 -0400
979.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/SourceFolder.java Fri Jul 16 14:21:50 2010 -0400
979.3 @@ -1,7 +1,10 @@
979.4 /*
979.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
979.6 *
979.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
979.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
979.9 + *
979.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
979.11 + * Other names may be trademarks of their respective owners.
979.12 *
979.13 * The contents of this file are subject to the terms of either the GNU
979.14 * General Public License Version 2 only ("GPL") or the Common
979.15 @@ -13,9 +16,9 @@
979.16 * specific language governing permissions and limitations under the
979.17 * License. When distributing the software, include this License Header
979.18 * Notice in each file and include the License file at
979.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
979.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
979.21 * particular file as subject to the "Classpath" exception as provided
979.22 - * by Sun in the GPL Version 2 section of the License file that
979.23 + * by Oracle in the GPL Version 2 section of the License file that
979.24 * accompanied this code. If applicable, add the following below the
979.25 * License Header, with the fields enclosed by brackets [] replaced by
979.26 * your own identifying information:
980.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/WebPage.java Fri Jul 16 11:47:36 2010 -0400
980.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/WebPage.java Fri Jul 16 14:21:50 2010 -0400
980.3 @@ -1,7 +1,10 @@
980.4 /*
980.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
980.6 *
980.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
980.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
980.9 + *
980.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
980.11 + * Other names may be trademarks of their respective owners.
980.12 *
980.13 * The contents of this file are subject to the terms of either the GNU
980.14 * General Public License Version 2 only ("GPL") or the Common
980.15 @@ -13,9 +16,9 @@
980.16 * specific language governing permissions and limitations under the
980.17 * License. When distributing the software, include this License Header
980.18 * Notice in each file and include the License file at
980.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
980.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
980.21 * particular file as subject to the "Classpath" exception as provided
980.22 - * by Sun in the GPL Version 2 section of the License file that
980.23 + * by Oracle in the GPL Version 2 section of the License file that
980.24 * accompanied this code. If applicable, add the following below the
980.25 * License Header, with the fields enclosed by brackets [] replaced by
980.26 * your own identifying information:
981.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/WebPageFolder.java Fri Jul 16 11:47:36 2010 -0400
981.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/WebPageFolder.java Fri Jul 16 14:21:50 2010 -0400
981.3 @@ -1,7 +1,10 @@
981.4 /*
981.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
981.6 *
981.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
981.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
981.9 + *
981.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
981.11 + * Other names may be trademarks of their respective owners.
981.12 *
981.13 * The contents of this file are subject to the terms of either the GNU
981.14 * General Public License Version 2 only ("GPL") or the Common
981.15 @@ -13,9 +16,9 @@
981.16 * specific language governing permissions and limitations under the
981.17 * License. When distributing the software, include this License Header
981.18 * Notice in each file and include the License file at
981.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
981.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
981.21 * particular file as subject to the "Classpath" exception as provided
981.22 - * by Sun in the GPL Version 2 section of the License file that
981.23 + * by Oracle in the GPL Version 2 section of the License file that
981.24 * accompanied this code. If applicable, add the following below the
981.25 * License Header, with the fields enclosed by brackets [] replaced by
981.26 * your own identifying information:
982.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/XMLFile.java Fri Jul 16 11:47:36 2010 -0400
982.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/XMLFile.java Fri Jul 16 14:21:50 2010 -0400
982.3 @@ -1,7 +1,10 @@
982.4 /*
982.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
982.6 *
982.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
982.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
982.9 + *
982.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
982.11 + * Other names may be trademarks of their respective owners.
982.12 *
982.13 * The contents of this file are subject to the terms of either the GNU
982.14 * General Public License Version 2 only ("GPL") or the Common
982.15 @@ -13,9 +16,9 @@
982.16 * specific language governing permissions and limitations under the
982.17 * License. When distributing the software, include this License Header
982.18 * Notice in each file and include the License file at
982.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
982.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
982.21 * particular file as subject to the "Classpath" exception as provided
982.22 - * by Sun in the GPL Version 2 section of the License file that
982.23 + * by Oracle in the GPL Version 2 section of the License file that
982.24 * accompanied this code. If applicable, add the following below the
982.25 * License Header, with the fields enclosed by brackets [] replaced by
982.26 * your own identifying information:
983.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
983.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
983.3 @@ -2,7 +2,10 @@
983.4
983.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
983.6 *
983.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
983.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
983.9 + *
983.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
983.11 + * Other names may be trademarks of their respective owners.
983.12
983.13 *
983.14 * The contents of this file are subject to the terms of either the GNU
983.15 @@ -15,9 +18,9 @@
983.16 * specific language governing permissions and limitations under the
983.17 * License. When distributing the software, include this License Header
983.18 * Notice in each file and include the License file at
983.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
983.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
983.21 * particular file as subject to the "Classpath" exception as provided
983.22 - * by Sun in the GPL Version 2 section of the License file that
983.23 + * by Oracle in the GPL Version 2 section of the License file that
983.24 * accompanied this code. If applicable, add the following below the
983.25 * License Header, with the fields enclosed by brackets [] replaced by
983.26 * your own identifying information:
984.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/Component.java Fri Jul 16 11:47:36 2010 -0400
984.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/Component.java Fri Jul 16 14:21:50 2010 -0400
984.3 @@ -1,7 +1,10 @@
984.4 /*
984.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
984.6 *
984.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
984.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
984.9 + *
984.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
984.11 + * Other names may be trademarks of their respective owners.
984.12 *
984.13 * The contents of this file are subject to the terms of either the GNU
984.14 * General Public License Version 2 only ("GPL") or the Common
984.15 @@ -13,9 +16,9 @@
984.16 * specific language governing permissions and limitations under the
984.17 * License. When distributing the software, include this License Header
984.18 * Notice in each file and include the License file at
984.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
984.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
984.21 * particular file as subject to the "Classpath" exception as provided
984.22 - * by Sun in the GPL Version 2 section of the License file that
984.23 + * by Oracle in the GPL Version 2 section of the License file that
984.24 * accompanied this code. If applicable, add the following below the
984.25 * License Header, with the fields enclosed by brackets [] replaced by
984.26 * your own identifying information:
985.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/NonVisualComponent.java Fri Jul 16 11:47:36 2010 -0400
985.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/NonVisualComponent.java Fri Jul 16 14:21:50 2010 -0400
985.3 @@ -1,7 +1,10 @@
985.4 /*
985.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
985.6 *
985.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
985.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
985.9 + *
985.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
985.11 + * Other names may be trademarks of their respective owners.
985.12 *
985.13 * The contents of this file are subject to the terms of either the GNU
985.14 * General Public License Version 2 only ("GPL") or the Common
985.15 @@ -13,9 +16,9 @@
985.16 * specific language governing permissions and limitations under the
985.17 * License. When distributing the software, include this License Header
985.18 * Notice in each file and include the License file at
985.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
985.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
985.21 * particular file as subject to the "Classpath" exception as provided
985.22 - * by Sun in the GPL Version 2 section of the License file that
985.23 + * by Oracle in the GPL Version 2 section of the License file that
985.24 * accompanied this code. If applicable, add the following below the
985.25 * License Header, with the fields enclosed by brackets [] replaced by
985.26 * your own identifying information:
986.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/VisualComponent.java Fri Jul 16 11:47:36 2010 -0400
986.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/VisualComponent.java Fri Jul 16 14:21:50 2010 -0400
986.3 @@ -1,7 +1,10 @@
986.4 /*
986.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
986.6 *
986.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
986.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
986.9 + *
986.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
986.11 + * Other names may be trademarks of their respective owners.
986.12 *
986.13 * The contents of this file are subject to the terms of either the GNU
986.14 * General Public License Version 2 only ("GPL") or the Common
986.15 @@ -13,9 +16,9 @@
986.16 * specific language governing permissions and limitations under the
986.17 * License. When distributing the software, include this License Header
986.18 * Notice in each file and include the License file at
986.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
986.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
986.21 * particular file as subject to the "Classpath" exception as provided
986.22 - * by Sun in the GPL Version 2 section of the License file that
986.23 + * by Oracle in the GPL Version 2 section of the License file that
986.24 * accompanied this code. If applicable, add the following below the
986.25 * License Header, with the fields enclosed by brackets [] replaced by
986.26 * your own identifying information:
987.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/VisualEventHandlingComponent.java Fri Jul 16 11:47:36 2010 -0400
987.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/model/project/components/VisualEventHandlingComponent.java Fri Jul 16 14:21:50 2010 -0400
987.3 @@ -1,7 +1,10 @@
987.4 /*
987.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
987.6 *
987.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
987.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
987.9 + *
987.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
987.11 + * Other names may be trademarks of their respective owners.
987.12 *
987.13 * The contents of this file are subject to the terms of either the GNU
987.14 * General Public License Version 2 only ("GPL") or the Common
987.15 @@ -13,9 +16,9 @@
987.16 * specific language governing permissions and limitations under the
987.17 * License. When distributing the software, include this License Header
987.18 * Notice in each file and include the License file at
987.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
987.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
987.21 * particular file as subject to the "Classpath" exception as provided
987.22 - * by Sun in the GPL Version 2 section of the License file that
987.23 + * by Oracle in the GPL Version 2 section of the License file that
987.24 * accompanied this code. If applicable, add the following below the
987.25 * License Header, with the fields enclosed by brackets [] replaced by
987.26 * your own identifying information:
988.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/navigation/NavigatorOperator.java Fri Jul 16 11:47:36 2010 -0400
988.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/navigation/NavigatorOperator.java Fri Jul 16 14:21:50 2010 -0400
988.3 @@ -1,7 +1,10 @@
988.4 /*
988.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
988.6 *
988.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
988.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
988.9 + *
988.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
988.11 + * Other names may be trademarks of their respective owners.
988.12 *
988.13 * The contents of this file are subject to the terms of either the GNU
988.14 * General Public License Version 2 only ("GPL") or the Common
988.15 @@ -13,9 +16,9 @@
988.16 * specific language governing permissions and limitations under the
988.17 * License. When distributing the software, include this License Header
988.18 * Notice in each file and include the License file at
988.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
988.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
988.21 * particular file as subject to the "Classpath" exception as provided
988.22 - * by Sun in the GPL Version 2 section of the License file that
988.23 + * by Oracle in the GPL Version 2 section of the License file that
988.24 * accompanied this code. If applicable, add the following below the
988.25 * License Header, with the fields enclosed by brackets [] replaced by
988.26 * your own identifying information:
989.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/navigation/PageOperator.java Fri Jul 16 11:47:36 2010 -0400
989.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/navigation/PageOperator.java Fri Jul 16 14:21:50 2010 -0400
989.3 @@ -1,6 +1,9 @@
989.4 /* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
989.5 /*
989.6 - /* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
989.7 + /* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
989.8 + /*
989.9 + /* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
989.10 + /* Other names may be trademarks of their respective owners.
989.11 *
989.12 /* The contents of this file are subject to the terms of either the GNU
989.13 /* General Public License Version 2 only ("GPL") or the Common
989.14 @@ -12,9 +15,9 @@
989.15 /* specific language governing permissions and limitations under the
989.16 /* License. When distributing the software, include this License Header
989.17 /* Notice in each file and include the License file at
989.18 - /* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
989.19 + /* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
989.20 /* particular file as subject to the "Classpath" exception as provided
989.21 - /* by Sun in the GPL Version 2 section of the License file that
989.22 + /* by Oracle in the GPL Version 2 section of the License file that
989.23 /* accompanied this code. If applicable, add the following below the
989.24 /* License Header, with the fields enclosed by brackets [] replaced by
989.25 /* your own identifying information:
990.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/nodes/Node.java Fri Jul 16 11:47:36 2010 -0400
990.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/nodes/Node.java Fri Jul 16 14:21:50 2010 -0400
990.3 @@ -1,7 +1,10 @@
990.4 /*
990.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
990.6 *
990.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
990.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
990.9 + *
990.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
990.11 + * Other names may be trademarks of their respective owners.
990.12 *
990.13 * The contents of this file are subject to the terms of either the GNU
990.14 * General Public License Version 2 only ("GPL") or the Common
990.15 @@ -13,9 +16,9 @@
990.16 * specific language governing permissions and limitations under the
990.17 * License. When distributing the software, include this License Header
990.18 * Notice in each file and include the License file at
990.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
990.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
990.21 * particular file as subject to the "Classpath" exception as provided
990.22 - * by Sun in the GPL Version 2 section of the License file that
990.23 + * by Oracle in the GPL Version 2 section of the License file that
990.24 * accompanied this code. If applicable, add the following below the
990.25 * License Header, with the fields enclosed by brackets [] replaced by
990.26 * your own identifying information:
991.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/nodes/WebServicesNode.java Fri Jul 16 11:47:36 2010 -0400
991.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/nodes/WebServicesNode.java Fri Jul 16 14:21:50 2010 -0400
991.3 @@ -1,7 +1,10 @@
991.4 /*
991.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
991.6 *
991.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
991.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
991.9 + *
991.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
991.11 + * Other names may be trademarks of their respective owners.
991.12 *
991.13 * The contents of this file are subject to the terms of either the GNU
991.14 * General Public License Version 2 only ("GPL") or the Common
991.15 @@ -13,9 +16,9 @@
991.16 * specific language governing permissions and limitations under the
991.17 * License. When distributing the software, include this License Header
991.18 * Notice in each file and include the License file at
991.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
991.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
991.21 * particular file as subject to the "Classpath" exception as provided
991.22 - * by Sun in the GPL Version 2 section of the License file that
991.23 + * by Oracle in the GPL Version 2 section of the License file that
991.24 * accompanied this code. If applicable, add the following below the
991.25 * License Header, with the fields enclosed by brackets [] replaced by
991.26 * your own identifying information:
992.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/plugins/PluginsOperator.java Fri Jul 16 11:47:36 2010 -0400
992.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/plugins/PluginsOperator.java Fri Jul 16 14:21:50 2010 -0400
992.3 @@ -1,7 +1,10 @@
992.4 /*
992.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
992.6
992.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
992.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
992.9 +
992.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
992.11 +Other names may be trademarks of their respective owners.
992.12
992.13
992.14 The contents of this file are subject to the terms of either the GNU
992.15 @@ -14,9 +17,9 @@
992.16 specific language governing permissions and limitations under the
992.17 License. When distributing the software, include this License Header
992.18 Notice in each file and include the License file at
992.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
992.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
992.21 particular file as subject to the "Classpath" exception as provided
992.22 -by Sun in the GPL Version 2 section of the License file that
992.23 +by Oracle in the GPL Version 2 section of the License file that
992.24 accompanied this code. If applicable, add the following below the
992.25 License Header, with the fields enclosed by brackets [] replaced by
992.26 your own identifying information:
993.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/CheckBoxProperty.java Fri Jul 16 11:47:36 2010 -0400
993.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/CheckBoxProperty.java Fri Jul 16 14:21:50 2010 -0400
993.3 @@ -1,7 +1,10 @@
993.4 /*
993.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
993.6 *
993.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
993.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
993.9 + *
993.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
993.11 + * Other names may be trademarks of their respective owners.
993.12 *
993.13 * The contents of this file are subject to the terms of either the GNU
993.14 * General Public License Version 2 only ("GPL") or the Common
993.15 @@ -13,9 +16,9 @@
993.16 * specific language governing permissions and limitations under the
993.17 * License. When distributing the software, include this License Header
993.18 * Notice in each file and include the License file at
993.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
993.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
993.21 * particular file as subject to the "Classpath" exception as provided
993.22 - * by Sun in the GPL Version 2 section of the License file that
993.23 + * by Oracle in the GPL Version 2 section of the License file that
993.24 * accompanied this code. If applicable, add the following below the
993.25 * License Header, with the fields enclosed by brackets [] replaced by
993.26 * your own identifying information:
994.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/ComboBoxProperty.java Fri Jul 16 11:47:36 2010 -0400
994.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/ComboBoxProperty.java Fri Jul 16 14:21:50 2010 -0400
994.3 @@ -1,7 +1,10 @@
994.4 /*
994.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
994.6 *
994.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
994.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
994.9 + *
994.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
994.11 + * Other names may be trademarks of their respective owners.
994.12 *
994.13 * The contents of this file are subject to the terms of either the GNU
994.14 * General Public License Version 2 only ("GPL") or the Common
994.15 @@ -13,9 +16,9 @@
994.16 * specific language governing permissions and limitations under the
994.17 * License. When distributing the software, include this License Header
994.18 * Notice in each file and include the License file at
994.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
994.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
994.21 * particular file as subject to the "Classpath" exception as provided
994.22 - * by Sun in the GPL Version 2 section of the License file that
994.23 + * by Oracle in the GPL Version 2 section of the License file that
994.24 * accompanied this code. If applicable, add the following below the
994.25 * License Header, with the fields enclosed by brackets [] replaced by
994.26 * your own identifying information:
995.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/DebugReaderWriter.java Fri Jul 16 11:47:36 2010 -0400
995.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/DebugReaderWriter.java Fri Jul 16 14:21:50 2010 -0400
995.3 @@ -1,7 +1,10 @@
995.4 /*
995.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
995.6 *
995.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
995.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
995.9 + *
995.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
995.11 + * Other names may be trademarks of their respective owners.
995.12 *
995.13 * The contents of this file are subject to the terms of either the GNU
995.14 * General Public License Version 2 only ("GPL") or the Common
995.15 @@ -13,9 +16,9 @@
995.16 * specific language governing permissions and limitations under the
995.17 * License. When distributing the software, include this License Header
995.18 * Notice in each file and include the License file at
995.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
995.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
995.21 * particular file as subject to the "Classpath" exception as provided
995.22 - * by Sun in the GPL Version 2 section of the License file that
995.23 + * by Oracle in the GPL Version 2 section of the License file that
995.24 * accompanied this code. If applicable, add the following below the
995.25 * License Header, with the fields enclosed by brackets [] replaced by
995.26 * your own identifying information:
996.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/Property.java Fri Jul 16 11:47:36 2010 -0400
996.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/Property.java Fri Jul 16 14:21:50 2010 -0400
996.3 @@ -1,7 +1,10 @@
996.4 /*
996.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
996.6 *
996.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
996.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
996.9 + *
996.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
996.11 + * Other names may be trademarks of their respective owners.
996.12 *
996.13 * The contents of this file are subject to the terms of either the GNU
996.14 * General Public License Version 2 only ("GPL") or the Common
996.15 @@ -13,9 +16,9 @@
996.16 * specific language governing permissions and limitations under the
996.17 * License. When distributing the software, include this License Header
996.18 * Notice in each file and include the License file at
996.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
996.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
996.21 * particular file as subject to the "Classpath" exception as provided
996.22 - * by Sun in the GPL Version 2 section of the License file that
996.23 + * by Oracle in the GPL Version 2 section of the License file that
996.24 * accompanied this code. If applicable, add the following below the
996.25 * License Header, with the fields enclosed by brackets [] replaced by
996.26 * your own identifying information:
997.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertyFactory.java Fri Jul 16 11:47:36 2010 -0400
997.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertyFactory.java Fri Jul 16 14:21:50 2010 -0400
997.3 @@ -1,7 +1,10 @@
997.4 /*
997.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
997.6 *
997.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
997.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
997.9 + *
997.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
997.11 + * Other names may be trademarks of their respective owners.
997.12 *
997.13 * The contents of this file are subject to the terms of either the GNU
997.14 * General Public License Version 2 only ("GPL") or the Common
997.15 @@ -13,9 +16,9 @@
997.16 * specific language governing permissions and limitations under the
997.17 * License. When distributing the software, include this License Header
997.18 * Notice in each file and include the License file at
997.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
997.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
997.21 * particular file as subject to the "Classpath" exception as provided
997.22 - * by Sun in the GPL Version 2 section of the License file that
997.23 + * by Oracle in the GPL Version 2 section of the License file that
997.24 * accompanied this code. If applicable, add the following below the
997.25 * License Header, with the fields enclosed by brackets [] replaced by
997.26 * your own identifying information:
998.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertyReader.java Fri Jul 16 11:47:36 2010 -0400
998.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertyReader.java Fri Jul 16 14:21:50 2010 -0400
998.3 @@ -1,7 +1,10 @@
998.4 /*
998.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
998.6 *
998.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
998.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
998.9 + *
998.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
998.11 + * Other names may be trademarks of their respective owners.
998.12 *
998.13 * The contents of this file are subject to the terms of either the GNU
998.14 * General Public License Version 2 only ("GPL") or the Common
998.15 @@ -13,9 +16,9 @@
998.16 * specific language governing permissions and limitations under the
998.17 * License. When distributing the software, include this License Header
998.18 * Notice in each file and include the License file at
998.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
998.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
998.21 * particular file as subject to the "Classpath" exception as provided
998.22 - * by Sun in the GPL Version 2 section of the License file that
998.23 + * by Oracle in the GPL Version 2 section of the License file that
998.24 * accompanied this code. If applicable, add the following below the
998.25 * License Header, with the fields enclosed by brackets [] replaced by
998.26 * your own identifying information:
999.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertyReaderWriter.java Fri Jul 16 11:47:36 2010 -0400
999.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertyReaderWriter.java Fri Jul 16 14:21:50 2010 -0400
999.3 @@ -1,7 +1,10 @@
999.4 /*
999.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
999.6 *
999.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
999.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
999.9 + *
999.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
999.11 + * Other names may be trademarks of their respective owners.
999.12 *
999.13 * The contents of this file are subject to the terms of either the GNU
999.14 * General Public License Version 2 only ("GPL") or the Common
999.15 @@ -13,9 +16,9 @@
999.16 * specific language governing permissions and limitations under the
999.17 * License. When distributing the software, include this License Header
999.18 * Notice in each file and include the License file at
999.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
999.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
999.21 * particular file as subject to the "Classpath" exception as provided
999.22 - * by Sun in the GPL Version 2 section of the License file that
999.23 + * by Oracle in the GPL Version 2 section of the License file that
999.24 * accompanied this code. If applicable, add the following below the
999.25 * License Header, with the fields enclosed by brackets [] replaced by
999.26 * your own identifying information:
1000.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertySheetOperator.java Fri Jul 16 11:47:36 2010 -0400
1000.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertySheetOperator.java Fri Jul 16 14:21:50 2010 -0400
1000.3 @@ -1,7 +1,10 @@
1000.4 /*
1000.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1000.6 *
1000.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1000.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1000.9 + *
1000.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1000.11 + * Other names may be trademarks of their respective owners.
1000.12 *
1000.13 * The contents of this file are subject to the terms of either the GNU
1000.14 * General Public License Version 2 only ("GPL") or the Common
1000.15 @@ -13,9 +16,9 @@
1000.16 * specific language governing permissions and limitations under the
1000.17 * License. When distributing the software, include this License Header
1000.18 * Notice in each file and include the License file at
1000.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1000.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1000.21 * particular file as subject to the "Classpath" exception as provided
1000.22 - * by Sun in the GPL Version 2 section of the License file that
1000.23 + * by Oracle in the GPL Version 2 section of the License file that
1000.24 * accompanied this code. If applicable, add the following below the
1000.25 * License Header, with the fields enclosed by brackets [] replaced by
1000.26 * your own identifying information:
1001.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertySheetReaderWriter.java Fri Jul 16 11:47:36 2010 -0400
1001.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertySheetReaderWriter.java Fri Jul 16 14:21:50 2010 -0400
1001.3 @@ -1,7 +1,10 @@
1001.4 /*
1001.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1001.6 *
1001.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1001.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1001.9 + *
1001.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1001.11 + * Other names may be trademarks of their respective owners.
1001.12 *
1001.13 * The contents of this file are subject to the terms of either the GNU
1001.14 * General Public License Version 2 only ("GPL") or the Common
1001.15 @@ -13,9 +16,9 @@
1001.16 * specific language governing permissions and limitations under the
1001.17 * License. When distributing the software, include this License Header
1001.18 * Notice in each file and include the License file at
1001.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1001.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1001.21 * particular file as subject to the "Classpath" exception as provided
1001.22 - * by Sun in the GPL Version 2 section of the License file that
1001.23 + * by Oracle in the GPL Version 2 section of the License file that
1001.24 * accompanied this code. If applicable, add the following below the
1001.25 * License Header, with the fields enclosed by brackets [] replaced by
1001.26 * your own identifying information:
1002.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertySheetTabOperator.java Fri Jul 16 11:47:36 2010 -0400
1002.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertySheetTabOperator.java Fri Jul 16 14:21:50 2010 -0400
1002.3 @@ -1,7 +1,10 @@
1002.4 /*
1002.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1002.6 *
1002.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1002.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1002.9 + *
1002.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1002.11 + * Other names may be trademarks of their respective owners.
1002.12 *
1002.13 * The contents of this file are subject to the terms of either the GNU
1002.14 * General Public License Version 2 only ("GPL") or the Common
1002.15 @@ -13,9 +16,9 @@
1002.16 * specific language governing permissions and limitations under the
1002.17 * License. When distributing the software, include this License Header
1002.18 * Notice in each file and include the License file at
1002.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1002.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1002.21 * particular file as subject to the "Classpath" exception as provided
1002.22 - * by Sun in the GPL Version 2 section of the License file that
1002.23 + * by Oracle in the GPL Version 2 section of the License file that
1002.24 * accompanied this code. If applicable, add the following below the
1002.25 * License Header, with the fields enclosed by brackets [] replaced by
1002.26 * your own identifying information:
1003.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertySheetToolbarOperator.java Fri Jul 16 11:47:36 2010 -0400
1003.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/PropertySheetToolbarOperator.java Fri Jul 16 14:21:50 2010 -0400
1003.3 @@ -1,7 +1,10 @@
1003.4 /*
1003.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1003.6 *
1003.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1003.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1003.9 + *
1003.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1003.11 + * Other names may be trademarks of their respective owners.
1003.12 *
1003.13 * The contents of this file are subject to the terms of either the GNU
1003.14 * General Public License Version 2 only ("GPL") or the Common
1003.15 @@ -13,9 +16,9 @@
1003.16 * specific language governing permissions and limitations under the
1003.17 * License. When distributing the software, include this License Header
1003.18 * Notice in each file and include the License file at
1003.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1003.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1003.21 * particular file as subject to the "Classpath" exception as provided
1003.22 - * by Sun in the GPL Version 2 section of the License file that
1003.23 + * by Oracle in the GPL Version 2 section of the License file that
1003.24 * accompanied this code. If applicable, add the following below the
1003.25 * License Header, with the fields enclosed by brackets [] replaced by
1003.26 * your own identifying information:
1004.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/SheetButtonOperator.java Fri Jul 16 11:47:36 2010 -0400
1004.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/SheetButtonOperator.java Fri Jul 16 14:21:50 2010 -0400
1004.3 @@ -1,7 +1,10 @@
1004.4 /*
1004.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1004.6 *
1004.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1004.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1004.9 + *
1004.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1004.11 + * Other names may be trademarks of their respective owners.
1004.12 *
1004.13 * The contents of this file are subject to the terms of either the GNU
1004.14 * General Public License Version 2 only ("GPL") or the Common
1004.15 @@ -13,9 +16,9 @@
1004.16 * specific language governing permissions and limitations under the
1004.17 * License. When distributing the software, include this License Header
1004.18 * Notice in each file and include the License file at
1004.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1004.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1004.21 * particular file as subject to the "Classpath" exception as provided
1004.22 - * by Sun in the GPL Version 2 section of the License file that
1004.23 + * by Oracle in the GPL Version 2 section of the License file that
1004.24 * accompanied this code. If applicable, add the following below the
1004.25 * License Header, with the fields enclosed by brackets [] replaced by
1004.26 * your own identifying information:
1005.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/SheetTableOperator.java Fri Jul 16 11:47:36 2010 -0400
1005.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/SheetTableOperator.java Fri Jul 16 14:21:50 2010 -0400
1005.3 @@ -1,7 +1,10 @@
1005.4 /*
1005.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1005.6 *
1005.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1005.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1005.9 + *
1005.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1005.11 + * Other names may be trademarks of their respective owners.
1005.12 *
1005.13 * The contents of this file are subject to the terms of either the GNU
1005.14 * General Public License Version 2 only ("GPL") or the Common
1005.15 @@ -13,9 +16,9 @@
1005.16 * specific language governing permissions and limitations under the
1005.17 * License. When distributing the software, include this License Header
1005.18 * Notice in each file and include the License file at
1005.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1005.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1005.21 * particular file as subject to the "Classpath" exception as provided
1005.22 - * by Sun in the GPL Version 2 section of the License file that
1005.23 + * by Oracle in the GPL Version 2 section of the License file that
1005.24 * accompanied this code. If applicable, add the following below the
1005.25 * License Header, with the fields enclosed by brackets [] replaced by
1005.26 * your own identifying information:
1006.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/TextFieldProperty.java Fri Jul 16 11:47:36 2010 -0400
1006.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/TextFieldProperty.java Fri Jul 16 14:21:50 2010 -0400
1006.3 @@ -1,7 +1,10 @@
1006.4 /*
1006.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1006.6 *
1006.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1006.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1006.9 + *
1006.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1006.11 + * Other names may be trademarks of their respective owners.
1006.12 *
1006.13 * The contents of this file are subject to the terms of either the GNU
1006.14 * General Public License Version 2 only ("GPL") or the Common
1006.15 @@ -13,9 +16,9 @@
1006.16 * specific language governing permissions and limitations under the
1006.17 * License. When distributing the software, include this License Header
1006.18 * Notice in each file and include the License file at
1006.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1006.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1006.21 * particular file as subject to the "Classpath" exception as provided
1006.22 - * by Sun in the GPL Version 2 section of the License file that
1006.23 + * by Oracle in the GPL Version 2 section of the License file that
1006.24 * accompanied this code. If applicable, add the following below the
1006.25 * License Header, with the fields enclosed by brackets [] replaced by
1006.26 * your own identifying information:
1007.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/AbbreviationsEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1007.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/AbbreviationsEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1007.3 @@ -1,7 +1,10 @@
1007.4 /*
1007.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1007.6 *
1007.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1007.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1007.9 + *
1007.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1007.11 + * Other names may be trademarks of their respective owners.
1007.12 *
1007.13 * The contents of this file are subject to the terms of either the GNU
1007.14 * General Public License Version 2 only ("GPL") or the Common
1007.15 @@ -13,9 +16,9 @@
1007.16 * specific language governing permissions and limitations under the
1007.17 * License. When distributing the software, include this License Header
1007.18 * Notice in each file and include the License file at
1007.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1007.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1007.21 * particular file as subject to the "Classpath" exception as provided
1007.22 - * by Sun in the GPL Version 2 section of the License file that
1007.23 + * by Oracle in the GPL Version 2 section of the License file that
1007.24 * accompanied this code. If applicable, add the following below the
1007.25 * License Header, with the fields enclosed by brackets [] replaced by
1007.26 * your own identifying information:
1008.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/AddKeybinding.java Fri Jul 16 11:47:36 2010 -0400
1008.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/AddKeybinding.java Fri Jul 16 14:21:50 2010 -0400
1008.3 @@ -1,7 +1,10 @@
1008.4 /*
1008.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1008.6 *
1008.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1008.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1008.9 + *
1008.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1008.11 + * Other names may be trademarks of their respective owners.
1008.12 *
1008.13 * The contents of this file are subject to the terms of either the GNU
1008.14 * General Public License Version 2 only ("GPL") or the Common
1008.15 @@ -13,9 +16,9 @@
1008.16 * specific language governing permissions and limitations under the
1008.17 * License. When distributing the software, include this License Header
1008.18 * Notice in each file and include the License file at
1008.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1008.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1008.21 * particular file as subject to the "Classpath" exception as provided
1008.22 - * by Sun in the GPL Version 2 section of the License file that
1008.23 + * by Oracle in the GPL Version 2 section of the License file that
1008.24 * accompanied this code. If applicable, add the following below the
1008.25 * License Header, with the fields enclosed by brackets [] replaced by
1008.26 * your own identifying information:
1009.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/ClasspathCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1009.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/ClasspathCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1009.3 @@ -1,7 +1,10 @@
1009.4 /*
1009.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1009.6 *
1009.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1009.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1009.9 + *
1009.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1009.11 + * Other names may be trademarks of their respective owners.
1009.12 *
1009.13 * The contents of this file are subject to the terms of either the GNU
1009.14 * General Public License Version 2 only ("GPL") or the Common
1009.15 @@ -13,9 +16,9 @@
1009.16 * specific language governing permissions and limitations under the
1009.17 * License. When distributing the software, include this License Header
1009.18 * Notice in each file and include the License file at
1009.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1009.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1009.21 * particular file as subject to the "Classpath" exception as provided
1009.22 - * by Sun in the GPL Version 2 section of the License file that
1009.23 + * by Oracle in the GPL Version 2 section of the License file that
1009.24 * accompanied this code. If applicable, add the following below the
1009.25 * License Header, with the fields enclosed by brackets [] replaced by
1009.26 * your own identifying information:
1010.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/ColorCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1010.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/ColorCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1010.3 @@ -1,7 +1,10 @@
1010.4 /*
1010.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1010.6 *
1010.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1010.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1010.9 + *
1010.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1010.11 + * Other names may be trademarks of their respective owners.
1010.12 *
1010.13 * The contents of this file are subject to the terms of either the GNU
1010.14 * General Public License Version 2 only ("GPL") or the Common
1010.15 @@ -13,9 +16,9 @@
1010.16 * specific language governing permissions and limitations under the
1010.17 * License. When distributing the software, include this License Header
1010.18 * Notice in each file and include the License file at
1010.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1010.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1010.21 * particular file as subject to the "Classpath" exception as provided
1010.22 - * by Sun in the GPL Version 2 section of the License file that
1010.23 + * by Oracle in the GPL Version 2 section of the License file that
1010.24 * accompanied this code. If applicable, add the following below the
1010.25 * License Header, with the fields enclosed by brackets [] replaced by
1010.26 * your own identifying information:
1011.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/DimensionCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1011.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/DimensionCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1011.3 @@ -1,7 +1,10 @@
1011.4 /*
1011.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1011.6 *
1011.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1011.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1011.9 + *
1011.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1011.11 + * Other names may be trademarks of their respective owners.
1011.12 *
1011.13 * The contents of this file are subject to the terms of either the GNU
1011.14 * General Public License Version 2 only ("GPL") or the Common
1011.15 @@ -13,9 +16,9 @@
1011.16 * specific language governing permissions and limitations under the
1011.17 * License. When distributing the software, include this License Header
1011.18 * Notice in each file and include the License file at
1011.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1011.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1011.21 * particular file as subject to the "Classpath" exception as provided
1011.22 - * by Sun in the GPL Version 2 section of the License file that
1011.23 + * by Oracle in the GPL Version 2 section of the License file that
1011.24 * accompanied this code. If applicable, add the following below the
1011.25 * License Header, with the fields enclosed by brackets [] replaced by
1011.26 * your own identifying information:
1012.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/EnterAbbreviation.java Fri Jul 16 11:47:36 2010 -0400
1012.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/EnterAbbreviation.java Fri Jul 16 14:21:50 2010 -0400
1012.3 @@ -1,7 +1,10 @@
1012.4 /*
1012.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1012.6 *
1012.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1012.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1012.9 + *
1012.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1012.11 + * Other names may be trademarks of their respective owners.
1012.12 *
1012.13 * The contents of this file are subject to the terms of either the GNU
1012.14 * General Public License Version 2 only ("GPL") or the Common
1012.15 @@ -13,9 +16,9 @@
1012.16 * specific language governing permissions and limitations under the
1012.17 * License. When distributing the software, include this License Header
1012.18 * Notice in each file and include the License file at
1012.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1012.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1012.21 * particular file as subject to the "Classpath" exception as provided
1012.22 - * by Sun in the GPL Version 2 section of the License file that
1012.23 + * by Oracle in the GPL Version 2 section of the License file that
1012.24 * accompanied this code. If applicable, add the following below the
1012.25 * License Header, with the fields enclosed by brackets [] replaced by
1012.26 * your own identifying information:
1013.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/FileCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1013.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/FileCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1013.3 @@ -1,7 +1,10 @@
1013.4 /*
1013.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1013.6 *
1013.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1013.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1013.9 + *
1013.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1013.11 + * Other names may be trademarks of their respective owners.
1013.12 *
1013.13 * The contents of this file are subject to the terms of either the GNU
1013.14 * General Public License Version 2 only ("GPL") or the Common
1013.15 @@ -13,9 +16,9 @@
1013.16 * specific language governing permissions and limitations under the
1013.17 * License. When distributing the software, include this License Header
1013.18 * Notice in each file and include the License file at
1013.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1013.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1013.21 * particular file as subject to the "Classpath" exception as provided
1013.22 - * by Sun in the GPL Version 2 section of the License file that
1013.23 + * by Oracle in the GPL Version 2 section of the License file that
1013.24 * accompanied this code. If applicable, add the following below the
1013.25 * License Header, with the fields enclosed by brackets [] replaced by
1013.26 * your own identifying information:
1014.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/FindEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1014.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/FindEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1014.3 @@ -1,7 +1,10 @@
1014.4 /*
1014.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1014.6 *
1014.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1014.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1014.9 + *
1014.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1014.11 + * Other names may be trademarks of their respective owners.
1014.12 *
1014.13 * The contents of this file are subject to the terms of either the GNU
1014.14 * General Public License Version 2 only ("GPL") or the Common
1014.15 @@ -13,9 +16,9 @@
1014.16 * specific language governing permissions and limitations under the
1014.17 * License. When distributing the software, include this License Header
1014.18 * Notice in each file and include the License file at
1014.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1014.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1014.21 * particular file as subject to the "Classpath" exception as provided
1014.22 - * by Sun in the GPL Version 2 section of the License file that
1014.23 + * by Oracle in the GPL Version 2 section of the License file that
1014.24 * accompanied this code. If applicable, add the following below the
1014.25 * License Header, with the fields enclosed by brackets [] replaced by
1014.26 * your own identifying information:
1015.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/FontCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1015.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/FontCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1015.3 @@ -1,7 +1,10 @@
1015.4 /*
1015.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1015.6 *
1015.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1015.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1015.9 + *
1015.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1015.11 + * Other names may be trademarks of their respective owners.
1015.12 *
1015.13 * The contents of this file are subject to the terms of either the GNU
1015.14 * General Public License Version 2 only ("GPL") or the Common
1015.15 @@ -13,9 +16,9 @@
1015.16 * specific language governing permissions and limitations under the
1015.17 * License. When distributing the software, include this License Header
1015.18 * Notice in each file and include the License file at
1015.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1015.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1015.21 * particular file as subject to the "Classpath" exception as provided
1015.22 - * by Sun in the GPL Version 2 section of the License file that
1015.23 + * by Oracle in the GPL Version 2 section of the License file that
1015.24 * accompanied this code. If applicable, add the following below the
1015.25 * License Header, with the fields enclosed by brackets [] replaced by
1015.26 * your own identifying information:
1016.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/GoToLineEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1016.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/GoToLineEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1016.3 @@ -1,7 +1,10 @@
1016.4 /*
1016.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1016.6 *
1016.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1016.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1016.9 + *
1016.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1016.11 + * Other names may be trademarks of their respective owners.
1016.12 *
1016.13 * The contents of this file are subject to the terms of either the GNU
1016.14 * General Public License Version 2 only ("GPL") or the Common
1016.15 @@ -13,9 +16,9 @@
1016.16 * specific language governing permissions and limitations under the
1016.17 * License. When distributing the software, include this License Header
1016.18 * Notice in each file and include the License file at
1016.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1016.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1016.21 * particular file as subject to the "Classpath" exception as provided
1016.22 - * by Sun in the GPL Version 2 section of the License file that
1016.23 + * by Oracle in the GPL Version 2 section of the License file that
1016.24 * accompanied this code. If applicable, add the following below the
1016.25 * License Header, with the fields enclosed by brackets [] replaced by
1016.26 * your own identifying information:
1017.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/IconCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1017.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/IconCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1017.3 @@ -1,7 +1,10 @@
1017.4 /*
1017.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1017.6 *
1017.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1017.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1017.9 + *
1017.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1017.11 + * Other names may be trademarks of their respective owners.
1017.12 *
1017.13 * The contents of this file are subject to the terms of either the GNU
1017.14 * General Public License Version 2 only ("GPL") or the Common
1017.15 @@ -13,9 +16,9 @@
1017.16 * specific language governing permissions and limitations under the
1017.17 * License. When distributing the software, include this License Header
1017.18 * Notice in each file and include the License file at
1017.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1017.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1017.21 * particular file as subject to the "Classpath" exception as provided
1017.22 - * by Sun in the GPL Version 2 section of the License file that
1017.23 + * by Oracle in the GPL Version 2 section of the License file that
1017.24 * accompanied this code. If applicable, add the following below the
1017.25 * License Header, with the fields enclosed by brackets [] replaced by
1017.26 * your own identifying information:
1018.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/KeyBindingsEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1018.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/KeyBindingsEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1018.3 @@ -1,7 +1,10 @@
1018.4 /*
1018.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1018.6 *
1018.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1018.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1018.9 + *
1018.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1018.11 + * Other names may be trademarks of their respective owners.
1018.12 *
1018.13 * The contents of this file are subject to the terms of either the GNU
1018.14 * General Public License Version 2 only ("GPL") or the Common
1018.15 @@ -13,9 +16,9 @@
1018.16 * specific language governing permissions and limitations under the
1018.17 * License. When distributing the software, include this License Header
1018.18 * Notice in each file and include the License file at
1018.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1018.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1018.21 * particular file as subject to the "Classpath" exception as provided
1018.22 - * by Sun in the GPL Version 2 section of the License file that
1018.23 + * by Oracle in the GPL Version 2 section of the License file that
1018.24 * accompanied this code. If applicable, add the following below the
1018.25 * License Header, with the fields enclosed by brackets [] replaced by
1018.26 * your own identifying information:
1019.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/ProcessDescriptorCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1019.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/ProcessDescriptorCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1019.3 @@ -1,7 +1,10 @@
1019.4 /*
1019.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1019.6 *
1019.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1019.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1019.9 + *
1019.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1019.11 + * Other names may be trademarks of their respective owners.
1019.12 *
1019.13 * The contents of this file are subject to the terms of either the GNU
1019.14 * General Public License Version 2 only ("GPL") or the Common
1019.15 @@ -13,9 +16,9 @@
1019.16 * specific language governing permissions and limitations under the
1019.17 * License. When distributing the software, include this License Header
1019.18 * Notice in each file and include the License file at
1019.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1019.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1019.21 * particular file as subject to the "Classpath" exception as provided
1019.22 - * by Sun in the GPL Version 2 section of the License file that
1019.23 + * by Oracle in the GPL Version 2 section of the License file that
1019.24 * accompanied this code. If applicable, add the following below the
1019.25 * License Header, with the fields enclosed by brackets [] replaced by
1019.26 * your own identifying information:
1020.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/RectangleCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1020.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/RectangleCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1020.3 @@ -1,7 +1,10 @@
1020.4 /*
1020.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1020.6 *
1020.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1020.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1020.9 + *
1020.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1020.11 + * Other names may be trademarks of their respective owners.
1020.12 *
1020.13 * The contents of this file are subject to the terms of either the GNU
1020.14 * General Public License Version 2 only ("GPL") or the Common
1020.15 @@ -13,9 +16,9 @@
1020.16 * specific language governing permissions and limitations under the
1020.17 * License. When distributing the software, include this License Header
1020.18 * Notice in each file and include the License file at
1020.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1020.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1020.21 * particular file as subject to the "Classpath" exception as provided
1020.22 - * by Sun in the GPL Version 2 section of the License file that
1020.23 + * by Oracle in the GPL Version 2 section of the License file that
1020.24 * accompanied this code. If applicable, add the following below the
1020.25 * License Header, with the fields enclosed by brackets [] replaced by
1020.26 * your own identifying information:
1021.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/StringArrayCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1021.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/StringArrayCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1021.3 @@ -1,7 +1,10 @@
1021.4 /*
1021.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1021.6 *
1021.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1021.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1021.9 + *
1021.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1021.11 + * Other names may be trademarks of their respective owners.
1021.12 *
1021.13 * The contents of this file are subject to the terms of either the GNU
1021.14 * General Public License Version 2 only ("GPL") or the Common
1021.15 @@ -13,9 +16,9 @@
1021.16 * specific language governing permissions and limitations under the
1021.17 * License. When distributing the software, include this License Header
1021.18 * Notice in each file and include the License file at
1021.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1021.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1021.21 * particular file as subject to the "Classpath" exception as provided
1021.22 - * by Sun in the GPL Version 2 section of the License file that
1021.23 + * by Oracle in the GPL Version 2 section of the License file that
1021.24 * accompanied this code. If applicable, add the following below the
1021.25 * License Header, with the fields enclosed by brackets [] replaced by
1021.26 * your own identifying information:
1022.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/StringCustomEditorOperator.java Fri Jul 16 11:47:36 2010 -0400
1022.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/properties/editors/StringCustomEditorOperator.java Fri Jul 16 14:21:50 2010 -0400
1022.3 @@ -1,7 +1,10 @@
1022.4 /*
1022.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1022.6 *
1022.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1022.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1022.9 + *
1022.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1022.11 + * Other names may be trademarks of their respective owners.
1022.12 *
1022.13 * The contents of this file are subject to the terms of either the GNU
1022.14 * General Public License Version 2 only ("GPL") or the Common
1022.15 @@ -13,9 +16,9 @@
1022.16 * specific language governing permissions and limitations under the
1022.17 * License. When distributing the software, include this License Header
1022.18 * Notice in each file and include the License file at
1022.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1022.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1022.21 * particular file as subject to the "Classpath" exception as provided
1022.22 - * by Sun in the GPL Version 2 section of the License file that
1022.23 + * by Oracle in the GPL Version 2 section of the License file that
1022.24 * accompanied this code. If applicable, add the following below the
1022.25 * License Header, with the fields enclosed by brackets [] replaced by
1022.26 * your own identifying information:
1023.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/search/SearchPanelOperator.java Fri Jul 16 11:47:36 2010 -0400
1023.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/search/SearchPanelOperator.java Fri Jul 16 14:21:50 2010 -0400
1023.3 @@ -1,7 +1,10 @@
1023.4 /*
1023.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1023.6 *
1023.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1023.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1023.9 + *
1023.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1023.11 + * Other names may be trademarks of their respective owners.
1023.12 *
1023.13 * The contents of this file are subject to the terms of either the GNU
1023.14 * General Public License Version 2 only ("GPL") or the Common
1023.15 @@ -13,9 +16,9 @@
1023.16 * specific language governing permissions and limitations under the
1023.17 * License. When distributing the software, include this License Header
1023.18 * Notice in each file and include the License file at
1023.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1023.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1023.21 * particular file as subject to the "Classpath" exception as provided
1023.22 - * by Sun in the GPL Version 2 section of the License file that
1023.23 + * by Oracle in the GPL Version 2 section of the License file that
1023.24 * accompanied this code. If applicable, add the following below the
1023.25 * License Header, with the fields enclosed by brackets [] replaced by
1023.26 * your own identifying information:
1024.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/search/SearchResultsOperator.java Fri Jul 16 11:47:36 2010 -0400
1024.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/search/SearchResultsOperator.java Fri Jul 16 14:21:50 2010 -0400
1024.3 @@ -1,7 +1,10 @@
1024.4 /*
1024.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1024.6 *
1024.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1024.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1024.9 + *
1024.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1024.11 + * Other names may be trademarks of their respective owners.
1024.12 *
1024.13 * The contents of this file are subject to the terms of either the GNU
1024.14 * General Public License Version 2 only ("GPL") or the Common
1024.15 @@ -13,9 +16,9 @@
1024.16 * specific language governing permissions and limitations under the
1024.17 * License. When distributing the software, include this License Header
1024.18 * Notice in each file and include the License file at
1024.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1024.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1024.21 * particular file as subject to the "Classpath" exception as provided
1024.22 - * by Sun in the GPL Version 2 section of the License file that
1024.23 + * by Oracle in the GPL Version 2 section of the License file that
1024.24 * accompanied this code. If applicable, add the following below the
1024.25 * License Header, with the fields enclosed by brackets [] replaced by
1024.26 * your own identifying information:
1025.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/toolbox/PaletteContainerOperator.java Fri Jul 16 11:47:36 2010 -0400
1025.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/toolbox/PaletteContainerOperator.java Fri Jul 16 14:21:50 2010 -0400
1025.3 @@ -1,7 +1,10 @@
1025.4 /*
1025.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1025.6 *
1025.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1025.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1025.9 + *
1025.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1025.11 + * Other names may be trademarks of their respective owners.
1025.12 *
1025.13 * The contents of this file are subject to the terms of either the GNU
1025.14 * General Public License Version 2 only ("GPL") or the Common
1025.15 @@ -13,9 +16,9 @@
1025.16 * specific language governing permissions and limitations under the
1025.17 * License. When distributing the software, include this License Header
1025.18 * Notice in each file and include the License file at
1025.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1025.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1025.21 * particular file as subject to the "Classpath" exception as provided
1025.22 - * by Sun in the GPL Version 2 section of the License file that
1025.23 + * by Oracle in the GPL Version 2 section of the License file that
1025.24 * accompanied this code. If applicable, add the following below the
1025.25 * License Header, with the fields enclosed by brackets [] replaced by
1025.26 * your own identifying information:
1026.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/toolbox/ToolBoxOperator.java Fri Jul 16 11:47:36 2010 -0400
1026.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/toolbox/ToolBoxOperator.java Fri Jul 16 14:21:50 2010 -0400
1026.3 @@ -1,7 +1,10 @@
1026.4 /*
1026.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1026.6 *
1026.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1026.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1026.9 + *
1026.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1026.11 + * Other names may be trademarks of their respective owners.
1026.12 *
1026.13 * The contents of this file are subject to the terms of either the GNU
1026.14 * General Public License Version 2 only ("GPL") or the Common
1026.15 @@ -13,9 +16,9 @@
1026.16 * specific language governing permissions and limitations under the
1026.17 * License. When distributing the software, include this License Header
1026.18 * Notice in each file and include the License file at
1026.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1026.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1026.21 * particular file as subject to the "Classpath" exception as provided
1026.22 - * by Sun in the GPL Version 2 section of the License file that
1026.23 + * by Oracle in the GPL Version 2 section of the License file that
1026.24 * accompanied this code. If applicable, add the following below the
1026.25 * License Header, with the fields enclosed by brackets [] replaced by
1026.26 * your own identifying information:
1027.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/toolbox/actions/ShowPaletteAction.java Fri Jul 16 11:47:36 2010 -0400
1027.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/toolbox/actions/ShowPaletteAction.java Fri Jul 16 14:21:50 2010 -0400
1027.3 @@ -1,7 +1,10 @@
1027.4 /*
1027.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1027.6 *
1027.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1027.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1027.9 + *
1027.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1027.11 + * Other names may be trademarks of their respective owners.
1027.12 *
1027.13 * The contents of this file are subject to the terms of either the GNU
1027.14 * General Public License Version 2 only ("GPL") or the Common
1027.15 @@ -13,9 +16,9 @@
1027.16 * specific language governing permissions and limitations under the
1027.17 * License. When distributing the software, include this License Header
1027.18 * Notice in each file and include the License file at
1027.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1027.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1027.21 * particular file as subject to the "Classpath" exception as provided
1027.22 - * by Sun in the GPL Version 2 section of the License file that
1027.23 + * by Oracle in the GPL Version 2 section of the License file that
1027.24 * accompanied this code. If applicable, add the following below the
1027.25 * License Header, with the fields enclosed by brackets [] replaced by
1027.26 * your own identifying information:
1028.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/websvc/AddWebServiceOperator.java Fri Jul 16 11:47:36 2010 -0400
1028.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/websvc/AddWebServiceOperator.java Fri Jul 16 14:21:50 2010 -0400
1028.3 @@ -1,7 +1,10 @@
1028.4 /*
1028.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1028.6 *
1028.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1028.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1028.9 + *
1028.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1028.11 + * Other names may be trademarks of their respective owners.
1028.12 *
1028.13 * The contents of this file are subject to the terms of either the GNU
1028.14 * General Public License Version 2 only ("GPL") or the Common
1028.15 @@ -13,9 +16,9 @@
1028.16 * specific language governing permissions and limitations under the
1028.17 * License. When distributing the software, include this License Header
1028.18 * Notice in each file and include the License file at
1028.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1028.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1028.21 * particular file as subject to the "Classpath" exception as provided
1028.22 - * by Sun in the GPL Version 2 section of the License file that
1028.23 + * by Oracle in the GPL Version 2 section of the License file that
1028.24 * accompanied this code. If applicable, add the following below the
1028.25 * License Header, with the fields enclosed by brackets [] replaced by
1028.26 * your own identifying information:
1029.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/websvc/TestMethodOperator.java Fri Jul 16 11:47:36 2010 -0400
1029.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/websvc/TestMethodOperator.java Fri Jul 16 14:21:50 2010 -0400
1029.3 @@ -1,7 +1,10 @@
1029.4 /*
1029.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1029.6 *
1029.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1029.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1029.9 + *
1029.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1029.11 + * Other names may be trademarks of their respective owners.
1029.12 *
1029.13 * The contents of this file are subject to the terms of either the GNU
1029.14 * General Public License Version 2 only ("GPL") or the Common
1029.15 @@ -13,9 +16,9 @@
1029.16 * specific language governing permissions and limitations under the
1029.17 * License. When distributing the software, include this License Header
1029.18 * Notice in each file and include the License file at
1029.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1029.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1029.21 * particular file as subject to the "Classpath" exception as provided
1029.22 - * by Sun in the GPL Version 2 section of the License file that
1029.23 + * by Oracle in the GPL Version 2 section of the License file that
1029.24 * accompanied this code. If applicable, add the following below the
1029.25 * License Header, with the fields enclosed by brackets [] replaced by
1029.26 * your own identifying information:
1030.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/websvc/actions/AddWebServiceAction.java Fri Jul 16 11:47:36 2010 -0400
1030.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/websvc/actions/AddWebServiceAction.java Fri Jul 16 14:21:50 2010 -0400
1030.3 @@ -1,7 +1,10 @@
1030.4 /*
1030.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1030.6 *
1030.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1030.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1030.9 + *
1030.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1030.11 + * Other names may be trademarks of their respective owners.
1030.12 *
1030.13 * The contents of this file are subject to the terms of either the GNU
1030.14 * General Public License Version 2 only ("GPL") or the Common
1030.15 @@ -13,9 +16,9 @@
1030.16 * specific language governing permissions and limitations under the
1030.17 * License. When distributing the software, include this License Header
1030.18 * Notice in each file and include the License file at
1030.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1030.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1030.21 * particular file as subject to the "Classpath" exception as provided
1030.22 - * by Sun in the GPL Version 2 section of the License file that
1030.23 + * by Oracle in the GPL Version 2 section of the License file that
1030.24 * accompanied this code. If applicable, add the following below the
1030.25 * License Header, with the fields enclosed by brackets [] replaced by
1030.26 * your own identifying information:
1031.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/websvc/actions/CreateGroupAction.java Fri Jul 16 11:47:36 2010 -0400
1031.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/websvc/actions/CreateGroupAction.java Fri Jul 16 14:21:50 2010 -0400
1031.3 @@ -1,7 +1,10 @@
1031.4 /*
1031.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1031.6 *
1031.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1031.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1031.9 + *
1031.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1031.11 + * Other names may be trademarks of their respective owners.
1031.12 *
1031.13 * The contents of this file are subject to the terms of either the GNU
1031.14 * General Public License Version 2 only ("GPL") or the Common
1031.15 @@ -13,9 +16,9 @@
1031.16 * specific language governing permissions and limitations under the
1031.17 * License. When distributing the software, include this License Header
1031.18 * Notice in each file and include the License file at
1031.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1031.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1031.21 * particular file as subject to the "Classpath" exception as provided
1031.22 - * by Sun in the GPL Version 2 section of the License file that
1031.23 + * by Oracle in the GPL Version 2 section of the License file that
1031.24 * accompanied this code. If applicable, add the following below the
1031.25 * License Header, with the fields enclosed by brackets [] replaced by
1031.26 * your own identifying information:
1032.1 --- a/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/welcome/WelcomeOperator.java Fri Jul 16 11:47:36 2010 -0400
1032.2 +++ b/visualweb.gravy/src/org/netbeans/modules/visualweb/gravy/welcome/WelcomeOperator.java Fri Jul 16 14:21:50 2010 -0400
1032.3 @@ -1,7 +1,10 @@
1032.4 /*
1032.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1032.6 *
1032.7 -* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
1032.8 +* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1032.9 +*
1032.10 +* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1032.11 +* Other names may be trademarks of their respective owners.
1032.12 *
1032.13 * The contents of this file are subject to the terms of either the GNU
1032.14 * General Public License Version 2 only ("GPL") or the Common
1032.15 @@ -13,9 +16,9 @@
1032.16 * specific language governing permissions and limitations under the
1032.17 * License. When distributing the software, include this License Header
1032.18 * Notice in each file and include the License file at
1032.19 -* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1032.20 +* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1032.21 * particular file as subject to the "Classpath" exception as provided
1032.22 -* by Sun in the GPL Version 2 section of the License file that
1032.23 +* by Oracle in the GPL Version 2 section of the License file that
1032.24 * accompanied this code. If applicable, add the following below the
1032.25 * License Header, with the fields enclosed by brackets [] replaced by
1032.26 * your own identifying information:
1033.1 --- a/visualweb.insync/.classpath Fri Jul 16 11:47:36 2010 -0400
1033.2 +++ b/visualweb.insync/.classpath Fri Jul 16 14:21:50 2010 -0400
1033.3 @@ -19,10 +19,10 @@
1033.4 <classpathentry combineaccessrules="false" kind="src" path="/xml.xdm"/>
1033.5 <classpathentry combineaccessrules="false" kind="src" path="/web.jsf"/>
1033.6 <classpathentry combineaccessrules="false" kind="src" path="/webmodule.api"/>
1033.7 - <classpathentry kind="var" path="TRUNK_NB/platform11/core/org-openide-filesystems.jar"/>
1033.8 - <classpathentry kind="var" path="TRUNK_NB/platform11/lib/org-openide-modules.jar"/>
1033.9 - <classpathentry kind="var" path="TRUNK_NB/platform11/lib/org-openide-util.jar"/>
1033.10 - <classpathentry kind="var" path="TRUNK_NB/platform11/modules/org-openide-loaders.jar"/>
1033.11 - <classpathentry kind="var" path="TRUNK_NB/platform11/modules/org-openide-nodes.jar"/>
1033.12 + <classpathentry kind="var" path="TRUNK_NB/platform/core/org-openide-filesystems.jar"/>
1033.13 + <classpathentry kind="var" path="TRUNK_NB/platform/lib/org-openide-modules.jar"/>
1033.14 + <classpathentry kind="var" path="TRUNK_NB/platform/lib/org-openide-util.jar"/>
1033.15 + <classpathentry kind="var" path="TRUNK_NB/platform/modules/org-openide-loaders.jar"/>
1033.16 + <classpathentry kind="var" path="TRUNK_NB/platform/modules/org-openide-nodes.jar"/>
1033.17 <classpathentry kind="output" path="classes"/>
1033.18 </classpath>
1034.1 --- a/visualweb.insync/build.xml Fri Jul 16 11:47:36 2010 -0400
1034.2 +++ b/visualweb.insync/build.xml Fri Jul 16 14:21:50 2010 -0400
1034.3 @@ -2,7 +2,10 @@
1034.4 <!--
1034.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1034.6
1034.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1034.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1034.9 +
1034.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1034.11 +Other names may be trademarks of their respective owners.
1034.12
1034.13
1034.14 The contents of this file are subject to the terms of either the GNU
1034.15 @@ -15,9 +18,9 @@
1034.16 specific language governing permissions and limitations under the
1034.17 License. When distributing the software, include this License Header
1034.18 Notice in each file and include the License file at
1034.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1034.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1034.21 particular file as subject to the "Classpath" exception as provided
1034.22 -by Sun in the GPL Version 2 section of the License file that
1034.23 +by Oracle in the GPL Version 2 section of the License file that
1034.24 accompanied this code. If applicable, add the following below the
1034.25 License Header, with the fields enclosed by brackets [] replaced by
1034.26 your own identifying information:
1035.1 --- a/visualweb.insync/manifest.mf Fri Jul 16 11:47:36 2010 -0400
1035.2 +++ b/visualweb.insync/manifest.mf Fri Jul 16 14:21:50 2010 -0400
1035.3 @@ -1,5 +1,5 @@
1035.4 Manifest-Version: 1.0
1035.5 -OpenIDE-Module-Specification-Version: 2.7
1035.6 +OpenIDE-Module-Specification-Version: 2.8
1035.7 OpenIDE-Module: org.netbeans.modules.visualweb.insync/1
1035.8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/visualweb/insync/Bundle.properties
1035.9 OpenIDE-Module-Install: org/netbeans/modules/visualweb/insync/ModuleInstaller.class
1036.1 --- a/visualweb.insync/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1036.2 +++ b/visualweb.insync/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1036.3 @@ -1,6 +1,9 @@
1036.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1036.5 #
1036.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1036.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1036.8 +#
1036.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1036.10 +# Other names may be trademarks of their respective owners.
1036.11 #
1036.12 # The contents of this file are subject to the terms of either the GNU
1036.13 # General Public License Version 2 only ("GPL") or the Common
1036.14 @@ -12,9 +15,9 @@
1036.15 # specific language governing permissions and limitations under the
1036.16 # License. When distributing the software, include this License Header
1036.17 # Notice in each file and include the License file at
1036.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1036.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1036.20 # particular file as subject to the "Classpath" exception as provided
1036.21 -# by Sun in the GPL Version 2 section of the License file that
1036.22 +# by Oracle in the GPL Version 2 section of the License file that
1036.23 # accompanied this code. If applicable, add the following below the
1036.24 # License Header, with the fields enclosed by brackets [] replaced by
1036.25 # your own identifying information:
1036.26 @@ -46,7 +49,7 @@
1036.27 #${ravelibs/jsf.dir}/${nb.modules.dir}/ext/propertyeditors.jar:\
1036.28 # Why doesn't the Xerces libs reference in project.xml achieve this?
1036.29 build.compiler.deprecation=false
1036.30 -javac.source=1.5
1036.31 +javac.source=1.6
1036.32 javadoc.arch=${basedir}/arch/arch-insync.xml
1036.33
1036.34 # XXX release55 hack only - to get around the build check on modules with no public packages.
1036.35 @@ -65,5 +68,5 @@
1036.36 test-unit-sys-prop.visualweb.project.facesconfig=faces-config
1036.37
1036.38
1036.39 -test-unit-sys-prop.j2ee.platform.classpath=${netbeans.dest.dir}\\enterprise4\\modules\\ext\\jsf-1_2\\jsf-api.jar;${netbeans.dest.dir}\\enterprise4\\modules\\ext\\jsf-1_2\\jsf-impl.jar
1036.40 -test-unit-sys-prop.netbeans.dirs=${netbeans.dest.dir}\\java1;${netbeans.dest.dir}\\enterprise4;${netbeans.dest.dir}\\visualweb1
1036.41 +test-unit-sys-prop.j2ee.platform.classpath=${netbeans.dest.dir}\\enterprise\\modules\\ext\\jsf-1_2\\jsf-api.jar;${netbeans.dest.dir}\\enterprise\\modules\\ext\\jsf-1_2\\jsf-impl.jar
1036.42 +test-unit-sys-prop.netbeans.dirs=${netbeans.dest.dir}\\java;${netbeans.dest.dir}\\enterprise;${netbeans.dest.dir}\\visualweb
1037.1 --- a/visualweb.insync/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1037.2 +++ b/visualweb.insync/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1037.3 @@ -2,7 +2,10 @@
1037.4 <!--
1037.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1037.6
1037.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1037.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1037.9 +
1037.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1037.11 +Other names may be trademarks of their respective owners.
1037.12
1037.13
1037.14 The contents of this file are subject to the terms of either the GNU
1037.15 @@ -15,9 +18,9 @@
1037.16 specific language governing permissions and limitations under the
1037.17 License. When distributing the software, include this License Header
1037.18 Notice in each file and include the License file at
1037.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1037.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1037.21 particular file as subject to the "Classpath" exception as provided
1037.22 -by Sun in the GPL Version 2 section of the License file that
1037.23 +by Oracle in the GPL Version 2 section of the License file that
1037.24 accompanied this code. If applicable, add the following below the
1037.25 License Header, with the fields enclosed by brackets [] replaced by
1037.26 your own identifying information:
1037.27 @@ -112,8 +115,8 @@
1037.28 <build-prerequisite/>
1037.29 <compile-dependency/>
1037.30 <run-dependency>
1037.31 - <release-version>1</release-version>
1037.32 - <specification-version>1.27</specification-version>
1037.33 + <release-version>2</release-version>
1037.34 + <specification-version>2.1</specification-version>
1037.35 </run-dependency>
1037.36 </dependency>
1037.37 <dependency>
1037.38 @@ -461,7 +464,15 @@
1037.39 <build-prerequisite/>
1037.40 <compile-dependency/>
1037.41 <run-dependency>
1037.42 - <specification-version>7.15</specification-version>
1037.43 + <specification-version>8.0</specification-version>
1037.44 + </run-dependency>
1037.45 + </dependency>
1037.46 + <dependency>
1037.47 + <code-name-base>org.openide.util.lookup</code-name-base>
1037.48 + <build-prerequisite/>
1037.49 + <compile-dependency/>
1037.50 + <run-dependency>
1037.51 + <specification-version>8.0</specification-version>
1037.52 </run-dependency>
1037.53 </dependency>
1037.54 <dependency>
1038.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1038.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1038.3 @@ -1,6 +1,9 @@
1038.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1038.5 #
1038.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1038.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1038.8 +#
1038.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1038.10 +# Other names may be trademarks of their respective owners.
1038.11 #
1038.12 # The contents of this file are subject to the terms of either the GNU
1038.13 # General Public License Version 2 only ("GPL") or the Common
1038.14 @@ -12,9 +15,9 @@
1038.15 # specific language governing permissions and limitations under the
1038.16 # License. When distributing the software, include this License Header
1038.17 # Notice in each file and include the License file at
1038.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1038.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1038.20 # particular file as subject to the "Classpath" exception as provided
1038.21 -# by Sun in the GPL Version 2 section of the License file that
1038.22 +# by Oracle in the GPL Version 2 section of the License file that
1038.23 # accompanied this code. If applicable, add the following below the
1038.24 # License Header, with the fields enclosed by brackets [] replaced by
1038.25 # your own identifying information:
1039.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Convertors.java Fri Jul 16 11:47:36 2010 -0400
1039.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Convertors.java Fri Jul 16 14:21:50 2010 -0400
1039.3 @@ -1,7 +1,10 @@
1039.4 /*
1039.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1039.6 *
1039.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1039.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1039.9 + *
1039.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1039.11 + * Other names may be trademarks of their respective owners.
1039.12 *
1039.13 * The contents of this file are subject to the terms of either the GNU
1039.14 * General Public License Version 2 only ("GPL") or the Common
1039.15 @@ -13,9 +16,9 @@
1039.16 * specific language governing permissions and limitations under the
1039.17 * License. When distributing the software, include this License Header
1039.18 * Notice in each file and include the License file at
1039.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1039.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1039.21 * particular file as subject to the "Classpath" exception as provided
1039.22 - * by Sun in the GPL Version 2 section of the License file that
1039.23 + * by Oracle in the GPL Version 2 section of the License file that
1039.24 * accompanied this code. If applicable, add the following below the
1039.25 * License Header, with the fields enclosed by brackets [] replaced by
1039.26 * your own identifying information:
1040.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/CustomizerDisplayer.java Fri Jul 16 11:47:36 2010 -0400
1040.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/CustomizerDisplayer.java Fri Jul 16 14:21:50 2010 -0400
1040.3 @@ -1,7 +1,10 @@
1040.4 /*
1040.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1040.6 *
1040.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1040.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1040.9 + *
1040.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1040.11 + * Other names may be trademarks of their respective owners.
1040.12 *
1040.13 * The contents of this file are subject to the terms of either the GNU
1040.14 * General Public License Version 2 only ("GPL") or the Common
1040.15 @@ -13,9 +16,9 @@
1040.16 * specific language governing permissions and limitations under the
1040.17 * License. When distributing the software, include this License Header
1040.18 * Notice in each file and include the License file at
1040.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1040.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1040.21 * particular file as subject to the "Classpath" exception as provided
1040.22 - * by Sun in the GPL Version 2 section of the License file that
1040.23 + * by Oracle in the GPL Version 2 section of the License file that
1040.24 * accompanied this code. If applicable, add the following below the
1040.25 * License Header, with the fields enclosed by brackets [] replaced by
1040.26 * your own identifying information:
1041.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/DebugIdentityHashMap.java Fri Jul 16 11:47:36 2010 -0400
1041.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/DebugIdentityHashMap.java Fri Jul 16 14:21:50 2010 -0400
1041.3 @@ -1,7 +1,10 @@
1041.4 /*
1041.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1041.6 *
1041.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1041.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1041.9 + *
1041.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1041.11 + * Other names may be trademarks of their respective owners.
1041.12 *
1041.13 * The contents of this file are subject to the terms of either the GNU
1041.14 * General Public License Version 2 only ("GPL") or the Common
1041.15 @@ -13,9 +16,9 @@
1041.16 * specific language governing permissions and limitations under the
1041.17 * License. When distributing the software, include this License Header
1041.18 * Notice in each file and include the License file at
1041.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1041.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1041.21 * particular file as subject to the "Classpath" exception as provided
1041.22 - * by Sun in the GPL Version 2 section of the License file that
1041.23 + * by Oracle in the GPL Version 2 section of the License file that
1041.24 * accompanied this code. If applicable, add the following below the
1041.25 * License Header, with the fields enclosed by brackets [] replaced by
1041.26 * your own identifying information:
1042.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/EncodingHelper.java Fri Jul 16 11:47:36 2010 -0400
1042.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/EncodingHelper.java Fri Jul 16 14:21:50 2010 -0400
1042.3 @@ -1,7 +1,10 @@
1042.4 /*
1042.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1042.6 *
1042.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1042.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1042.9 + *
1042.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1042.11 + * Other names may be trademarks of their respective owners.
1042.12 *
1042.13 * The contents of this file are subject to the terms of either the GNU
1042.14 * General Public License Version 2 only ("GPL") or the Common
1042.15 @@ -13,9 +16,9 @@
1042.16 * specific language governing permissions and limitations under the
1042.17 * License. When distributing the software, include this License Header
1042.18 * Notice in each file and include the License file at
1042.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1042.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1042.21 * particular file as subject to the "Classpath" exception as provided
1042.22 - * by Sun in the GPL Version 2 section of the License file that
1042.23 + * by Oracle in the GPL Version 2 section of the License file that
1042.24 * accompanied this code. If applicable, add the following below the
1042.25 * License Header, with the fields enclosed by brackets [] replaced by
1042.26 * your own identifying information:
1043.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/FileDocument.java Fri Jul 16 11:47:36 2010 -0400
1043.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/FileDocument.java Fri Jul 16 14:21:50 2010 -0400
1043.3 @@ -1,7 +1,10 @@
1043.4 /*
1043.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1043.6 *
1043.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1043.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1043.9 + *
1043.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1043.11 + * Other names may be trademarks of their respective owners.
1043.12 *
1043.13 * The contents of this file are subject to the terms of either the GNU
1043.14 * General Public License Version 2 only ("GPL") or the Common
1043.15 @@ -13,9 +16,9 @@
1043.16 * specific language governing permissions and limitations under the
1043.17 * License. When distributing the software, include this License Header
1043.18 * Notice in each file and include the License file at
1043.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1043.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1043.21 * particular file as subject to the "Classpath" exception as provided
1043.22 - * by Sun in the GPL Version 2 section of the License file that
1043.23 + * by Oracle in the GPL Version 2 section of the License file that
1043.24 * accompanied this code. If applicable, add the following below the
1043.25 * License Header, with the fields enclosed by brackets [] replaced by
1043.26 * your own identifying information:
1044.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/FileObjectVisitor.java Fri Jul 16 11:47:36 2010 -0400
1044.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/FileObjectVisitor.java Fri Jul 16 14:21:50 2010 -0400
1044.3 @@ -1,7 +1,10 @@
1044.4 /*
1044.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1044.6 *
1044.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1044.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1044.9 + *
1044.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1044.11 + * Other names may be trademarks of their respective owners.
1044.12 *
1044.13 * The contents of this file are subject to the terms of either the GNU
1044.14 * General Public License Version 2 only ("GPL") or the Common
1044.15 @@ -13,9 +16,9 @@
1044.16 * specific language governing permissions and limitations under the
1044.17 * License. When distributing the software, include this License Header
1044.18 * Notice in each file and include the License file at
1044.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1044.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1044.21 * particular file as subject to the "Classpath" exception as provided
1044.22 - * by Sun in the GPL Version 2 section of the License file that
1044.23 + * by Oracle in the GPL Version 2 section of the License file that
1044.24 * accompanied this code. If applicable, add the following below the
1044.25 * License Header, with the fields enclosed by brackets [] replaced by
1044.26 * your own identifying information:
1045.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProvider.java Fri Jul 16 11:47:36 2010 -0400
1045.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProvider.java Fri Jul 16 14:21:50 2010 -0400
1045.3 @@ -1,7 +1,10 @@
1045.4 /*
1045.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1045.6 *
1045.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1045.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1045.9 + *
1045.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1045.11 + * Other names may be trademarks of their respective owners.
1045.12 *
1045.13 * The contents of this file are subject to the terms of either the GNU
1045.14 * General Public License Version 2 only ("GPL") or the Common
1045.15 @@ -13,9 +16,9 @@
1045.16 * specific language governing permissions and limitations under the
1045.17 * License. When distributing the software, include this License Header
1045.18 * Notice in each file and include the License file at
1045.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1045.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1045.21 * particular file as subject to the "Classpath" exception as provided
1045.22 - * by Sun in the GPL Version 2 section of the License file that
1045.23 + * by Oracle in the GPL Version 2 section of the License file that
1045.24 * accompanied this code. If applicable, add the following below the
1045.25 * License Header, with the fields enclosed by brackets [] replaced by
1045.26 * your own identifying information:
1046.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProviderQuery.java Fri Jul 16 11:47:36 2010 -0400
1046.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/InSyncServiceProviderQuery.java Fri Jul 16 14:21:50 2010 -0400
1046.3 @@ -1,7 +1,10 @@
1046.4 /*
1046.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1046.6 *
1046.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1046.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1046.9 + *
1046.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1046.11 + * Other names may be trademarks of their respective owners.
1046.12 *
1046.13 * The contents of this file are subject to the terms of either the GNU
1046.14 * General Public License Version 2 only ("GPL") or the Common
1046.15 @@ -13,9 +16,9 @@
1046.16 * specific language governing permissions and limitations under the
1046.17 * License. When distributing the software, include this License Header
1046.18 * Notice in each file and include the License file at
1046.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1046.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1046.21 * particular file as subject to the "Classpath" exception as provided
1046.22 - * by Sun in the GPL Version 2 section of the License file that
1046.23 + * by Oracle in the GPL Version 2 section of the License file that
1046.24 * accompanied this code. If applicable, add the following below the
1046.25 * License Header, with the fields enclosed by brackets [] replaced by
1046.26 * your own identifying information:
1047.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Model.java Fri Jul 16 11:47:36 2010 -0400
1047.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Model.java Fri Jul 16 14:21:50 2010 -0400
1047.3 @@ -1,7 +1,10 @@
1047.4 /*
1047.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1047.6 *
1047.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1047.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1047.9 + *
1047.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1047.11 + * Other names may be trademarks of their respective owners.
1047.12 *
1047.13 * The contents of this file are subject to the terms of either the GNU
1047.14 * General Public License Version 2 only ("GPL") or the Common
1047.15 @@ -13,9 +16,9 @@
1047.16 * specific language governing permissions and limitations under the
1047.17 * License. When distributing the software, include this License Header
1047.18 * Notice in each file and include the License file at
1047.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1047.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1047.21 * particular file as subject to the "Classpath" exception as provided
1047.22 - * by Sun in the GPL Version 2 section of the License file that
1047.23 + * by Oracle in the GPL Version 2 section of the License file that
1047.24 * accompanied this code. If applicable, add the following below the
1047.25 * License Header, with the fields enclosed by brackets [] replaced by
1047.26 * your own identifying information:
1048.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java Fri Jul 16 11:47:36 2010 -0400
1048.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSet.java Fri Jul 16 14:21:50 2010 -0400
1048.3 @@ -1,7 +1,10 @@
1048.4 /*
1048.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1048.6 *
1048.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1048.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1048.9 + *
1048.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1048.11 + * Other names may be trademarks of their respective owners.
1048.12 *
1048.13 * The contents of this file are subject to the terms of either the GNU
1048.14 * General Public License Version 2 only ("GPL") or the Common
1048.15 @@ -13,9 +16,9 @@
1048.16 * specific language governing permissions and limitations under the
1048.17 * License. When distributing the software, include this License Header
1048.18 * Notice in each file and include the License file at
1048.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1048.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1048.21 * particular file as subject to the "Classpath" exception as provided
1048.22 - * by Sun in the GPL Version 2 section of the License file that
1048.23 + * by Oracle in the GPL Version 2 section of the License file that
1048.24 * accompanied this code. If applicable, add the following below the
1048.25 * License Header, with the fields enclosed by brackets [] replaced by
1048.26 * your own identifying information:
1049.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSetListener.java Fri Jul 16 11:47:36 2010 -0400
1049.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSetListener.java Fri Jul 16 14:21:50 2010 -0400
1049.3 @@ -1,7 +1,10 @@
1049.4 /*
1049.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1049.6 *
1049.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1049.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1049.9 + *
1049.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1049.11 + * Other names may be trademarks of their respective owners.
1049.12 *
1049.13 * The contents of this file are subject to the terms of either the GNU
1049.14 * General Public License Version 2 only ("GPL") or the Common
1049.15 @@ -13,9 +16,9 @@
1049.16 * specific language governing permissions and limitations under the
1049.17 * License. When distributing the software, include this License Header
1049.18 * Notice in each file and include the License file at
1049.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1049.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1049.21 * particular file as subject to the "Classpath" exception as provided
1049.22 - * by Sun in the GPL Version 2 section of the License file that
1049.23 + * by Oracle in the GPL Version 2 section of the License file that
1049.24 * accompanied this code. If applicable, add the following below the
1049.25 * License Header, with the fields enclosed by brackets [] replaced by
1049.26 * your own identifying information:
1050.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSetsListener.java Fri Jul 16 11:47:36 2010 -0400
1050.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModelSetsListener.java Fri Jul 16 14:21:50 2010 -0400
1050.3 @@ -1,7 +1,10 @@
1050.4 /*
1050.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1050.6 *
1050.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1050.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1050.9 + *
1050.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1050.11 + * Other names may be trademarks of their respective owners.
1050.12 *
1050.13 * The contents of this file are subject to the terms of either the GNU
1050.14 * General Public License Version 2 only ("GPL") or the Common
1050.15 @@ -13,9 +16,9 @@
1050.16 * specific language governing permissions and limitations under the
1050.17 * License. When distributing the software, include this License Header
1050.18 * Notice in each file and include the License file at
1050.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1050.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1050.21 * particular file as subject to the "Classpath" exception as provided
1050.22 - * by Sun in the GPL Version 2 section of the License file that
1050.23 + * by Oracle in the GPL Version 2 section of the License file that
1050.24 * accompanied this code. If applicable, add the following below the
1050.25 * License Header, with the fields enclosed by brackets [] replaced by
1050.26 * your own identifying information:
1051.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModuleInstaller.java Fri Jul 16 11:47:36 2010 -0400
1051.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ModuleInstaller.java Fri Jul 16 14:21:50 2010 -0400
1051.3 @@ -1,7 +1,10 @@
1051.4 /*
1051.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1051.6 *
1051.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1051.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1051.9 + *
1051.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1051.11 + * Other names may be trademarks of their respective owners.
1051.12 *
1051.13 * The contents of this file are subject to the terms of either the GNU
1051.14 * General Public License Version 2 only ("GPL") or the Common
1051.15 @@ -13,9 +16,9 @@
1051.16 * specific language governing permissions and limitations under the
1051.17 * License. When distributing the software, include this License Header
1051.18 * Notice in each file and include the License file at
1051.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1051.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1051.21 * particular file as subject to the "Classpath" exception as provided
1051.22 - * by Sun in the GPL Version 2 section of the License file that
1051.23 + * by Oracle in the GPL Version 2 section of the License file that
1051.24 * accompanied this code. If applicable, add the following below the
1051.25 * License Header, with the fields enclosed by brackets [] replaced by
1051.26 * your own identifying information:
1052.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ParserAnnotation.java Fri Jul 16 11:47:36 2010 -0400
1052.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ParserAnnotation.java Fri Jul 16 14:21:50 2010 -0400
1052.3 @@ -1,7 +1,10 @@
1052.4 /*
1052.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1052.6 *
1052.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1052.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1052.9 + *
1052.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1052.11 + * Other names may be trademarks of their respective owners.
1052.12 *
1052.13 * The contents of this file are subject to the terms of either the GNU
1052.14 * General Public License Version 2 only ("GPL") or the Common
1052.15 @@ -13,9 +16,9 @@
1052.16 * specific language governing permissions and limitations under the
1052.17 * License. When distributing the software, include this License Header
1052.18 * Notice in each file and include the License file at
1052.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1052.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1052.21 * particular file as subject to the "Classpath" exception as provided
1052.22 - * by Sun in the GPL Version 2 section of the License file that
1052.23 + * by Oracle in the GPL Version 2 section of the License file that
1052.24 * accompanied this code. If applicable, add the following below the
1052.25 * License Header, with the fields enclosed by brackets [] replaced by
1052.26 * your own identifying information:
1053.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ResultHandler.java Fri Jul 16 11:47:36 2010 -0400
1053.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/ResultHandler.java Fri Jul 16 14:21:50 2010 -0400
1053.3 @@ -1,7 +1,10 @@
1053.4 /*
1053.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1053.6 *
1053.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1053.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1053.9 + *
1053.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1053.11 + * Other names may be trademarks of their respective owners.
1053.12 *
1053.13 * The contents of this file are subject to the terms of either the GNU
1053.14 * General Public License Version 2 only ("GPL") or the Common
1053.15 @@ -13,9 +16,9 @@
1053.16 * specific language governing permissions and limitations under the
1053.17 * License. When distributing the software, include this License Header
1053.18 * Notice in each file and include the License file at
1053.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1053.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1053.21 * particular file as subject to the "Classpath" exception as provided
1053.22 - * by Sun in the GPL Version 2 section of the License file that
1053.23 + * by Oracle in the GPL Version 2 section of the License file that
1053.24 * accompanied this code. If applicable, add the following below the
1053.25 * License Header, with the fields enclosed by brackets [] replaced by
1053.26 * your own identifying information:
1054.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java Fri Jul 16 11:47:36 2010 -0400
1054.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/SourceUnit.java Fri Jul 16 14:21:50 2010 -0400
1054.3 @@ -1,7 +1,10 @@
1054.4 /*
1054.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1054.6 *
1054.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1054.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1054.9 + *
1054.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1054.11 + * Other names may be trademarks of their respective owners.
1054.12 *
1054.13 * The contents of this file are subject to the terms of either the GNU
1054.14 * General Public License Version 2 only ("GPL") or the Common
1054.15 @@ -13,9 +16,9 @@
1054.16 * specific language governing permissions and limitations under the
1054.17 * License. When distributing the software, include this License Header
1054.18 * Notice in each file and include the License file at
1054.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1054.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1054.21 * particular file as subject to the "Classpath" exception as provided
1054.22 - * by Sun in the GPL Version 2 section of the License file that
1054.23 + * by Oracle in the GPL Version 2 section of the License file that
1054.24 * accompanied this code. If applicable, add the following below the
1054.25 * License Header, with the fields enclosed by brackets [] replaced by
1054.26 * your own identifying information:
1055.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/SourceUnitListener.java Fri Jul 16 11:47:36 2010 -0400
1055.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/SourceUnitListener.java Fri Jul 16 14:21:50 2010 -0400
1055.3 @@ -1,7 +1,10 @@
1055.4 /*
1055.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1055.6 *
1055.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1055.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1055.9 + *
1055.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1055.11 + * Other names may be trademarks of their respective owners.
1055.12 *
1055.13 * The contents of this file are subject to the terms of either the GNU
1055.14 * General Public License Version 2 only ("GPL") or the Common
1055.15 @@ -13,9 +16,9 @@
1055.16 * specific language governing permissions and limitations under the
1055.17 * License. When distributing the software, include this License Header
1055.18 * Notice in each file and include the License file at
1055.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1055.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1055.21 * particular file as subject to the "Classpath" exception as provided
1055.22 - * by Sun in the GPL Version 2 section of the License file that
1055.23 + * by Oracle in the GPL Version 2 section of the License file that
1055.24 * accompanied this code. If applicable, add the following below the
1055.25 * License Header, with the fields enclosed by brackets [] replaced by
1055.26 * your own identifying information:
1056.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/UndoEvent.java Fri Jul 16 11:47:36 2010 -0400
1056.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/UndoEvent.java Fri Jul 16 14:21:50 2010 -0400
1056.3 @@ -1,7 +1,10 @@
1056.4 /*
1056.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1056.6 *
1056.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1056.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1056.9 + *
1056.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1056.11 + * Other names may be trademarks of their respective owners.
1056.12 *
1056.13 * The contents of this file are subject to the terms of either the GNU
1056.14 * General Public License Version 2 only ("GPL") or the Common
1056.15 @@ -13,9 +16,9 @@
1056.16 * specific language governing permissions and limitations under the
1056.17 * License. When distributing the software, include this License Header
1056.18 * Notice in each file and include the License file at
1056.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1056.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1056.21 * particular file as subject to the "Classpath" exception as provided
1056.22 - * by Sun in the GPL Version 2 section of the License file that
1056.23 + * by Oracle in the GPL Version 2 section of the License file that
1056.24 * accompanied this code. If applicable, add the following below the
1056.25 * License Header, with the fields enclosed by brackets [] replaced by
1056.26 * your own identifying information:
1057.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/UndoManager.java Fri Jul 16 11:47:36 2010 -0400
1057.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/UndoManager.java Fri Jul 16 14:21:50 2010 -0400
1057.3 @@ -1,7 +1,10 @@
1057.4 /*
1057.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1057.6 *
1057.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1057.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1057.9 + *
1057.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1057.11 + * Other names may be trademarks of their respective owners.
1057.12 *
1057.13 * The contents of this file are subject to the terms of either the GNU
1057.14 * General Public License Version 2 only ("GPL") or the Common
1057.15 @@ -13,9 +16,9 @@
1057.16 * specific language governing permissions and limitations under the
1057.17 * License. When distributing the software, include this License Header
1057.18 * Notice in each file and include the License file at
1057.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1057.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1057.21 * particular file as subject to the "Classpath" exception as provided
1057.22 - * by Sun in the GPL Version 2 section of the License file that
1057.23 + * by Oracle in the GPL Version 2 section of the License file that
1057.24 * accompanied this code. If applicable, add the following below the
1057.25 * License Header, with the fields enclosed by brackets [] replaced by
1057.26 * your own identifying information:
1058.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Unit.java Fri Jul 16 11:47:36 2010 -0400
1058.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Unit.java Fri Jul 16 14:21:50 2010 -0400
1058.3 @@ -1,7 +1,10 @@
1058.4 /*
1058.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1058.6 *
1058.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1058.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1058.9 + *
1058.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1058.11 + * Other names may be trademarks of their respective owners.
1058.12 *
1058.13 * The contents of this file are subject to the terms of either the GNU
1058.14 * General Public License Version 2 only ("GPL") or the Common
1058.15 @@ -13,9 +16,9 @@
1058.16 * specific language governing permissions and limitations under the
1058.17 * License. When distributing the software, include this License Header
1058.18 * Notice in each file and include the License file at
1058.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1058.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1058.21 * particular file as subject to the "Classpath" exception as provided
1058.22 - * by Sun in the GPL Version 2 section of the License file that
1058.23 + * by Oracle in the GPL Version 2 section of the License file that
1058.24 * accompanied this code. If applicable, add the following below the
1058.25 * License Header, with the fields enclosed by brackets [] replaced by
1058.26 * your own identifying information:
1059.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Util.java Fri Jul 16 11:47:36 2010 -0400
1059.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Util.java Fri Jul 16 14:21:50 2010 -0400
1059.3 @@ -1,7 +1,10 @@
1059.4 /*
1059.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1059.6 *
1059.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1059.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1059.9 + *
1059.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1059.11 + * Other names may be trademarks of their respective owners.
1059.12 *
1059.13 * The contents of this file are subject to the terms of either the GNU
1059.14 * General Public License Version 2 only ("GPL") or the Common
1059.15 @@ -13,9 +16,9 @@
1059.16 * specific language governing permissions and limitations under the
1059.17 * License. When distributing the software, include this License Header
1059.18 * Notice in each file and include the License file at
1059.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1059.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1059.21 * particular file as subject to the "Classpath" exception as provided
1059.22 - * by Sun in the GPL Version 2 section of the License file that
1059.23 + * by Oracle in the GPL Version 2 section of the License file that
1059.24 * accompanied this code. If applicable, add the following below the
1059.25 * License Header, with the fields enclosed by brackets [] replaced by
1059.26 * your own identifying information:
1060.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/AbstractDisplayActionAction.java Fri Jul 16 11:47:36 2010 -0400
1060.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/AbstractDisplayActionAction.java Fri Jul 16 14:21:50 2010 -0400
1060.3 @@ -1,7 +1,10 @@
1060.4 /*
1060.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1060.6 *
1060.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1060.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1060.9 + *
1060.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1060.11 + * Other names may be trademarks of their respective owners.
1060.12 *
1060.13 * The contents of this file are subject to the terms of either the GNU
1060.14 * General Public License Version 2 only ("GPL") or the Common
1060.15 @@ -13,9 +16,9 @@
1060.16 * specific language governing permissions and limitations under the
1060.17 * License. When distributing the software, include this License Header
1060.18 * Notice in each file and include the License file at
1060.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1060.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1060.21 * particular file as subject to the "Classpath" exception as provided
1060.22 - * by Sun in the GPL Version 2 section of the License file that
1060.23 + * by Oracle in the GPL Version 2 section of the License file that
1060.24 * accompanied this code. If applicable, add the following below the
1060.25 * License Header, with the fields enclosed by brackets [] replaced by
1060.26 * your own identifying information:
1061.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/AddRemoveBindingAttributeAction.java Fri Jul 16 11:47:36 2010 -0400
1061.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/AddRemoveBindingAttributeAction.java Fri Jul 16 14:21:50 2010 -0400
1061.3 @@ -1,7 +1,10 @@
1061.4 /*
1061.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1061.6 *
1061.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1061.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1061.9 + *
1061.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1061.11 + * Other names may be trademarks of their respective owners.
1061.12 *
1061.13 * The contents of this file are subject to the terms of either the GNU
1061.14 * General Public License Version 2 only ("GPL") or the Common
1061.15 @@ -13,9 +16,9 @@
1061.16 * specific language governing permissions and limitations under the
1061.17 * License. When distributing the software, include this License Header
1061.18 * Notice in each file and include the License file at
1061.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1061.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1061.21 * particular file as subject to the "Classpath" exception as provided
1061.22 - * by Sun in the GPL Version 2 section of the License file that
1061.23 + * by Oracle in the GPL Version 2 section of the License file that
1061.24 * accompanied this code. If applicable, add the following below the
1061.25 * License Header, with the fields enclosed by brackets [] replaced by
1061.26 * your own identifying information:
1062.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/BrowserPreview.java Fri Jul 16 11:47:36 2010 -0400
1062.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/BrowserPreview.java Fri Jul 16 14:21:50 2010 -0400
1062.3 @@ -1,7 +1,10 @@
1062.4 /*
1062.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1062.6 *
1062.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1062.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1062.9 + *
1062.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1062.11 + * Other names may be trademarks of their respective owners.
1062.12 *
1062.13 * The contents of this file are subject to the terms of either the GNU
1062.14 * General Public License Version 2 only ("GPL") or the Common
1062.15 @@ -13,9 +16,9 @@
1062.16 * specific language governing permissions and limitations under the
1062.17 * License. When distributing the software, include this License Header
1062.18 * Notice in each file and include the License file at
1062.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1062.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1062.21 * particular file as subject to the "Classpath" exception as provided
1062.22 - * by Sun in the GPL Version 2 section of the License file that
1062.23 + * by Oracle in the GPL Version 2 section of the License file that
1062.24 * accompanied this code. If applicable, add the following below the
1062.25 * License Header, with the fields enclosed by brackets [] replaced by
1062.26 * your own identifying information:
1063.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/BrowserPreviewAction.java Fri Jul 16 11:47:36 2010 -0400
1063.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/BrowserPreviewAction.java Fri Jul 16 14:21:50 2010 -0400
1063.3 @@ -1,7 +1,10 @@
1063.4 /*
1063.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1063.6 *
1063.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1063.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1063.9 + *
1063.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1063.11 + * Other names may be trademarks of their respective owners.
1063.12 *
1063.13 * The contents of this file are subject to the terms of either the GNU
1063.14 * General Public License Version 2 only ("GPL") or the Common
1063.15 @@ -13,9 +16,9 @@
1063.16 * specific language governing permissions and limitations under the
1063.17 * License. When distributing the software, include this License Header
1063.18 * Notice in each file and include the License file at
1063.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1063.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1063.21 * particular file as subject to the "Classpath" exception as provided
1063.22 - * by Sun in the GPL Version 2 section of the License file that
1063.23 + * by Oracle in the GPL Version 2 section of the License file that
1063.24 * accompanied this code. If applicable, add the following below the
1063.25 * License Header, with the fields enclosed by brackets [] replaced by
1063.26 * your own identifying information:
1064.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1064.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1064.3 @@ -1,7 +1,10 @@
1064.4 #
1064.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1064.6 #
1064.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1064.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1064.9 +#
1064.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1064.11 +# Other names may be trademarks of their respective owners.
1064.12 #
1064.13 # The contents of this file are subject to the terms of either the GNU
1064.14 # General Public License Version 2 only ("GPL") or the Common
1064.15 @@ -13,9 +16,9 @@
1064.16 # specific language governing permissions and limitations under the
1064.17 # License. When distributing the software, include this License Header
1064.18 # Notice in each file and include the License file at
1064.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1064.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1064.21 # particular file as subject to the "Classpath" exception as provided
1064.22 -# by Sun in the GPL Version 2 section of the License file that
1064.23 +# by Oracle in the GPL Version 2 section of the License file that
1064.24 # accompanied this code. If applicable, add the following below the
1064.25 # License Header, with the fields enclosed by brackets [] replaced by
1064.26 # your own identifying information:
1065.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/DesignBeanContextAction.java Fri Jul 16 11:47:36 2010 -0400
1065.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/DesignBeanContextAction.java Fri Jul 16 14:21:50 2010 -0400
1065.3 @@ -1,7 +1,10 @@
1065.4 /*
1065.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1065.6 *
1065.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1065.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1065.9 + *
1065.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1065.11 + * Other names may be trademarks of their respective owners.
1065.12 *
1065.13 * The contents of this file are subject to the terms of either the GNU
1065.14 * General Public License Version 2 only ("GPL") or the Common
1065.15 @@ -13,9 +16,9 @@
1065.16 * specific language governing permissions and limitations under the
1065.17 * License. When distributing the software, include this License Header
1065.18 * Notice in each file and include the License file at
1065.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1065.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1065.21 * particular file as subject to the "Classpath" exception as provided
1065.22 - * by Sun in the GPL Version 2 section of the License file that
1065.23 + * by Oracle in the GPL Version 2 section of the License file that
1065.24 * accompanied this code. If applicable, add the following below the
1065.25 * License Header, with the fields enclosed by brackets [] replaced by
1065.26 * your own identifying information:
1066.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/EditEventHandlerAction.java Fri Jul 16 11:47:36 2010 -0400
1066.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/EditEventHandlerAction.java Fri Jul 16 14:21:50 2010 -0400
1066.3 @@ -1,7 +1,10 @@
1066.4 /*
1066.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1066.6 *
1066.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1066.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1066.9 + *
1066.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1066.11 + * Other names may be trademarks of their respective owners.
1066.12 *
1066.13 * The contents of this file are subject to the terms of either the GNU
1066.14 * General Public License Version 2 only ("GPL") or the Common
1066.15 @@ -13,9 +16,9 @@
1066.16 * specific language governing permissions and limitations under the
1066.17 * License. When distributing the software, include this License Header
1066.18 * Notice in each file and include the License file at
1066.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1066.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1066.21 * particular file as subject to the "Classpath" exception as provided
1066.22 - * by Sun in the GPL Version 2 section of the License file that
1066.23 + * by Oracle in the GPL Version 2 section of the License file that
1066.24 * accompanied this code. If applicable, add the following below the
1066.25 * License Header, with the fields enclosed by brackets [] replaced by
1066.26 * your own identifying information:
1067.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/InitialFocusAction.java Fri Jul 16 11:47:36 2010 -0400
1067.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/InitialFocusAction.java Fri Jul 16 14:21:50 2010 -0400
1067.3 @@ -1,7 +1,10 @@
1067.4 /*
1067.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1067.6 *
1067.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1067.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1067.9 + *
1067.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1067.11 + * Other names may be trademarks of their respective owners.
1067.12 *
1067.13 * The contents of this file are subject to the terms of either the GNU
1067.14 * General Public License Version 2 only ("GPL") or the Common
1067.15 @@ -13,9 +16,9 @@
1067.16 * specific language governing permissions and limitations under the
1067.17 * License. When distributing the software, include this License Header
1067.18 * Notice in each file and include the License file at
1067.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1067.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1067.21 * particular file as subject to the "Classpath" exception as provided
1067.22 - * by Sun in the GPL Version 2 section of the License file that
1067.23 + * by Oracle in the GPL Version 2 section of the License file that
1067.24 * accompanied this code. If applicable, add the following below the
1067.25 * License Header, with the fields enclosed by brackets [] replaced by
1067.26 * your own identifying information:
1068.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/MarkupMouseRegionContextAction.java Fri Jul 16 11:47:36 2010 -0400
1068.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/MarkupMouseRegionContextAction.java Fri Jul 16 14:21:50 2010 -0400
1068.3 @@ -1,7 +1,10 @@
1068.4 /*
1068.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1068.6 *
1068.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1068.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1068.9 + *
1068.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1068.11 + * Other names may be trademarks of their respective owners.
1068.12 *
1068.13 * The contents of this file are subject to the terms of either the GNU
1068.14 * General Public License Version 2 only ("GPL") or the Common
1068.15 @@ -13,9 +16,9 @@
1068.16 * specific language governing permissions and limitations under the
1068.17 * License. When distributing the software, include this License Header
1068.18 * Notice in each file and include the License file at
1068.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1068.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1068.21 * particular file as subject to the "Classpath" exception as provided
1068.22 - * by Sun in the GPL Version 2 section of the License file that
1068.23 + * by Oracle in the GPL Version 2 section of the License file that
1068.24 * accompanied this code. If applicable, add the following below the
1068.25 * License Header, with the fields enclosed by brackets [] replaced by
1068.26 * your own identifying information:
1069.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/PropertyBindingAction.java Fri Jul 16 11:47:36 2010 -0400
1069.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/PropertyBindingAction.java Fri Jul 16 14:21:50 2010 -0400
1069.3 @@ -1,7 +1,10 @@
1069.4 /*
1069.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1069.6 *
1069.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1069.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1069.9 + *
1069.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1069.11 + * Other names may be trademarks of their respective owners.
1069.12 *
1069.13 * The contents of this file are subject to the terms of either the GNU
1069.14 * General Public License Version 2 only ("GPL") or the Common
1069.15 @@ -13,9 +16,9 @@
1069.16 * specific language governing permissions and limitations under the
1069.17 * License. When distributing the software, include this License Header
1069.18 * Notice in each file and include the License file at
1069.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1069.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1069.21 * particular file as subject to the "Classpath" exception as provided
1069.22 - * by Sun in the GPL Version 2 section of the License file that
1069.23 + * by Oracle in the GPL Version 2 section of the License file that
1069.24 * accompanied this code. If applicable, add the following below the
1069.25 * License Header, with the fields enclosed by brackets [] replaced by
1069.26 * your own identifying information:
1070.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/ViewJavaSourceAction.java Fri Jul 16 11:47:36 2010 -0400
1070.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/ViewJavaSourceAction.java Fri Jul 16 14:21:50 2010 -0400
1070.3 @@ -1,7 +1,10 @@
1070.4 /*
1070.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1070.6 *
1070.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1070.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1070.9 + *
1070.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1070.11 + * Other names may be trademarks of their respective owners.
1070.12 *
1070.13 * The contents of this file are subject to the terms of either the GNU
1070.14 * General Public License Version 2 only ("GPL") or the Common
1070.15 @@ -13,9 +16,9 @@
1070.16 * specific language governing permissions and limitations under the
1070.17 * License. When distributing the software, include this License Header
1070.18 * Notice in each file and include the License file at
1070.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1070.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1070.21 * particular file as subject to the "Classpath" exception as provided
1070.22 - * by Sun in the GPL Version 2 section of the License file that
1070.23 + * by Oracle in the GPL Version 2 section of the License file that
1070.24 * accompanied this code. If applicable, add the following below the
1070.25 * License Header, with the fields enclosed by brackets [] replaced by
1070.26 * your own identifying information:
1071.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/ViewJspSourceAction.java Fri Jul 16 11:47:36 2010 -0400
1071.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/ViewJspSourceAction.java Fri Jul 16 14:21:50 2010 -0400
1071.3 @@ -1,7 +1,10 @@
1071.4 /*
1071.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1071.6 *
1071.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1071.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1071.9 + *
1071.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1071.11 + * Other names may be trademarks of their respective owners.
1071.12 *
1071.13 * The contents of this file are subject to the terms of either the GNU
1071.14 * General Public License Version 2 only ("GPL") or the Common
1071.15 @@ -13,9 +16,9 @@
1071.16 * specific language governing permissions and limitations under the
1071.17 * License. When distributing the software, include this License Header
1071.18 * Notice in each file and include the License file at
1071.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1071.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1071.21 * particular file as subject to the "Classpath" exception as provided
1071.22 - * by Sun in the GPL Version 2 section of the License file that
1071.23 + * by Oracle in the GPL Version 2 section of the License file that
1071.24 * accompanied this code. If applicable, add the following below the
1071.25 * License Header, with the fields enclosed by brackets [] replaced by
1071.26 * your own identifying information:
1072.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/ViewPageNavigationAction.java Fri Jul 16 11:47:36 2010 -0400
1072.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/ViewPageNavigationAction.java Fri Jul 16 14:21:50 2010 -0400
1072.3 @@ -1,7 +1,10 @@
1072.4 /*
1072.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1072.6 *
1072.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1072.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1072.9 + *
1072.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1072.11 + * Other names may be trademarks of their respective owners.
1072.12 *
1072.13 * The contents of this file are subject to the terms of either the GNU
1072.14 * General Public License Version 2 only ("GPL") or the Common
1072.15 @@ -13,9 +16,9 @@
1072.16 * specific language governing permissions and limitations under the
1072.17 * License. When distributing the software, include this License Header
1072.18 * Notice in each file and include the License file at
1072.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1072.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1072.21 * particular file as subject to the "Classpath" exception as provided
1072.22 - * by Sun in the GPL Version 2 section of the License file that
1072.23 + * by Oracle in the GPL Version 2 section of the License file that
1072.24 * accompanied this code. If applicable, add the following below the
1072.25 * License Header, with the fields enclosed by brackets [] replaced by
1072.26 * your own identifying information:
1073.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/VirtualFormsAction.java Fri Jul 16 11:47:36 2010 -0400
1073.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/action/VirtualFormsAction.java Fri Jul 16 14:21:50 2010 -0400
1073.3 @@ -1,7 +1,10 @@
1073.4 /*
1073.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1073.6 *
1073.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1073.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1073.9 + *
1073.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1073.11 + * Other names may be trademarks of their respective owners.
1073.12 *
1073.13 * The contents of this file are subject to the terms of either the GNU
1073.14 * General Public License Version 2 only ("GPL") or the Common
1073.15 @@ -13,9 +16,9 @@
1073.16 * specific language governing permissions and limitations under the
1073.17 * License. When distributing the software, include this License Header
1073.18 * Notice in each file and include the License file at
1073.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1073.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1073.21 * particular file as subject to the "Classpath" exception as provided
1073.22 - * by Sun in the GPL Version 2 section of the License file that
1073.23 + * by Oracle in the GPL Version 2 section of the License file that
1073.24 * accompanied this code. If applicable, add the following below the
1073.25 * License Header, with the fields enclosed by brackets [] replaced by
1073.26 * your own identifying information:
1074.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Bean.java Fri Jul 16 11:47:36 2010 -0400
1074.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Bean.java Fri Jul 16 14:21:50 2010 -0400
1074.3 @@ -2,7 +2,10 @@
1074.4 /*
1074.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1074.6 *
1074.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1074.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1074.9 + *
1074.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1074.11 + * Other names may be trademarks of their respective owners.
1074.12 *
1074.13 * The contents of this file are subject to the terms of either the GNU
1074.14 * General Public License Version 2 only ("GPL") or the Common
1074.15 @@ -14,9 +17,9 @@
1074.16 * specific language governing permissions and limitations under the
1074.17 * License. When distributing the software, include this License Header
1074.18 * Notice in each file and include the License file at
1074.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1074.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1074.21 * particular file as subject to the "Classpath" exception as provided
1074.22 - * by Sun in the GPL Version 2 section of the License file that
1074.23 + * by Oracle in the GPL Version 2 section of the License file that
1074.24 * accompanied this code. If applicable, add the following below the
1074.25 * License Header, with the fields enclosed by brackets [] replaced by
1074.26 * your own identifying information:
1075.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeanStructureScanner.java Fri Jul 16 11:47:36 2010 -0400
1075.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeanStructureScanner.java Fri Jul 16 14:21:50 2010 -0400
1075.3 @@ -1,7 +1,10 @@
1075.4 /*
1075.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1075.6 *
1075.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1075.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1075.9 + *
1075.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1075.11 + * Other names may be trademarks of their respective owners.
1075.12 *
1075.13 * The contents of this file are subject to the terms of either the GNU
1075.14 * General Public License Version 2 only ("GPL") or the Common
1075.15 @@ -13,9 +16,9 @@
1075.16 * specific language governing permissions and limitations under the
1075.17 * License. When distributing the software, include this License Header
1075.18 * Notice in each file and include the License file at
1075.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1075.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1075.21 * particular file as subject to the "Classpath" exception as provided
1075.22 - * by Sun in the GPL Version 2 section of the License file that
1075.23 + * by Oracle in the GPL Version 2 section of the License file that
1075.24 * accompanied this code. If applicable, add the following below the
1075.25 * License Header, with the fields enclosed by brackets [] replaced by
1075.26 * your own identifying information:
1076.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeansNode.java Fri Jul 16 11:47:36 2010 -0400
1076.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeansNode.java Fri Jul 16 14:21:50 2010 -0400
1076.3 @@ -1,7 +1,10 @@
1076.4 /*
1076.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1076.6 *
1076.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1076.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1076.9 + *
1076.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1076.11 + * Other names may be trademarks of their respective owners.
1076.12 *
1076.13 * The contents of this file are subject to the terms of either the GNU
1076.14 * General Public License Version 2 only ("GPL") or the Common
1076.15 @@ -13,9 +16,9 @@
1076.16 * specific language governing permissions and limitations under the
1076.17 * License. When distributing the software, include this License Header
1076.18 * Notice in each file and include the License file at
1076.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1076.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1076.21 * particular file as subject to the "Classpath" exception as provided
1076.22 - * by Sun in the GPL Version 2 section of the License file that
1076.23 + * by Oracle in the GPL Version 2 section of the License file that
1076.24 * accompanied this code. If applicable, add the following below the
1076.25 * License Header, with the fields enclosed by brackets [] replaced by
1076.26 * your own identifying information:
1077.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeansUnit.java Fri Jul 16 11:47:36 2010 -0400
1077.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/BeansUnit.java Fri Jul 16 14:21:50 2010 -0400
1077.3 @@ -1,7 +1,10 @@
1077.4 /*
1077.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1077.6 *
1077.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1077.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1077.9 + *
1077.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1077.11 + * Other names may be trademarks of their respective owners.
1077.12 *
1077.13 * The contents of this file are subject to the terms of either the GNU
1077.14 * General Public License Version 2 only ("GPL") or the Common
1077.15 @@ -13,9 +16,9 @@
1077.16 * specific language governing permissions and limitations under the
1077.17 * License. When distributing the software, include this License Header
1077.18 * Notice in each file and include the License file at
1077.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1077.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1077.21 * particular file as subject to the "Classpath" exception as provided
1077.22 - * by Sun in the GPL Version 2 section of the License file that
1077.23 + * by Oracle in the GPL Version 2 section of the License file that
1077.24 * accompanied this code. If applicable, add the following below the
1077.25 * License Header, with the fields enclosed by brackets [] replaced by
1077.26 * your own identifying information:
1078.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1078.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1078.3 @@ -1,6 +1,9 @@
1078.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1078.5 #
1078.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1078.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1078.8 +#
1078.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1078.10 +# Other names may be trademarks of their respective owners.
1078.11 #
1078.12 # The contents of this file are subject to the terms of either the GNU
1078.13 # General Public License Version 2 only ("GPL") or the Common
1078.14 @@ -12,9 +15,9 @@
1078.15 # specific language governing permissions and limitations under the
1078.16 # License. When distributing the software, include this License Header
1078.17 # Notice in each file and include the License file at
1078.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1078.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1078.20 # particular file as subject to the "Classpath" exception as provided
1078.21 -# by Sun in the GPL Version 2 section of the License file that
1078.22 +# by Oracle in the GPL Version 2 section of the License file that
1078.23 # accompanied this code. If applicable, add the following below the
1078.24 # License Header, with the fields enclosed by brackets [] replaced by
1078.25 # your own identifying information:
1079.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Event.java Fri Jul 16 11:47:36 2010 -0400
1079.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Event.java Fri Jul 16 14:21:50 2010 -0400
1079.3 @@ -1,7 +1,10 @@
1079.4 /*
1079.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1079.6 *
1079.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1079.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1079.9 + *
1079.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1079.11 + * Other names may be trademarks of their respective owners.
1079.12 *
1079.13 * The contents of this file are subject to the terms of either the GNU
1079.14 * General Public License Version 2 only ("GPL") or the Common
1079.15 @@ -13,9 +16,9 @@
1079.16 * specific language governing permissions and limitations under the
1079.17 * License. When distributing the software, include this License Header
1079.18 * Notice in each file and include the License file at
1079.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1079.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1079.21 * particular file as subject to the "Classpath" exception as provided
1079.22 - * by Sun in the GPL Version 2 section of the License file that
1079.23 + * by Oracle in the GPL Version 2 section of the License file that
1079.24 * accompanied this code. If applicable, add the following below the
1079.25 * License Header, with the fields enclosed by brackets [] replaced by
1079.26 * your own identifying information:
1080.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/EventSet.java Fri Jul 16 11:47:36 2010 -0400
1080.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/EventSet.java Fri Jul 16 14:21:50 2010 -0400
1080.3 @@ -1,7 +1,10 @@
1080.4 /*
1080.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1080.6 *
1080.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1080.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1080.9 + *
1080.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1080.11 + * Other names may be trademarks of their respective owners.
1080.12 *
1080.13 * The contents of this file are subject to the terms of either the GNU
1080.14 * General Public License Version 2 only ("GPL") or the Common
1080.15 @@ -13,9 +16,9 @@
1080.16 * specific language governing permissions and limitations under the
1080.17 * License. When distributing the software, include this License Header
1080.18 * Notice in each file and include the License file at
1080.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1080.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1080.21 * particular file as subject to the "Classpath" exception as provided
1080.22 - * by Sun in the GPL Version 2 section of the License file that
1080.23 + * by Oracle in the GPL Version 2 section of the License file that
1080.24 * accompanied this code. If applicable, add the following below the
1080.25 * License Header, with the fields enclosed by brackets [] replaced by
1080.26 * your own identifying information:
1081.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Naming.java Fri Jul 16 11:47:36 2010 -0400
1081.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Naming.java Fri Jul 16 14:21:50 2010 -0400
1081.3 @@ -1,7 +1,10 @@
1081.4 /*
1081.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1081.6 *
1081.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1081.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1081.9 + *
1081.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1081.11 + * Other names may be trademarks of their respective owners.
1081.12 *
1081.13 * The contents of this file are subject to the terms of either the GNU
1081.14 * General Public License Version 2 only ("GPL") or the Common
1081.15 @@ -13,9 +16,9 @@
1081.16 * specific language governing permissions and limitations under the
1081.17 * License. When distributing the software, include this License Header
1081.18 * Notice in each file and include the License file at
1081.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1081.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1081.21 * particular file as subject to the "Classpath" exception as provided
1081.22 - * by Sun in the GPL Version 2 section of the License file that
1081.23 + * by Oracle in the GPL Version 2 section of the License file that
1081.24 * accompanied this code. If applicable, add the following below the
1081.25 * License Header, with the fields enclosed by brackets [] replaced by
1081.26 * your own identifying information:
1082.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Property.java Fri Jul 16 11:47:36 2010 -0400
1082.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/beans/Property.java Fri Jul 16 14:21:50 2010 -0400
1082.3 @@ -1,7 +1,10 @@
1082.4 /*
1082.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1082.6 *
1082.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1082.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1082.9 + *
1082.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1082.11 + * Other names may be trademarks of their respective owners.
1082.12 *
1082.13 * The contents of this file are subject to the terms of either the GNU
1082.14 * General Public License Version 2 only ("GPL") or the Common
1082.15 @@ -13,9 +16,9 @@
1082.16 * specific language governing permissions and limitations under the
1082.17 * License. When distributing the software, include this License Header
1082.18 * Notice in each file and include the License file at
1082.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1082.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1082.21 * particular file as subject to the "Classpath" exception as provided
1082.22 - * by Sun in the GPL Version 2 section of the License file that
1082.23 + * by Oracle in the GPL Version 2 section of the License file that
1082.24 * accompanied this code. If applicable, add the following below the
1082.25 * License Header, with the fields enclosed by brackets [] replaced by
1082.26 * your own identifying information:
1083.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/AnyAttrValueScanner.java Fri Jul 16 11:47:36 2010 -0400
1083.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/AnyAttrValueScanner.java Fri Jul 16 14:21:50 2010 -0400
1083.3 @@ -1,7 +1,10 @@
1083.4 /*
1083.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1083.6 *
1083.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1083.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1083.9 + *
1083.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1083.11 + * Other names may be trademarks of their respective owners.
1083.12 *
1083.13 * The contents of this file are subject to the terms of either the GNU
1083.14 * General Public License Version 2 only ("GPL") or the Common
1083.15 @@ -13,9 +16,9 @@
1083.16 * specific language governing permissions and limitations under the
1083.17 * License. When distributing the software, include this License Header
1083.18 * Notice in each file and include the License file at
1083.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1083.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1083.21 * particular file as subject to the "Classpath" exception as provided
1083.22 - * by Sun in the GPL Version 2 section of the License file that
1083.23 + * by Oracle in the GPL Version 2 section of the License file that
1083.24 * accompanied this code. If applicable, add the following below the
1083.25 * License Header, with the fields enclosed by brackets [] replaced by
1083.26 * your own identifying information:
1084.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/AnyAttrValueUpdater.java Fri Jul 16 11:47:36 2010 -0400
1084.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/AnyAttrValueUpdater.java Fri Jul 16 14:21:50 2010 -0400
1084.3 @@ -1,7 +1,10 @@
1084.4 /*
1084.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1084.6 *
1084.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1084.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1084.9 + *
1084.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1084.11 + * Other names may be trademarks of their respective owners.
1084.12 *
1084.13 * The contents of this file are subject to the terms of either the GNU
1084.14 * General Public License Version 2 only ("GPL") or the Common
1084.15 @@ -13,9 +16,9 @@
1084.16 * specific language governing permissions and limitations under the
1084.17 * License. When distributing the software, include this License Header
1084.18 * Notice in each file and include the License file at
1084.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1084.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1084.21 * particular file as subject to the "Classpath" exception as provided
1084.22 - * by Sun in the GPL Version 2 section of the License file that
1084.23 + * by Oracle in the GPL Version 2 section of the License file that
1084.24 * accompanied this code. If applicable, add the following below the
1084.25 * License Header, with the fields enclosed by brackets [] replaced by
1084.26 * your own identifying information:
1085.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1085.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1085.3 @@ -1,6 +1,9 @@
1085.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1085.5 #
1085.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1085.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1085.8 +#
1085.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1085.10 +# Other names may be trademarks of their respective owners.
1085.11 #
1085.12 # The contents of this file are subject to the terms of either the GNU
1085.13 # General Public License Version 2 only ("GPL") or the Common
1085.14 @@ -12,9 +15,9 @@
1085.15 # specific language governing permissions and limitations under the
1085.16 # License. When distributing the software, include this License Header
1085.17 # Notice in each file and include the License file at
1085.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1085.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1085.20 # particular file as subject to the "Classpath" exception as provided
1085.21 -# by Sun in the GPL Version 2 section of the License file that
1085.22 +# by Oracle in the GPL Version 2 section of the License file that
1085.23 # accompanied this code. If applicable, add the following below the
1085.24 # License Header, with the fields enclosed by brackets [] replaced by
1085.25 # your own identifying information:
1086.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/DocFragmentJspWriter.java Fri Jul 16 11:47:36 2010 -0400
1086.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/DocFragmentJspWriter.java Fri Jul 16 14:21:50 2010 -0400
1086.3 @@ -1,7 +1,10 @@
1086.4 /*
1086.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1086.6 *
1086.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1086.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1086.9 + *
1086.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1086.11 + * Other names may be trademarks of their respective owners.
1086.12 *
1086.13 * The contents of this file are subject to the terms of either the GNU
1086.14 * General Public License Version 2 only ("GPL") or the Common
1086.15 @@ -13,9 +16,9 @@
1086.16 * specific language governing permissions and limitations under the
1086.17 * License. When distributing the software, include this License Header
1086.18 * Notice in each file and include the License file at
1086.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1086.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1086.21 * particular file as subject to the "Classpath" exception as provided
1086.22 - * by Sun in the GPL Version 2 section of the License file that
1086.23 + * by Oracle in the GPL Version 2 section of the License file that
1086.24 * accompanied this code. If applicable, add the following below the
1086.25 * License Header, with the fields enclosed by brackets [] replaced by
1086.26 * your own identifying information:
1087.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ElAttrUpdater.java Fri Jul 16 11:47:36 2010 -0400
1087.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ElAttrUpdater.java Fri Jul 16 14:21:50 2010 -0400
1087.3 @@ -1,7 +1,10 @@
1087.4 /*
1087.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1087.6 *
1087.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1087.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1087.9 + *
1087.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1087.11 + * Other names may be trademarks of their respective owners.
1087.12 *
1087.13 * The contents of this file are subject to the terms of either the GNU
1087.14 * General Public License Version 2 only ("GPL") or the Common
1087.15 @@ -13,9 +16,9 @@
1087.16 * specific language governing permissions and limitations under the
1087.17 * License. When distributing the software, include this License Header
1087.18 * Notice in each file and include the License file at
1087.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1087.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1087.21 * particular file as subject to the "Classpath" exception as provided
1087.22 - * by Sun in the GPL Version 2 section of the License file that
1087.23 + * by Oracle in the GPL Version 2 section of the License file that
1087.24 * accompanied this code. If applicable, add the following below the
1087.25 * License Header, with the fields enclosed by brackets [] replaced by
1087.26 * your own identifying information:
1088.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ElBindingScanner.java Fri Jul 16 11:47:36 2010 -0400
1088.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ElBindingScanner.java Fri Jul 16 14:21:50 2010 -0400
1088.3 @@ -1,7 +1,10 @@
1088.4 /*
1088.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1088.6 *
1088.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1088.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1088.9 + *
1088.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1088.11 + * Other names may be trademarks of their respective owners.
1088.12 *
1088.13 * The contents of this file are subject to the terms of either the GNU
1088.14 * General Public License Version 2 only ("GPL") or the Common
1088.15 @@ -13,9 +16,9 @@
1088.16 * specific language governing permissions and limitations under the
1088.17 * License. When distributing the software, include this License Header
1088.18 * Notice in each file and include the License file at
1088.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1088.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1088.21 * particular file as subject to the "Classpath" exception as provided
1088.22 - * by Sun in the GPL Version 2 section of the License file that
1088.23 + * by Oracle in the GPL Version 2 section of the License file that
1088.24 * accompanied this code. If applicable, add the following below the
1088.25 * License Header, with the fields enclosed by brackets [] replaced by
1088.26 * your own identifying information:
1089.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ElementAttrValueScanner.java Fri Jul 16 11:47:36 2010 -0400
1089.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ElementAttrValueScanner.java Fri Jul 16 14:21:50 2010 -0400
1089.3 @@ -1,7 +1,10 @@
1089.4 /*
1089.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1089.6 *
1089.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1089.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1089.9 + *
1089.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1089.11 + * Other names may be trademarks of their respective owners.
1089.12 *
1089.13 * The contents of this file are subject to the terms of either the GNU
1089.14 * General Public License Version 2 only ("GPL") or the Common
1089.15 @@ -13,9 +16,9 @@
1089.16 * specific language governing permissions and limitations under the
1089.17 * License. When distributing the software, include this License Header
1089.18 * Notice in each file and include the License file at
1089.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1089.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1089.21 * particular file as subject to the "Classpath" exception as provided
1089.22 - * by Sun in the GPL Version 2 section of the License file that
1089.23 + * by Oracle in the GPL Version 2 section of the License file that
1089.24 * accompanied this code. If applicable, add the following below the
1089.25 * License Header, with the fields enclosed by brackets [] replaced by
1089.26 * your own identifying information:
1090.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ElementAttrValueUpdater.java Fri Jul 16 11:47:36 2010 -0400
1090.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ElementAttrValueUpdater.java Fri Jul 16 14:21:50 2010 -0400
1090.3 @@ -1,7 +1,10 @@
1090.4 /*
1090.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1090.6 *
1090.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1090.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1090.9 + *
1090.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1090.11 + * Other names may be trademarks of their respective owners.
1090.12 *
1090.13 * The contents of this file are subject to the terms of either the GNU
1090.14 * General Public License Version 2 only ("GPL") or the Common
1090.15 @@ -13,9 +16,9 @@
1090.16 * specific language governing permissions and limitations under the
1090.17 * License. When distributing the software, include this License Header
1090.18 * Notice in each file and include the License file at
1090.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1090.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1090.21 * particular file as subject to the "Classpath" exception as provided
1090.22 - * by Sun in the GPL Version 2 section of the License file that
1090.23 + * by Oracle in the GPL Version 2 section of the License file that
1090.24 * accompanied this code. If applicable, add the following below the
1090.25 * License Header, with the fields enclosed by brackets [] replaced by
1090.26 * your own identifying information:
1091.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/Entities.java Fri Jul 16 11:47:36 2010 -0400
1091.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/Entities.java Fri Jul 16 14:21:50 2010 -0400
1091.3 @@ -1,7 +1,10 @@
1091.4 /*
1091.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1091.6 *
1091.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1091.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1091.9 + *
1091.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1091.11 + * Other names may be trademarks of their respective owners.
1091.12 *
1091.13 * The contents of this file are subject to the terms of either the GNU
1091.14 * General Public License Version 2 only ("GPL") or the Common
1091.15 @@ -13,9 +16,9 @@
1091.16 * specific language governing permissions and limitations under the
1091.17 * License. When distributing the software, include this License Header
1091.18 * Notice in each file and include the License file at
1091.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1091.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1091.21 * particular file as subject to the "Classpath" exception as provided
1091.22 - * by Sun in the GPL Version 2 section of the License file that
1091.23 + * by Oracle in the GPL Version 2 section of the License file that
1091.24 * accompanied this code. If applicable, add the following below the
1091.25 * License Header, with the fields enclosed by brackets [] replaced by
1091.26 * your own identifying information:
1092.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesBean.java Fri Jul 16 11:47:36 2010 -0400
1092.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesBean.java Fri Jul 16 14:21:50 2010 -0400
1092.3 @@ -1,7 +1,10 @@
1092.4 /*
1092.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1092.6 *
1092.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1092.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1092.9 + *
1092.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1092.11 + * Other names may be trademarks of their respective owners.
1092.12 *
1092.13 * The contents of this file are subject to the terms of either the GNU
1092.14 * General Public License Version 2 only ("GPL") or the Common
1092.15 @@ -13,9 +16,9 @@
1092.16 * specific language governing permissions and limitations under the
1092.17 * License. When distributing the software, include this License Header
1092.18 * Notice in each file and include the License file at
1092.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1092.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1092.21 * particular file as subject to the "Classpath" exception as provided
1092.22 - * by Sun in the GPL Version 2 section of the License file that
1092.23 + * by Oracle in the GPL Version 2 section of the License file that
1092.24 * accompanied this code. If applicable, add the following below the
1092.25 * License Header, with the fields enclosed by brackets [] replaced by
1092.26 * your own identifying information:
1093.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesPageUnit.java Fri Jul 16 11:47:36 2010 -0400
1093.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesPageUnit.java Fri Jul 16 14:21:50 2010 -0400
1093.3 @@ -1,7 +1,10 @@
1093.4 /*
1093.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1093.6 *
1093.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1093.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1093.9 + *
1093.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1093.11 + * Other names may be trademarks of their respective owners.
1093.12 *
1093.13 * The contents of this file are subject to the terms of either the GNU
1093.14 * General Public License Version 2 only ("GPL") or the Common
1093.15 @@ -13,9 +16,9 @@
1093.16 * specific language governing permissions and limitations under the
1093.17 * License. When distributing the software, include this License Header
1093.18 * Notice in each file and include the License file at
1093.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1093.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1093.21 * particular file as subject to the "Classpath" exception as provided
1093.22 - * by Sun in the GPL Version 2 section of the License file that
1093.23 + * by Oracle in the GPL Version 2 section of the License file that
1093.24 * accompanied this code. If applicable, add the following below the
1093.25 * License Header, with the fields enclosed by brackets [] replaced by
1093.26 * your own identifying information:
1094.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesUnit.java Fri Jul 16 11:47:36 2010 -0400
1094.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/FacesUnit.java Fri Jul 16 14:21:50 2010 -0400
1094.3 @@ -1,7 +1,10 @@
1094.4 /*
1094.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1094.6 *
1094.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1094.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1094.9 + *
1094.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1094.11 + * Other names may be trademarks of their respective owners.
1094.12 *
1094.13 * The contents of this file are subject to the terms of either the GNU
1094.14 * General Public License Version 2 only ("GPL") or the Common
1094.15 @@ -13,9 +16,9 @@
1094.16 * specific language governing permissions and limitations under the
1094.17 * License. When distributing the software, include this License Header
1094.18 * Notice in each file and include the License file at
1094.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1094.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1094.21 * particular file as subject to the "Classpath" exception as provided
1094.22 - * by Sun in the GPL Version 2 section of the License file that
1094.23 + * by Oracle in the GPL Version 2 section of the License file that
1094.24 * accompanied this code. If applicable, add the following below the
1094.25 * License Header, with the fields enclosed by brackets [] replaced by
1094.26 * your own identifying information:
1095.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/HtmlBean.java Fri Jul 16 11:47:36 2010 -0400
1095.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/HtmlBean.java Fri Jul 16 14:21:50 2010 -0400
1095.3 @@ -1,7 +1,10 @@
1095.4 /*
1095.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1095.6 *
1095.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1095.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1095.9 + *
1095.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1095.11 + * Other names may be trademarks of their respective owners.
1095.12 *
1095.13 * The contents of this file are subject to the terms of either the GNU
1095.14 * General Public License Version 2 only ("GPL") or the Common
1095.15 @@ -13,9 +16,9 @@
1095.16 * specific language governing permissions and limitations under the
1095.17 * License. When distributing the software, include this License Header
1095.18 * Notice in each file and include the License file at
1095.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1095.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1095.21 * particular file as subject to the "Classpath" exception as provided
1095.22 - * by Sun in the GPL Version 2 section of the License file that
1095.23 + * by Oracle in the GPL Version 2 section of the License file that
1095.24 * accompanied this code. If applicable, add the following below the
1095.25 * License Header, with the fields enclosed by brackets [] replaced by
1095.26 * your own identifying information:
1096.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupBean.java Fri Jul 16 11:47:36 2010 -0400
1096.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupBean.java Fri Jul 16 14:21:50 2010 -0400
1096.3 @@ -1,7 +1,10 @@
1096.4 /*
1096.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1096.6 *
1096.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1096.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1096.9 + *
1096.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1096.11 + * Other names may be trademarks of their respective owners.
1096.12 *
1096.13 * The contents of this file are subject to the terms of either the GNU
1096.14 * General Public License Version 2 only ("GPL") or the Common
1096.15 @@ -13,9 +16,9 @@
1096.16 * specific language governing permissions and limitations under the
1096.17 * License. When distributing the software, include this License Header
1096.18 * Notice in each file and include the License file at
1096.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1096.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1096.21 * particular file as subject to the "Classpath" exception as provided
1096.22 - * by Sun in the GPL Version 2 section of the License file that
1096.23 + * by Oracle in the GPL Version 2 section of the License file that
1096.24 * accompanied this code. If applicable, add the following below the
1096.25 * License Header, with the fields enclosed by brackets [] replaced by
1096.26 * your own identifying information:
1097.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupProperty.java Fri Jul 16 11:47:36 2010 -0400
1097.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MarkupProperty.java Fri Jul 16 14:21:50 2010 -0400
1097.3 @@ -1,7 +1,10 @@
1097.4 /*
1097.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1097.6 *
1097.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1097.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1097.9 + *
1097.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1097.11 + * Other names may be trademarks of their respective owners.
1097.12 *
1097.13 * The contents of this file are subject to the terms of either the GNU
1097.14 * General Public License Version 2 only ("GPL") or the Common
1097.15 @@ -13,9 +16,9 @@
1097.16 * specific language governing permissions and limitations under the
1097.17 * License. When distributing the software, include this License Header
1097.18 * Notice in each file and include the License file at
1097.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1097.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1097.21 * particular file as subject to the "Classpath" exception as provided
1097.22 - * by Sun in the GPL Version 2 section of the License file that
1097.23 + * by Oracle in the GPL Version 2 section of the License file that
1097.24 * accompanied this code. If applicable, add the following below the
1097.25 * License Header, with the fields enclosed by brackets [] replaced by
1097.26 * your own identifying information:
1098.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MethodBindEvent.java Fri Jul 16 11:47:36 2010 -0400
1098.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MethodBindEvent.java Fri Jul 16 14:21:50 2010 -0400
1098.3 @@ -1,7 +1,10 @@
1098.4 /*
1098.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1098.6 *
1098.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1098.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1098.9 + *
1098.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1098.11 + * Other names may be trademarks of their respective owners.
1098.12 *
1098.13 * The contents of this file are subject to the terms of either the GNU
1098.14 * General Public License Version 2 only ("GPL") or the Common
1098.15 @@ -13,9 +16,9 @@
1098.16 * specific language governing permissions and limitations under the
1098.17 * License. When distributing the software, include this License Header
1098.18 * Notice in each file and include the License file at
1098.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1098.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1098.21 * particular file as subject to the "Classpath" exception as provided
1098.22 - * by Sun in the GPL Version 2 section of the License file that
1098.23 + * by Oracle in the GPL Version 2 section of the License file that
1098.24 * accompanied this code. If applicable, add the following below the
1098.25 * License Header, with the fields enclosed by brackets [] replaced by
1098.26 * your own identifying information:
1099.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MethodBindEventSet.java Fri Jul 16 11:47:36 2010 -0400
1099.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/MethodBindEventSet.java Fri Jul 16 14:21:50 2010 -0400
1099.3 @@ -1,7 +1,10 @@
1099.4 /*
1099.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1099.6 *
1099.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1099.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1099.9 + *
1099.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1099.11 + * Other names may be trademarks of their respective owners.
1099.12 *
1099.13 * The contents of this file are subject to the terms of either the GNU
1099.14 * General Public License Version 2 only ("GPL") or the Common
1099.15 @@ -13,9 +16,9 @@
1099.16 * specific language governing permissions and limitations under the
1099.17 * License. When distributing the software, include this License Header
1099.18 * Notice in each file and include the License file at
1099.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1099.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1099.21 * particular file as subject to the "Classpath" exception as provided
1099.22 - * by Sun in the GPL Version 2 section of the License file that
1099.23 + * by Oracle in the GPL Version 2 section of the License file that
1099.24 * accompanied this code. If applicable, add the following below the
1099.25 * License Header, with the fields enclosed by brackets [] replaced by
1099.26 * your own identifying information:
1100.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ReefFacesBeanStructureScanner.java Fri Jul 16 11:47:36 2010 -0400
1100.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ReefFacesBeanStructureScanner.java Fri Jul 16 14:21:50 2010 -0400
1100.3 @@ -1,7 +1,10 @@
1100.4 /*
1100.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1100.6 *
1100.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1100.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1100.9 + *
1100.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1100.11 + * Other names may be trademarks of their respective owners.
1100.12 *
1100.13 * The contents of this file are subject to the terms of either the GNU
1100.14 * General Public License Version 2 only ("GPL") or the Common
1100.15 @@ -13,9 +16,9 @@
1100.16 * specific language governing permissions and limitations under the
1100.17 * License. When distributing the software, include this License Header
1100.18 * Notice in each file and include the License file at
1100.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1100.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1100.21 * particular file as subject to the "Classpath" exception as provided
1100.22 - * by Sun in the GPL Version 2 section of the License file that
1100.23 + * by Oracle in the GPL Version 2 section of the License file that
1100.24 * accompanied this code. If applicable, add the following below the
1100.25 * License Header, with the fields enclosed by brackets [] replaced by
1100.26 * your own identifying information:
1101.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesApplicationBeanStructureScanner.java Fri Jul 16 11:47:36 2010 -0400
1101.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesApplicationBeanStructureScanner.java Fri Jul 16 14:21:50 2010 -0400
1101.3 @@ -1,7 +1,10 @@
1101.4 /*
1101.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1101.6 *
1101.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1101.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1101.9 + *
1101.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1101.11 + * Other names may be trademarks of their respective owners.
1101.12 *
1101.13 * The contents of this file are subject to the terms of either the GNU
1101.14 * General Public License Version 2 only ("GPL") or the Common
1101.15 @@ -13,9 +16,9 @@
1101.16 * specific language governing permissions and limitations under the
1101.17 * License. When distributing the software, include this License Header
1101.18 * Notice in each file and include the License file at
1101.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1101.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1101.21 * particular file as subject to the "Classpath" exception as provided
1101.22 - * by Sun in the GPL Version 2 section of the License file that
1101.23 + * by Oracle in the GPL Version 2 section of the License file that
1101.24 * accompanied this code. If applicable, add the following below the
1101.25 * License Header, with the fields enclosed by brackets [] replaced by
1101.26 * your own identifying information:
1102.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesBeanStructureScanner.java Fri Jul 16 11:47:36 2010 -0400
1102.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesBeanStructureScanner.java Fri Jul 16 14:21:50 2010 -0400
1102.3 @@ -1,7 +1,10 @@
1102.4 /*
1102.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1102.6 *
1102.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1102.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1102.9 + *
1102.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1102.11 + * Other names may be trademarks of their respective owners.
1102.12 *
1102.13 * The contents of this file are subject to the terms of either the GNU
1102.14 * General Public License Version 2 only ("GPL") or the Common
1102.15 @@ -13,9 +16,9 @@
1102.16 * specific language governing permissions and limitations under the
1102.17 * License. When distributing the software, include this License Header
1102.18 * Notice in each file and include the License file at
1102.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1102.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1102.21 * particular file as subject to the "Classpath" exception as provided
1102.22 - * by Sun in the GPL Version 2 section of the License file that
1102.23 + * by Oracle in the GPL Version 2 section of the License file that
1102.24 * accompanied this code. If applicable, add the following below the
1102.25 * License Header, with the fields enclosed by brackets [] replaced by
1102.26 * your own identifying information:
1103.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesFragmentBeanStructureScanner.java Fri Jul 16 11:47:36 2010 -0400
1103.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesFragmentBeanStructureScanner.java Fri Jul 16 14:21:50 2010 -0400
1103.3 @@ -1,7 +1,10 @@
1103.4 /*
1103.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1103.6 *
1103.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1103.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1103.9 + *
1103.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1103.11 + * Other names may be trademarks of their respective owners.
1103.12 *
1103.13 * The contents of this file are subject to the terms of either the GNU
1103.14 * General Public License Version 2 only ("GPL") or the Common
1103.15 @@ -13,9 +16,9 @@
1103.16 * specific language governing permissions and limitations under the
1103.17 * License. When distributing the software, include this License Header
1103.18 * Notice in each file and include the License file at
1103.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1103.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1103.21 * particular file as subject to the "Classpath" exception as provided
1103.22 - * by Sun in the GPL Version 2 section of the License file that
1103.23 + * by Oracle in the GPL Version 2 section of the License file that
1103.24 * accompanied this code. If applicable, add the following below the
1103.25 * License Header, with the fields enclosed by brackets [] replaced by
1103.26 * your own identifying information:
1104.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesPageBeanStructureScanner.java Fri Jul 16 11:47:36 2010 -0400
1104.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesPageBeanStructureScanner.java Fri Jul 16 14:21:50 2010 -0400
1104.3 @@ -1,7 +1,10 @@
1104.4 /*
1104.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1104.6 *
1104.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1104.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1104.9 + *
1104.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1104.11 + * Other names may be trademarks of their respective owners.
1104.12 *
1104.13 * The contents of this file are subject to the terms of either the GNU
1104.14 * General Public License Version 2 only ("GPL") or the Common
1104.15 @@ -13,9 +16,9 @@
1104.16 * specific language governing permissions and limitations under the
1104.17 * License. When distributing the software, include this License Header
1104.18 * Notice in each file and include the License file at
1104.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1104.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1104.21 * particular file as subject to the "Classpath" exception as provided
1104.22 - * by Sun in the GPL Version 2 section of the License file that
1104.23 + * by Oracle in the GPL Version 2 section of the License file that
1104.24 * accompanied this code. If applicable, add the following below the
1104.25 * License Header, with the fields enclosed by brackets [] replaced by
1104.26 * your own identifying information:
1105.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesRequestBeanStructureScanner.java Fri Jul 16 11:47:36 2010 -0400
1105.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesRequestBeanStructureScanner.java Fri Jul 16 14:21:50 2010 -0400
1105.3 @@ -1,7 +1,10 @@
1105.4 /*
1105.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1105.6 *
1105.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1105.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1105.9 + *
1105.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1105.11 + * Other names may be trademarks of their respective owners.
1105.12 *
1105.13 * The contents of this file are subject to the terms of either the GNU
1105.14 * General Public License Version 2 only ("GPL") or the Common
1105.15 @@ -13,9 +16,9 @@
1105.16 * specific language governing permissions and limitations under the
1105.17 * License. When distributing the software, include this License Header
1105.18 * Notice in each file and include the License file at
1105.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1105.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1105.21 * particular file as subject to the "Classpath" exception as provided
1105.22 - * by Sun in the GPL Version 2 section of the License file that
1105.23 + * by Oracle in the GPL Version 2 section of the License file that
1105.24 * accompanied this code. If applicable, add the following below the
1105.25 * License Header, with the fields enclosed by brackets [] replaced by
1105.26 * your own identifying information:
1106.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesSessionBeanStructureScanner.java Fri Jul 16 11:47:36 2010 -0400
1106.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/ThresherFacesSessionBeanStructureScanner.java Fri Jul 16 14:21:50 2010 -0400
1106.3 @@ -1,7 +1,10 @@
1106.4 /*
1106.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1106.6 *
1106.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1106.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1106.9 + *
1106.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1106.11 + * Other names may be trademarks of their respective owners.
1106.12 *
1106.13 * The contents of this file are subject to the terms of either the GNU
1106.14 * General Public License Version 2 only ("GPL") or the Common
1106.15 @@ -13,9 +16,9 @@
1106.16 * specific language governing permissions and limitations under the
1106.17 * License. When distributing the software, include this License Header
1106.18 * Notice in each file and include the License file at
1106.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1106.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1106.21 * particular file as subject to the "Classpath" exception as provided
1106.22 - * by Sun in the GPL Version 2 section of the License file that
1106.23 + * by Oracle in the GPL Version 2 section of the License file that
1106.24 * accompanied this code. If applicable, add the following below the
1106.25 * License Header, with the fields enclosed by brackets [] replaced by
1106.26 * your own identifying information:
1107.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1107.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1107.3 @@ -1,6 +1,9 @@
1107.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1107.5 #
1107.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1107.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1107.8 +#
1107.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1107.10 +# Other names may be trademarks of their respective owners.
1107.11 #
1107.12 # The contents of this file are subject to the terms of either the GNU
1107.13 # General Public License Version 2 only ("GPL") or the Common
1107.14 @@ -12,9 +15,9 @@
1107.15 # specific language governing permissions and limitations under the
1107.16 # License. When distributing the software, include this License Header
1107.17 # Notice in each file and include the License file at
1107.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1107.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1107.20 # particular file as subject to the "Classpath" exception as provided
1107.21 -# by Sun in the GPL Version 2 section of the License file that
1107.22 +# by Oracle in the GPL Version 2 section of the License file that
1107.23 # accompanied this code. If applicable, add the following below the
1107.24 # License Header, with the fields enclosed by brackets [] replaced by
1107.25 # your own identifying information:
1108.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/DiffElement.java Fri Jul 16 11:47:36 2010 -0400
1108.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/DiffElement.java Fri Jul 16 14:21:50 2010 -0400
1108.3 @@ -1,7 +1,10 @@
1108.4 /*
1108.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1108.6 *
1108.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1108.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1108.9 + *
1108.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1108.11 + * Other names may be trademarks of their respective owners.
1108.12 *
1108.13 * The contents of this file are subject to the terms of either the GNU
1108.14 * General Public License Version 2 only ("GPL") or the Common
1108.15 @@ -13,9 +16,9 @@
1108.16 * specific language governing permissions and limitations under the
1108.17 * License. When distributing the software, include this License Header
1108.18 * Notice in each file and include the License file at
1108.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1108.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1108.21 * particular file as subject to the "Classpath" exception as provided
1108.22 - * by Sun in the GPL Version 2 section of the License file that
1108.23 + * by Oracle in the GPL Version 2 section of the License file that
1108.24 * accompanied this code. If applicable, add the following below the
1108.25 * License Header, with the fields enclosed by brackets [] replaced by
1108.26 * your own identifying information:
1109.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ElementGrip.java Fri Jul 16 11:47:36 2010 -0400
1109.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ElementGrip.java Fri Jul 16 14:21:50 2010 -0400
1109.3 @@ -1,7 +1,10 @@
1109.4 /*
1109.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1109.6 *
1109.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1109.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1109.9 + *
1109.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1109.11 + * Other names may be trademarks of their respective owners.
1109.12 *
1109.13 * The contents of this file are subject to the terms of either the GNU
1109.14 * General Public License Version 2 only ("GPL") or the Common
1109.15 @@ -13,9 +16,9 @@
1109.16 * specific language governing permissions and limitations under the
1109.17 * License. When distributing the software, include this License Header
1109.18 * Notice in each file and include the License file at
1109.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1109.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1109.21 * particular file as subject to the "Classpath" exception as provided
1109.22 - * by Sun in the GPL Version 2 section of the License file that
1109.23 + * by Oracle in the GPL Version 2 section of the License file that
1109.24 * accompanied this code. If applicable, add the following below the
1109.25 * License Header, with the fields enclosed by brackets [] replaced by
1109.26 * your own identifying information:
1110.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ElementGripFactory.java Fri Jul 16 11:47:36 2010 -0400
1110.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ElementGripFactory.java Fri Jul 16 14:21:50 2010 -0400
1110.3 @@ -1,7 +1,10 @@
1110.4 /*
1110.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1110.6 *
1110.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1110.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1110.9 + *
1110.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1110.11 + * Other names may be trademarks of their respective owners.
1110.12 *
1110.13 * The contents of this file are subject to the terms of either the GNU
1110.14 * General Public License Version 2 only ("GPL") or the Common
1110.15 @@ -13,9 +16,9 @@
1110.16 * specific language governing permissions and limitations under the
1110.17 * License. When distributing the software, include this License Header
1110.18 * Notice in each file and include the License file at
1110.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1110.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1110.21 * particular file as subject to the "Classpath" exception as provided
1110.22 - * by Sun in the GPL Version 2 section of the License file that
1110.23 + * by Oracle in the GPL Version 2 section of the License file that
1110.24 * accompanied this code. If applicable, add the following below the
1110.25 * License Header, with the fields enclosed by brackets [] replaced by
1110.26 * your own identifying information:
1111.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesJavaFileMoveRefactoringPlugin.java Fri Jul 16 11:47:36 2010 -0400
1111.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesJavaFileMoveRefactoringPlugin.java Fri Jul 16 14:21:50 2010 -0400
1111.3 @@ -1,7 +1,10 @@
1111.4 /*
1111.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1111.6 *
1111.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1111.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1111.9 + *
1111.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1111.11 + * Other names may be trademarks of their respective owners.
1111.12 *
1111.13 * The contents of this file are subject to the terms of either the GNU
1111.14 * General Public License Version 2 only ("GPL") or the Common
1111.15 @@ -13,9 +16,9 @@
1111.16 * specific language governing permissions and limitations under the
1111.17 * License. When distributing the software, include this License Header
1111.18 * Notice in each file and include the License file at
1111.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1111.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1111.21 * particular file as subject to the "Classpath" exception as provided
1111.22 - * by Sun in the GPL Version 2 section of the License file that
1111.23 + * by Oracle in the GPL Version 2 section of the License file that
1111.24 * accompanied this code. If applicable, add the following below the
1111.25 * License Header, with the fields enclosed by brackets [] replaced by
1111.26 * your own identifying information:
1112.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesJavaFileRenameRefactoringPlugin.java Fri Jul 16 11:47:36 2010 -0400
1112.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesJavaFileRenameRefactoringPlugin.java Fri Jul 16 14:21:50 2010 -0400
1112.3 @@ -1,7 +1,10 @@
1112.4 /*
1112.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1112.6 *
1112.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1112.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1112.9 + *
1112.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1112.11 + * Other names may be trademarks of their respective owners.
1112.12 *
1112.13 * The contents of this file are subject to the terms of either the GNU
1112.14 * General Public License Version 2 only ("GPL") or the Common
1112.15 @@ -13,9 +16,9 @@
1112.16 * specific language governing permissions and limitations under the
1112.17 * License. When distributing the software, include this License Header
1112.18 * Notice in each file and include the License file at
1112.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1112.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1112.21 * particular file as subject to the "Classpath" exception as provided
1112.22 - * by Sun in the GPL Version 2 section of the License file that
1112.23 + * by Oracle in the GPL Version 2 section of the License file that
1112.24 * accompanied this code. If applicable, add the following below the
1112.25 * License Header, with the fields enclosed by brackets [] replaced by
1112.26 * your own identifying information:
1113.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesJspFileMoveRefactoringPlugin.java Fri Jul 16 11:47:36 2010 -0400
1113.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesJspFileMoveRefactoringPlugin.java Fri Jul 16 14:21:50 2010 -0400
1113.3 @@ -1,7 +1,10 @@
1113.4 /*
1113.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1113.6 *
1113.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1113.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1113.9 + *
1113.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1113.11 + * Other names may be trademarks of their respective owners.
1113.12 *
1113.13 * The contents of this file are subject to the terms of either the GNU
1113.14 * General Public License Version 2 only ("GPL") or the Common
1113.15 @@ -13,9 +16,9 @@
1113.16 * specific language governing permissions and limitations under the
1113.17 * License. When distributing the software, include this License Header
1113.18 * Notice in each file and include the License file at
1113.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1113.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1113.21 * particular file as subject to the "Classpath" exception as provided
1113.22 - * by Sun in the GPL Version 2 section of the License file that
1113.23 + * by Oracle in the GPL Version 2 section of the License file that
1113.24 * accompanied this code. If applicable, add the following below the
1113.25 * License Header, with the fields enclosed by brackets [] replaced by
1113.26 * your own identifying information:
1114.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesJspFileRenameRefactoringPlugin.java Fri Jul 16 11:47:36 2010 -0400
1114.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesJspFileRenameRefactoringPlugin.java Fri Jul 16 14:21:50 2010 -0400
1114.3 @@ -1,7 +1,10 @@
1114.4 /*
1114.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1114.6 *
1114.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1114.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1114.9 + *
1114.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1114.11 + * Other names may be trademarks of their respective owners.
1114.12 *
1114.13 * The contents of this file are subject to the terms of either the GNU
1114.14 * General Public License Version 2 only ("GPL") or the Common
1114.15 @@ -13,9 +16,9 @@
1114.16 * specific language governing permissions and limitations under the
1114.17 * License. When distributing the software, include this License Header
1114.18 * Notice in each file and include the License file at
1114.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1114.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1114.21 * particular file as subject to the "Classpath" exception as provided
1114.22 - * by Sun in the GPL Version 2 section of the License file that
1114.23 + * by Oracle in the GPL Version 2 section of the License file that
1114.24 * accompanied this code. If applicable, add the following below the
1114.25 * License Header, with the fields enclosed by brackets [] replaced by
1114.26 * your own identifying information:
1115.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesMovePanel.java Fri Jul 16 11:47:36 2010 -0400
1115.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesMovePanel.java Fri Jul 16 14:21:50 2010 -0400
1115.3 @@ -1,7 +1,10 @@
1115.4 /*
1115.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1115.6 *
1115.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1115.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1115.9 + *
1115.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1115.11 + * Other names may be trademarks of their respective owners.
1115.12 *
1115.13 * The contents of this file are subject to the terms of either the GNU
1115.14 * General Public License Version 2 only ("GPL") or the Common
1115.15 @@ -13,9 +16,9 @@
1115.16 * specific language governing permissions and limitations under the
1115.17 * License. When distributing the software, include this License Header
1115.18 * Notice in each file and include the License file at
1115.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1115.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1115.21 * particular file as subject to the "Classpath" exception as provided
1115.22 - * by Sun in the GPL Version 2 section of the License file that
1115.23 + * by Oracle in the GPL Version 2 section of the License file that
1115.24 * accompanied this code. If applicable, add the following below the
1115.25 * License Header, with the fields enclosed by brackets [] replaced by
1115.26 * your own identifying information:
1116.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesMoveRefactoringUI.java Fri Jul 16 11:47:36 2010 -0400
1116.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesMoveRefactoringUI.java Fri Jul 16 14:21:50 2010 -0400
1116.3 @@ -1,7 +1,10 @@
1116.4 /*
1116.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1116.6 *
1116.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1116.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1116.9 + *
1116.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1116.11 + * Other names may be trademarks of their respective owners.
1116.12 *
1116.13 * The contents of this file are subject to the terms of either the GNU
1116.14 * General Public License Version 2 only ("GPL") or the Common
1116.15 @@ -13,9 +16,9 @@
1116.16 * specific language governing permissions and limitations under the
1116.17 * License. When distributing the software, include this License Header
1116.18 * Notice in each file and include the License file at
1116.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1116.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1116.21 * particular file as subject to the "Classpath" exception as provided
1116.22 - * by Sun in the GPL Version 2 section of the License file that
1116.23 + * by Oracle in the GPL Version 2 section of the License file that
1116.24 * accompanied this code. If applicable, add the following below the
1116.25 * License Header, with the fields enclosed by brackets [] replaced by
1116.26 * your own identifying information:
1117.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringActionsProvider.java Fri Jul 16 11:47:36 2010 -0400
1117.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringActionsProvider.java Fri Jul 16 14:21:50 2010 -0400
1117.3 @@ -1,7 +1,10 @@
1117.4 /*
1117.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1117.6 *
1117.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1117.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1117.9 + *
1117.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1117.11 + * Other names may be trademarks of their respective owners.
1117.12 *
1117.13 * The contents of this file are subject to the terms of either the GNU
1117.14 * General Public License Version 2 only ("GPL") or the Common
1117.15 @@ -13,9 +16,9 @@
1117.16 * specific language governing permissions and limitations under the
1117.17 * License. When distributing the software, include this License Header
1117.18 * Notice in each file and include the License file at
1117.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1117.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1117.21 * particular file as subject to the "Classpath" exception as provided
1117.22 - * by Sun in the GPL Version 2 section of the License file that
1117.23 + * by Oracle in the GPL Version 2 section of the License file that
1117.24 * accompanied this code. If applicable, add the following below the
1117.25 * License Header, with the fields enclosed by brackets [] replaced by
1117.26 * your own identifying information:
1118.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringPlugin.java Fri Jul 16 11:47:36 2010 -0400
1118.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringPlugin.java Fri Jul 16 14:21:50 2010 -0400
1118.3 @@ -1,7 +1,10 @@
1118.4 /*
1118.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1118.6 *
1118.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1118.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1118.9 + *
1118.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1118.11 + * Other names may be trademarks of their respective owners.
1118.12 *
1118.13 * The contents of this file are subject to the terms of either the GNU
1118.14 * General Public License Version 2 only ("GPL") or the Common
1118.15 @@ -13,9 +16,9 @@
1118.16 * specific language governing permissions and limitations under the
1118.17 * License. When distributing the software, include this License Header
1118.18 * Notice in each file and include the License file at
1118.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1118.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1118.21 * particular file as subject to the "Classpath" exception as provided
1118.22 - * by Sun in the GPL Version 2 section of the License file that
1118.23 + * by Oracle in the GPL Version 2 section of the License file that
1118.24 * accompanied this code. If applicable, add the following below the
1118.25 * License Header, with the fields enclosed by brackets [] replaced by
1118.26 * your own identifying information:
1119.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringUtils.java Fri Jul 16 11:47:36 2010 -0400
1119.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringUtils.java Fri Jul 16 14:21:50 2010 -0400
1119.3 @@ -1,7 +1,10 @@
1119.4 /*
1119.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1119.6 *
1119.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1119.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1119.9 + *
1119.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1119.11 + * Other names may be trademarks of their respective owners.
1119.12 *
1119.13 * The contents of this file are subject to the terms of either the GNU
1119.14 * General Public License Version 2 only ("GPL") or the Common
1119.15 @@ -13,9 +16,9 @@
1119.16 * specific language governing permissions and limitations under the
1119.17 * License. When distributing the software, include this License Header
1119.18 * Notice in each file and include the License file at
1119.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1119.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1119.21 * particular file as subject to the "Classpath" exception as provided
1119.22 - * by Sun in the GPL Version 2 section of the License file that
1119.23 + * by Oracle in the GPL Version 2 section of the License file that
1119.24 * accompanied this code. If applicable, add the following below the
1119.25 * License Header, with the fields enclosed by brackets [] replaced by
1119.26 * your own identifying information:
1120.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringsPluginFactory.java Fri Jul 16 11:47:36 2010 -0400
1120.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringsPluginFactory.java Fri Jul 16 14:21:50 2010 -0400
1120.3 @@ -1,7 +1,10 @@
1120.4 /*
1120.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1120.6 *
1120.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1120.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1120.9 + *
1120.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1120.11 + * Other names may be trademarks of their respective owners.
1120.12 *
1120.13 * The contents of this file are subject to the terms of either the GNU
1120.14 * General Public License Version 2 only ("GPL") or the Common
1120.15 @@ -13,9 +16,9 @@
1120.16 * specific language governing permissions and limitations under the
1120.17 * License. When distributing the software, include this License Header
1120.18 * Notice in each file and include the License file at
1120.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1120.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1120.21 * particular file as subject to the "Classpath" exception as provided
1120.22 - * by Sun in the GPL Version 2 section of the License file that
1120.23 + * by Oracle in the GPL Version 2 section of the License file that
1120.24 * accompanied this code. If applicable, add the following below the
1120.25 * License Header, with the fields enclosed by brackets [] replaced by
1120.26 * your own identifying information:
1121.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRenamePanel.java Fri Jul 16 11:47:36 2010 -0400
1121.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRenamePanel.java Fri Jul 16 14:21:50 2010 -0400
1121.3 @@ -1,7 +1,10 @@
1121.4 /*
1121.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1121.6 *
1121.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1121.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1121.9 + *
1121.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1121.11 + * Other names may be trademarks of their respective owners.
1121.12 *
1121.13 * The contents of this file are subject to the terms of either the GNU
1121.14 * General Public License Version 2 only ("GPL") or the Common
1121.15 @@ -13,9 +16,9 @@
1121.16 * specific language governing permissions and limitations under the
1121.17 * License. When distributing the software, include this License Header
1121.18 * Notice in each file and include the License file at
1121.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1121.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1121.21 * particular file as subject to the "Classpath" exception as provided
1121.22 - * by Sun in the GPL Version 2 section of the License file that
1121.23 + * by Oracle in the GPL Version 2 section of the License file that
1121.24 * accompanied this code. If applicable, add the following below the
1121.25 * License Header, with the fields enclosed by brackets [] replaced by
1121.26 * your own identifying information:
1122.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRenameRefactoringUI.java Fri Jul 16 11:47:36 2010 -0400
1122.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRenameRefactoringUI.java Fri Jul 16 14:21:50 2010 -0400
1122.3 @@ -1,7 +1,10 @@
1122.4 /*
1122.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1122.6 *
1122.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1122.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1122.9 + *
1122.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1122.11 + * Other names may be trademarks of their respective owners.
1122.12 *
1122.13 * The contents of this file are subject to the terms of either the GNU
1122.14 * General Public License Version 2 only ("GPL") or the Common
1122.15 @@ -13,9 +16,9 @@
1122.16 * specific language governing permissions and limitations under the
1122.17 * License. When distributing the software, include this License Header
1122.18 * Notice in each file and include the License file at
1122.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1122.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1122.21 * particular file as subject to the "Classpath" exception as provided
1122.22 - * by Sun in the GPL Version 2 section of the License file that
1122.23 + * by Oracle in the GPL Version 2 section of the License file that
1122.24 * accompanied this code. If applicable, add the following below the
1122.25 * License Header, with the fields enclosed by brackets [] replaced by
1122.26 * your own identifying information:
1123.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/JSFConfigRenameBeanNameElement.java Fri Jul 16 11:47:36 2010 -0400
1123.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/JSFConfigRenameBeanNameElement.java Fri Jul 16 14:21:50 2010 -0400
1123.3 @@ -1,7 +1,10 @@
1123.4 /*
1123.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1123.6 *
1123.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1123.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1123.9 + *
1123.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1123.11 + * Other names may be trademarks of their respective owners.
1123.12 *
1123.13 * The contents of this file are subject to the terms of either the GNU
1123.14 * General Public License Version 2 only ("GPL") or the Common
1123.15 @@ -13,9 +16,9 @@
1123.16 * specific language governing permissions and limitations under the
1123.17 * License. When distributing the software, include this License Header
1123.18 * Notice in each file and include the License file at
1123.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1123.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1123.21 * particular file as subject to the "Classpath" exception as provided
1123.22 - * by Sun in the GPL Version 2 section of the License file that
1123.23 + * by Oracle in the GPL Version 2 section of the License file that
1123.24 * accompanied this code. If applicable, add the following below the
1123.25 * License Header, with the fields enclosed by brackets [] replaced by
1123.26 * your own identifying information:
1124.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/JSFConfigRenameFromViewIdElement.java Fri Jul 16 11:47:36 2010 -0400
1124.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/JSFConfigRenameFromViewIdElement.java Fri Jul 16 14:21:50 2010 -0400
1124.3 @@ -1,7 +1,10 @@
1124.4 /*
1124.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1124.6 *
1124.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1124.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1124.9 + *
1124.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1124.11 + * Other names may be trademarks of their respective owners.
1124.12 *
1124.13 * The contents of this file are subject to the terms of either the GNU
1124.14 * General Public License Version 2 only ("GPL") or the Common
1124.15 @@ -13,9 +16,9 @@
1124.16 * specific language governing permissions and limitations under the
1124.17 * License. When distributing the software, include this License Header
1124.18 * Notice in each file and include the License file at
1124.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1124.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1124.21 * particular file as subject to the "Classpath" exception as provided
1124.22 - * by Sun in the GPL Version 2 section of the License file that
1124.23 + * by Oracle in the GPL Version 2 section of the License file that
1124.24 * accompanied this code. If applicable, add the following below the
1124.25 * License Header, with the fields enclosed by brackets [] replaced by
1124.26 * your own identifying information:
1125.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/JSFConfigRenameToViewIdElement.java Fri Jul 16 11:47:36 2010 -0400
1125.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/JSFConfigRenameToViewIdElement.java Fri Jul 16 14:21:50 2010 -0400
1125.3 @@ -1,7 +1,10 @@
1125.4 /*
1125.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1125.6 *
1125.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1125.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1125.9 + *
1125.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1125.11 + * Other names may be trademarks of their respective owners.
1125.12 *
1125.13 * The contents of this file are subject to the terms of either the GNU
1125.14 * General Public License Version 2 only ("GPL") or the Common
1125.15 @@ -13,9 +16,9 @@
1125.16 * specific language governing permissions and limitations under the
1125.17 * License. When distributing the software, include this License Header
1125.18 * Notice in each file and include the License file at
1125.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1125.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1125.21 * particular file as subject to the "Classpath" exception as provided
1125.22 - * by Sun in the GPL Version 2 section of the License file that
1125.23 + * by Oracle in the GPL Version 2 section of the License file that
1125.24 * accompanied this code. If applicable, add the following below the
1125.25 * License Header, with the fields enclosed by brackets [] replaced by
1125.26 * your own identifying information:
1126.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/MarkupRefactoringElement.java Fri Jul 16 11:47:36 2010 -0400
1126.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/MarkupRefactoringElement.java Fri Jul 16 14:21:50 2010 -0400
1126.3 @@ -1,7 +1,10 @@
1126.4 /*
1126.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1126.6 *
1126.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1126.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1126.9 + *
1126.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1126.11 + * Other names may be trademarks of their respective owners.
1126.12 *
1126.13 * The contents of this file are subject to the terms of either the GNU
1126.14 * General Public License Version 2 only ("GPL") or the Common
1126.15 @@ -13,9 +16,9 @@
1126.16 * specific language governing permissions and limitations under the
1126.17 * License. When distributing the software, include this License Header
1126.18 * Notice in each file and include the License file at
1126.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1126.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1126.21 * particular file as subject to the "Classpath" exception as provided
1126.22 - * by Sun in the GPL Version 2 section of the License file that
1126.23 + * by Oracle in the GPL Version 2 section of the License file that
1126.24 * accompanied this code. If applicable, add the following below the
1126.25 * License Header, with the fields enclosed by brackets [] replaced by
1126.26 * your own identifying information:
1127.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/PostProcessRenamedFolderRefactoringElement.java Fri Jul 16 11:47:36 2010 -0400
1127.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/PostProcessRenamedFolderRefactoringElement.java Fri Jul 16 14:21:50 2010 -0400
1127.3 @@ -1,7 +1,10 @@
1127.4 /*
1127.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1127.6 *
1127.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1127.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1127.9 + *
1127.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1127.11 + * Other names may be trademarks of their respective owners.
1127.12 *
1127.13 * The contents of this file are subject to the terms of either the GNU
1127.14 * General Public License Version 2 only ("GPL") or the Common
1127.15 @@ -13,9 +16,9 @@
1127.16 * specific language governing permissions and limitations under the
1127.17 * License. When distributing the software, include this License Header
1127.18 * Notice in each file and include the License file at
1127.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1127.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1127.21 * particular file as subject to the "Classpath" exception as provided
1127.22 - * by Sun in the GPL Version 2 section of the License file that
1127.23 + * by Oracle in the GPL Version 2 section of the License file that
1127.24 * accompanied this code. If applicable, add the following below the
1127.25 * License Header, with the fields enclosed by brackets [] replaced by
1127.26 * your own identifying information:
1128.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameBeanNameStringRefactoringElement.java Fri Jul 16 11:47:36 2010 -0400
1128.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameBeanNameStringRefactoringElement.java Fri Jul 16 14:21:50 2010 -0400
1128.3 @@ -1,7 +1,10 @@
1128.4 /*
1128.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1128.6 *
1128.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1128.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1128.9 + *
1128.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1128.11 + * Other names may be trademarks of their respective owners.
1128.12 *
1128.13 * The contents of this file are subject to the terms of either the GNU
1128.14 * General Public License Version 2 only ("GPL") or the Common
1128.15 @@ -13,9 +16,9 @@
1128.16 * specific language governing permissions and limitations under the
1128.17 * License. When distributing the software, include this License Header
1128.18 * Notice in each file and include the License file at
1128.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1128.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1128.21 * particular file as subject to the "Classpath" exception as provided
1128.22 - * by Sun in the GPL Version 2 section of the License file that
1128.23 + * by Oracle in the GPL Version 2 section of the License file that
1128.24 * accompanied this code. If applicable, add the following below the
1128.25 * License Header, with the fields enclosed by brackets [] replaced by
1128.26 * your own identifying information:
1129.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameBeanValueBindingExpressionRefactoringElement.java Fri Jul 16 11:47:36 2010 -0400
1129.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameBeanValueBindingExpressionRefactoringElement.java Fri Jul 16 14:21:50 2010 -0400
1129.3 @@ -1,7 +1,10 @@
1129.4 /*
1129.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1129.6 *
1129.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1129.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1129.9 + *
1129.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1129.11 + * Other names may be trademarks of their respective owners.
1129.12 *
1129.13 * The contents of this file are subject to the terms of either the GNU
1129.14 * General Public License Version 2 only ("GPL") or the Common
1129.15 @@ -13,9 +16,9 @@
1129.16 * specific language governing permissions and limitations under the
1129.17 * License. When distributing the software, include this License Header
1129.18 * Notice in each file and include the License file at
1129.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1129.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1129.21 * particular file as subject to the "Classpath" exception as provided
1129.22 - * by Sun in the GPL Version 2 section of the License file that
1129.23 + * by Oracle in the GPL Version 2 section of the License file that
1129.24 * accompanied this code. If applicable, add the following below the
1129.25 * License Header, with the fields enclosed by brackets [] replaced by
1129.26 * your own identifying information:
1130.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameElExpressionReferencesRefactoringElement.java Fri Jul 16 11:47:36 2010 -0400
1130.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameElExpressionReferencesRefactoringElement.java Fri Jul 16 14:21:50 2010 -0400
1130.3 @@ -1,7 +1,10 @@
1130.4 /*
1130.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1130.6 *
1130.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1130.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1130.9 + *
1130.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1130.11 + * Other names may be trademarks of their respective owners.
1130.12 *
1130.13 * The contents of this file are subject to the terms of either the GNU
1130.14 * General Public License Version 2 only ("GPL") or the Common
1130.15 @@ -13,9 +16,9 @@
1130.16 * specific language governing permissions and limitations under the
1130.17 * License. When distributing the software, include this License Header
1130.18 * Notice in each file and include the License file at
1130.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1130.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1130.21 * particular file as subject to the "Classpath" exception as provided
1130.22 - * by Sun in the GPL Version 2 section of the License file that
1130.23 + * by Oracle in the GPL Version 2 section of the License file that
1130.24 * accompanied this code. If applicable, add the following below the
1130.25 * License Header, with the fields enclosed by brackets [] replaced by
1130.26 * your own identifying information:
1131.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameResourceReferencesRefactoringElement.java Fri Jul 16 11:47:36 2010 -0400
1131.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameResourceReferencesRefactoringElement.java Fri Jul 16 14:21:50 2010 -0400
1131.3 @@ -1,7 +1,10 @@
1131.4 /*
1131.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1131.6 *
1131.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1131.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1131.9 + *
1131.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1131.11 + * Other names may be trademarks of their respective owners.
1131.12 *
1131.13 * The contents of this file are subject to the terms of either the GNU
1131.14 * General Public License Version 2 only ("GPL") or the Common
1131.15 @@ -13,9 +16,9 @@
1131.16 * specific language governing permissions and limitations under the
1131.17 * License. When distributing the software, include this License Header
1131.18 * Notice in each file and include the License file at
1131.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1131.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1131.21 * particular file as subject to the "Classpath" exception as provided
1131.22 - * by Sun in the GPL Version 2 section of the License file that
1131.23 + * by Oracle in the GPL Version 2 section of the License file that
1131.24 * accompanied this code. If applicable, add the following below the
1131.25 * License Header, with the fields enclosed by brackets [] replaced by
1131.26 * your own identifying information:
1132.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameSubViewRefactoringElement.java Fri Jul 16 11:47:36 2010 -0400
1132.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RenameSubViewRefactoringElement.java Fri Jul 16 14:21:50 2010 -0400
1132.3 @@ -1,7 +1,10 @@
1132.4 /*
1132.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1132.6 *
1132.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1132.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1132.9 + *
1132.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1132.11 + * Other names may be trademarks of their respective owners.
1132.12 *
1132.13 * The contents of this file are subject to the terms of either the GNU
1132.14 * General Public License Version 2 only ("GPL") or the Common
1132.15 @@ -13,9 +16,9 @@
1132.16 * specific language governing permissions and limitations under the
1132.17 * License. When distributing the software, include this License Header
1132.18 * Notice in each file and include the License file at
1132.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1132.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1132.21 * particular file as subject to the "Classpath" exception as provided
1132.22 - * by Sun in the GPL Version 2 section of the License file that
1132.23 + * by Oracle in the GPL Version 2 section of the License file that
1132.24 * accompanied this code. If applicable, add the following below the
1132.25 * License Header, with the fields enclosed by brackets [] replaced by
1132.26 * your own identifying information:
1133.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ResourceReferenceScanner.java Fri Jul 16 11:47:36 2010 -0400
1133.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ResourceReferenceScanner.java Fri Jul 16 14:21:50 2010 -0400
1133.3 @@ -1,7 +1,10 @@
1133.4 /*
1133.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1133.6 *
1133.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1133.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1133.9 + *
1133.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1133.11 + * Other names may be trademarks of their respective owners.
1133.12 *
1133.13 * The contents of this file are subject to the terms of either the GNU
1133.14 * General Public License Version 2 only ("GPL") or the Common
1133.15 @@ -13,9 +16,9 @@
1133.16 * specific language governing permissions and limitations under the
1133.17 * License. When distributing the software, include this License Header
1133.18 * Notice in each file and include the License file at
1133.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1133.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1133.21 * particular file as subject to the "Classpath" exception as provided
1133.22 - * by Sun in the GPL Version 2 section of the License file that
1133.23 + * by Oracle in the GPL Version 2 section of the License file that
1133.24 * accompanied this code. If applicable, add the following below the
1133.25 * License Header, with the fields enclosed by brackets [] replaced by
1133.26 * your own identifying information:
1134.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ResourceReferenceUpdater.java Fri Jul 16 11:47:36 2010 -0400
1134.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ResourceReferenceUpdater.java Fri Jul 16 14:21:50 2010 -0400
1134.3 @@ -1,7 +1,10 @@
1134.4 /*
1134.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1134.6 *
1134.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1134.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1134.9 + *
1134.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1134.11 + * Other names may be trademarks of their respective owners.
1134.12 *
1134.13 * The contents of this file are subject to the terms of either the GNU
1134.14 * General Public License Version 2 only ("GPL") or the Common
1134.15 @@ -13,9 +16,9 @@
1134.16 * specific language governing permissions and limitations under the
1134.17 * License. When distributing the software, include this License Header
1134.18 * Notice in each file and include the License file at
1134.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1134.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1134.21 * particular file as subject to the "Classpath" exception as provided
1134.22 - * by Sun in the GPL Version 2 section of the License file that
1134.23 + * by Oracle in the GPL Version 2 section of the License file that
1134.24 * accompanied this code. If applicable, add the following below the
1134.25 * License Header, with the fields enclosed by brackets [] replaced by
1134.26 * your own identifying information:
1135.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RetoucheCommit.java Fri Jul 16 11:47:36 2010 -0400
1135.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/RetoucheCommit.java Fri Jul 16 14:21:50 2010 -0400
1135.3 @@ -1,7 +1,10 @@
1135.4 /*
1135.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1135.6 *
1135.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1135.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1135.9 + *
1135.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1135.11 + * Other names may be trademarks of their respective owners.
1135.12 *
1135.13 * The contents of this file are subject to the terms of either the GNU
1135.14 * General Public License Version 2 only ("GPL") or the Common
1135.15 @@ -13,9 +16,9 @@
1135.16 * specific language governing permissions and limitations under the
1135.17 * License. When distributing the software, include this License Header
1135.18 * Notice in each file and include the License file at
1135.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1135.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1135.21 * particular file as subject to the "Classpath" exception as provided
1135.22 - * by Sun in the GPL Version 2 section of the License file that
1135.23 + * by Oracle in the GPL Version 2 section of the License file that
1135.24 * accompanied this code. If applicable, add the following below the
1135.25 * License Header, with the fields enclosed by brackets [] replaced by
1135.26 * your own identifying information:
1136.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/SearchVisitor.java Fri Jul 16 11:47:36 2010 -0400
1136.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/SearchVisitor.java Fri Jul 16 14:21:50 2010 -0400
1136.3 @@ -1,7 +1,10 @@
1136.4 /*
1136.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1136.6 *
1136.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1136.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1136.9 + *
1136.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1136.11 + * Other names may be trademarks of their respective owners.
1136.12 *
1136.13 * The contents of this file are subject to the terms of either the GNU
1136.14 * General Public License Version 2 only ("GPL") or the Common
1136.15 @@ -13,9 +16,9 @@
1136.16 * specific language governing permissions and limitations under the
1136.17 * License. When distributing the software, include this License Header
1136.18 * Notice in each file and include the License file at
1136.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1136.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1136.21 * particular file as subject to the "Classpath" exception as provided
1136.22 - * by Sun in the GPL Version 2 section of the License file that
1136.23 + * by Oracle in the GPL Version 2 section of the License file that
1136.24 * accompanied this code. If applicable, add the following below the
1136.25 * License Header, with the fields enclosed by brackets [] replaced by
1136.26 * your own identifying information:
1137.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/SetProjectStartPageRefactoringElement.java Fri Jul 16 11:47:36 2010 -0400
1137.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/SetProjectStartPageRefactoringElement.java Fri Jul 16 14:21:50 2010 -0400
1137.3 @@ -1,7 +1,10 @@
1137.4 /*
1137.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1137.6 *
1137.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1137.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1137.9 + *
1137.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1137.11 + * Other names may be trademarks of their respective owners.
1137.12 *
1137.13 * The contents of this file are subject to the terms of either the GNU
1137.14 * General Public License Version 2 only ("GPL") or the Common
1137.15 @@ -13,9 +16,9 @@
1137.16 * specific language governing permissions and limitations under the
1137.17 * License. When distributing the software, include this License Header
1137.18 * Notice in each file and include the License file at
1137.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1137.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1137.21 * particular file as subject to the "Classpath" exception as provided
1137.22 - * by Sun in the GPL Version 2 section of the License file that
1137.23 + * by Oracle in the GPL Version 2 section of the License file that
1137.24 * accompanied this code. If applicable, add the following below the
1137.25 * License Header, with the fields enclosed by brackets [] replaced by
1137.26 * your own identifying information:
1138.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/StringLiteralTransformer.java Fri Jul 16 11:47:36 2010 -0400
1138.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/StringLiteralTransformer.java Fri Jul 16 14:21:50 2010 -0400
1138.3 @@ -1,7 +1,10 @@
1138.4 /*
1138.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1138.6 *
1138.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1138.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1138.9 + *
1138.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1138.11 + * Other names may be trademarks of their respective owners.
1138.12 *
1138.13 * The contents of this file are subject to the terms of either the GNU
1138.14 * General Public License Version 2 only ("GPL") or the Common
1138.15 @@ -13,9 +16,9 @@
1138.16 * specific language governing permissions and limitations under the
1138.17 * License. When distributing the software, include this License Header
1138.18 * Notice in each file and include the License file at
1138.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1138.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1138.21 * particular file as subject to the "Classpath" exception as provided
1138.22 - * by Sun in the GPL Version 2 section of the License file that
1138.23 + * by Oracle in the GPL Version 2 section of the License file that
1138.24 * accompanied this code. If applicable, add the following below the
1138.25 * License Header, with the fields enclosed by brackets [] replaced by
1138.26 * your own identifying information:
1139.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1139.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1139.3 @@ -1,6 +1,9 @@
1139.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1139.5 #
1139.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1139.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1139.8 +#
1139.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1139.10 +# Other names may be trademarks of their respective owners.
1139.11 #
1139.12 # The contents of this file are subject to the terms of either the GNU
1139.13 # General Public License Version 2 only ("GPL") or the Common
1139.14 @@ -12,9 +15,9 @@
1139.15 # specific language governing permissions and limitations under the
1139.16 # License. When distributing the software, include this License Header
1139.17 # Notice in each file and include the License file at
1139.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1139.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1139.20 # particular file as subject to the "Classpath" exception as provided
1139.21 -# by Sun in the GPL Version 2 section of the License file that
1139.22 +# by Oracle in the GPL Version 2 section of the License file that
1139.23 # accompanied this code. If applicable, add the following below the
1139.24 # License Header, with the fields enclosed by brackets [] replaced by
1139.25 # your own identifying information:
1140.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/ClassUtil.java Fri Jul 16 11:47:36 2010 -0400
1140.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/ClassUtil.java Fri Jul 16 14:21:50 2010 -0400
1140.3 @@ -1,7 +1,10 @@
1140.4 /*
1140.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1140.6 *
1140.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1140.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1140.9 + *
1140.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1140.11 + * Other names may be trademarks of their respective owners.
1140.12 *
1140.13 * The contents of this file are subject to the terms of either the GNU
1140.14 * General Public License Version 2 only ("GPL") or the Common
1140.15 @@ -13,9 +16,9 @@
1140.16 * specific language governing permissions and limitations under the
1140.17 * License. When distributing the software, include this License Header
1140.18 * Notice in each file and include the License file at
1140.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1140.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1140.21 * particular file as subject to the "Classpath" exception as provided
1140.22 - * by Sun in the GPL Version 2 section of the License file that
1140.23 + * by Oracle in the GPL Version 2 section of the License file that
1140.24 * accompanied this code. If applicable, add the following below the
1140.25 * License Header, with the fields enclosed by brackets [] replaced by
1140.26 * your own identifying information:
1141.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/DelegatorMethod.java Fri Jul 16 11:47:36 2010 -0400
1141.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/DelegatorMethod.java Fri Jul 16 14:21:50 2010 -0400
1141.3 @@ -1,7 +1,10 @@
1141.4 /*
1141.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1141.6 *
1141.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1141.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1141.9 + *
1141.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1141.11 + * Other names may be trademarks of their respective owners.
1141.12 *
1141.13 * The contents of this file are subject to the terms of either the GNU
1141.14 * General Public License Version 2 only ("GPL") or the Common
1141.15 @@ -13,9 +16,9 @@
1141.16 * specific language governing permissions and limitations under the
1141.17 * License. When distributing the software, include this License Header
1141.18 * Notice in each file and include the License file at
1141.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1141.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1141.21 * particular file as subject to the "Classpath" exception as provided
1141.22 - * by Sun in the GPL Version 2 section of the License file that
1141.23 + * by Oracle in the GPL Version 2 section of the License file that
1141.24 * accompanied this code. If applicable, add the following below the
1141.25 * License Header, with the fields enclosed by brackets [] replaced by
1141.26 * your own identifying information:
1142.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/EventMethod.java Fri Jul 16 11:47:36 2010 -0400
1142.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/EventMethod.java Fri Jul 16 14:21:50 2010 -0400
1142.3 @@ -1,7 +1,10 @@
1142.4 /*
1142.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1142.6 *
1142.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1142.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1142.9 + *
1142.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1142.11 + * Other names may be trademarks of their respective owners.
1142.12 *
1142.13 * The contents of this file are subject to the terms of either the GNU
1142.14 * General Public License Version 2 only ("GPL") or the Common
1142.15 @@ -13,9 +16,9 @@
1142.16 * specific language governing permissions and limitations under the
1142.17 * License. When distributing the software, include this License Header
1142.18 * Notice in each file and include the License file at
1142.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1142.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1142.21 * particular file as subject to the "Classpath" exception as provided
1142.22 - * by Sun in the GPL Version 2 section of the License file that
1142.23 + * by Oracle in the GPL Version 2 section of the License file that
1142.24 * accompanied this code. If applicable, add the following below the
1142.25 * License Header, with the fields enclosed by brackets [] replaced by
1142.26 * your own identifying information:
1143.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/ExpressionUtils.java Fri Jul 16 11:47:36 2010 -0400
1143.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/ExpressionUtils.java Fri Jul 16 14:21:50 2010 -0400
1143.3 @@ -1,7 +1,10 @@
1143.4 /*
1143.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1143.6 *
1143.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1143.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1143.9 + *
1143.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1143.11 + * Other names may be trademarks of their respective owners.
1143.12 *
1143.13 * The contents of this file are subject to the terms of either the GNU
1143.14 * General Public License Version 2 only ("GPL") or the Common
1143.15 @@ -13,9 +16,9 @@
1143.16 * specific language governing permissions and limitations under the
1143.17 * License. When distributing the software, include this License Header
1143.18 * Notice in each file and include the License file at
1143.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1143.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1143.21 * particular file as subject to the "Classpath" exception as provided
1143.22 - * by Sun in the GPL Version 2 section of the License file that
1143.23 + * by Oracle in the GPL Version 2 section of the License file that
1143.24 * accompanied this code. If applicable, add the following below the
1143.25 * License Header, with the fields enclosed by brackets [] replaced by
1143.26 * your own identifying information:
1144.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/JavaClass.java Fri Jul 16 11:47:36 2010 -0400
1144.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/JavaClass.java Fri Jul 16 14:21:50 2010 -0400
1144.3 @@ -1,7 +1,10 @@
1144.4 /*
1144.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1144.6 *
1144.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1144.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1144.9 + *
1144.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1144.11 + * Other names may be trademarks of their respective owners.
1144.12 *
1144.13 * The contents of this file are subject to the terms of either the GNU
1144.14 * General Public License Version 2 only ("GPL") or the Common
1144.15 @@ -13,9 +16,9 @@
1144.16 * specific language governing permissions and limitations under the
1144.17 * License. When distributing the software, include this License Header
1144.18 * Notice in each file and include the License file at
1144.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1144.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1144.21 * particular file as subject to the "Classpath" exception as provided
1144.22 - * by Sun in the GPL Version 2 section of the License file that
1144.23 + * by Oracle in the GPL Version 2 section of the License file that
1144.24 * accompanied this code. If applicable, add the following below the
1144.25 * License Header, with the fields enclosed by brackets [] replaced by
1144.26 * your own identifying information:
1145.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/JavaUnit.java Fri Jul 16 11:47:36 2010 -0400
1145.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/JavaUnit.java Fri Jul 16 14:21:50 2010 -0400
1145.3 @@ -1,7 +1,10 @@
1145.4 /*
1145.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1145.6 *
1145.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1145.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1145.9 + *
1145.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1145.11 + * Other names may be trademarks of their respective owners.
1145.12 *
1145.13 * The contents of this file are subject to the terms of either the GNU
1145.14 * General Public License Version 2 only ("GPL") or the Common
1145.15 @@ -13,9 +16,9 @@
1145.16 * specific language governing permissions and limitations under the
1145.17 * License. When distributing the software, include this License Header
1145.18 * Notice in each file and include the License file at
1145.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1145.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1145.21 * particular file as subject to the "Classpath" exception as provided
1145.22 - * by Sun in the GPL Version 2 section of the License file that
1145.23 + * by Oracle in the GPL Version 2 section of the License file that
1145.24 * accompanied this code. If applicable, add the following below the
1145.25 * License Header, with the fields enclosed by brackets [] replaced by
1145.26 * your own identifying information:
1146.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/Method.java Fri Jul 16 11:47:36 2010 -0400
1146.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/Method.java Fri Jul 16 14:21:50 2010 -0400
1146.3 @@ -1,7 +1,10 @@
1146.4 /*
1146.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1146.6 *
1146.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1146.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1146.9 + *
1146.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1146.11 + * Other names may be trademarks of their respective owners.
1146.12 *
1146.13 * The contents of this file are subject to the terms of either the GNU
1146.14 * General Public License Version 2 only ("GPL") or the Common
1146.15 @@ -13,9 +16,9 @@
1146.16 * specific language governing permissions and limitations under the
1146.17 * License. When distributing the software, include this License Header
1146.18 * Notice in each file and include the License file at
1146.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1146.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1146.21 * particular file as subject to the "Classpath" exception as provided
1146.22 - * by Sun in the GPL Version 2 section of the License file that
1146.23 + * by Oracle in the GPL Version 2 section of the License file that
1146.24 * accompanied this code. If applicable, add the following below the
1146.25 * License Header, with the fields enclosed by brackets [] replaced by
1146.26 * your own identifying information:
1147.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/MethodInfo.java Fri Jul 16 11:47:36 2010 -0400
1147.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/MethodInfo.java Fri Jul 16 14:21:50 2010 -0400
1147.3 @@ -1,7 +1,10 @@
1147.4 /*
1147.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1147.6 *
1147.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1147.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1147.9 + *
1147.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1147.11 + * Other names may be trademarks of their respective owners.
1147.12 *
1147.13 * The contents of this file are subject to the terms of either the GNU
1147.14 * General Public License Version 2 only ("GPL") or the Common
1147.15 @@ -13,9 +16,9 @@
1147.16 * specific language governing permissions and limitations under the
1147.17 * License. When distributing the software, include this License Header
1147.18 * Notice in each file and include the License file at
1147.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1147.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1147.21 * particular file as subject to the "Classpath" exception as provided
1147.22 - * by Sun in the GPL Version 2 section of the License file that
1147.23 + * by Oracle in the GPL Version 2 section of the License file that
1147.24 * accompanied this code. If applicable, add the following below the
1147.25 * License Header, with the fields enclosed by brackets [] replaced by
1147.26 * your own identifying information:
1148.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/ReadTaskWrapper.java Fri Jul 16 11:47:36 2010 -0400
1148.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/ReadTaskWrapper.java Fri Jul 16 14:21:50 2010 -0400
1148.3 @@ -1,7 +1,10 @@
1148.4 /*
1148.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1148.6 *
1148.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1148.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1148.9 + *
1148.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1148.11 + * Other names may be trademarks of their respective owners.
1148.12 *
1148.13 * The contents of this file are subject to the terms of either the GNU
1148.14 * General Public License Version 2 only ("GPL") or the Common
1148.15 @@ -13,9 +16,9 @@
1148.16 * specific language governing permissions and limitations under the
1148.17 * License. When distributing the software, include this License Header
1148.18 * Notice in each file and include the License file at
1148.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1148.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1148.21 * particular file as subject to the "Classpath" exception as provided
1148.22 - * by Sun in the GPL Version 2 section of the License file that
1148.23 + * by Oracle in the GPL Version 2 section of the License file that
1148.24 * accompanied this code. If applicable, add the following below the
1148.25 * License Header, with the fields enclosed by brackets [] replaced by
1148.26 * your own identifying information:
1149.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/Refactor.java Fri Jul 16 11:47:36 2010 -0400
1149.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/Refactor.java Fri Jul 16 14:21:50 2010 -0400
1149.3 @@ -1,7 +1,10 @@
1149.4 /*
1149.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1149.6 *
1149.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1149.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1149.9 + *
1149.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1149.11 + * Other names may be trademarks of their respective owners.
1149.12 *
1149.13 * The contents of this file are subject to the terms of either the GNU
1149.14 * General Public License Version 2 only ("GPL") or the Common
1149.15 @@ -13,9 +16,9 @@
1149.16 * specific language governing permissions and limitations under the
1149.17 * License. When distributing the software, include this License Header
1149.18 * Notice in each file and include the License file at
1149.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1149.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1149.21 * particular file as subject to the "Classpath" exception as provided
1149.22 - * by Sun in the GPL Version 2 section of the License file that
1149.23 + * by Oracle in the GPL Version 2 section of the License file that
1149.24 * accompanied this code. If applicable, add the following below the
1149.25 * License Header, with the fields enclosed by brackets [] replaced by
1149.26 * your own identifying information:
1150.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/Statement.java Fri Jul 16 11:47:36 2010 -0400
1150.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/Statement.java Fri Jul 16 14:21:50 2010 -0400
1150.3 @@ -1,7 +1,10 @@
1150.4 /*
1150.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1150.6 *
1150.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1150.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1150.9 + *
1150.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1150.11 + * Other names may be trademarks of their respective owners.
1150.12 *
1150.13 * The contents of this file are subject to the terms of either the GNU
1150.14 * General Public License Version 2 only ("GPL") or the Common
1150.15 @@ -13,9 +16,9 @@
1150.16 * specific language governing permissions and limitations under the
1150.17 * License. When distributing the software, include this License Header
1150.18 * Notice in each file and include the License file at
1150.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1150.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1150.21 * particular file as subject to the "Classpath" exception as provided
1150.22 - * by Sun in the GPL Version 2 section of the License file that
1150.23 + * by Oracle in the GPL Version 2 section of the License file that
1150.24 * accompanied this code. If applicable, add the following below the
1150.25 * License Header, with the fields enclosed by brackets [] replaced by
1150.26 * your own identifying information:
1151.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/TreeMakerUtils.java Fri Jul 16 11:47:36 2010 -0400
1151.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/TreeMakerUtils.java Fri Jul 16 14:21:50 2010 -0400
1151.3 @@ -1,7 +1,10 @@
1151.4 /*
1151.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1151.6 *
1151.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1151.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1151.9 + *
1151.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1151.11 + * Other names may be trademarks of their respective owners.
1151.12 *
1151.13 * The contents of this file are subject to the terms of either the GNU
1151.14 * General Public License Version 2 only ("GPL") or the Common
1151.15 @@ -13,9 +16,9 @@
1151.16 * specific language governing permissions and limitations under the
1151.17 * License. When distributing the software, include this License Header
1151.18 * Notice in each file and include the License file at
1151.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1151.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1151.21 * particular file as subject to the "Classpath" exception as provided
1151.22 - * by Sun in the GPL Version 2 section of the License file that
1151.23 + * by Oracle in the GPL Version 2 section of the License file that
1151.24 * accompanied this code. If applicable, add the following below the
1151.25 * License Header, with the fields enclosed by brackets [] replaced by
1151.26 * your own identifying information:
1152.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/TreeUtils.java Fri Jul 16 11:47:36 2010 -0400
1152.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/TreeUtils.java Fri Jul 16 14:21:50 2010 -0400
1152.3 @@ -1,7 +1,10 @@
1152.4 /*
1152.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1152.6 *
1152.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1152.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1152.9 + *
1152.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1152.11 + * Other names may be trademarks of their respective owners.
1152.12 *
1152.13 * The contents of this file are subject to the terms of either the GNU
1152.14 * General Public License Version 2 only ("GPL") or the Common
1152.15 @@ -13,9 +16,9 @@
1152.16 * specific language governing permissions and limitations under the
1152.17 * License. When distributing the software, include this License Header
1152.18 * Notice in each file and include the License file at
1152.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1152.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1152.21 * particular file as subject to the "Classpath" exception as provided
1152.22 - * by Sun in the GPL Version 2 section of the License file that
1152.23 + * by Oracle in the GPL Version 2 section of the License file that
1152.24 * accompanied this code. If applicable, add the following below the
1152.25 * License Header, with the fields enclosed by brackets [] replaced by
1152.26 * your own identifying information:
1153.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/WriteTaskWrapper.java Fri Jul 16 11:47:36 2010 -0400
1153.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/WriteTaskWrapper.java Fri Jul 16 14:21:50 2010 -0400
1153.3 @@ -1,7 +1,10 @@
1153.4 /*
1153.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1153.6 *
1153.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1153.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1153.9 + *
1153.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1153.11 + * Other names may be trademarks of their respective owners.
1153.12 *
1153.13 * The contents of this file are subject to the terms of either the GNU
1153.14 * General Public License Version 2 only ("GPL") or the Common
1153.15 @@ -13,9 +16,9 @@
1153.16 * specific language governing permissions and limitations under the
1153.17 * License. When distributing the software, include this License Header
1153.18 * Notice in each file and include the License file at
1153.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1153.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1153.21 * particular file as subject to the "Classpath" exception as provided
1153.22 - * by Sun in the GPL Version 2 section of the License file that
1153.23 + * by Oracle in the GPL Version 2 section of the License file that
1153.24 * accompanied this code. If applicable, add the following below the
1153.25 * License Header, with the fields enclosed by brackets [] replaced by
1153.26 * your own identifying information:
1154.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeanSelectionEditor.java Fri Jul 16 11:47:36 2010 -0400
1154.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeanSelectionEditor.java Fri Jul 16 14:21:50 2010 -0400
1154.3 @@ -1,7 +1,10 @@
1154.4 /*
1154.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1154.6 *
1154.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1154.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1154.9 + *
1154.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1154.11 + * Other names may be trademarks of their respective owners.
1154.12 *
1154.13 * The contents of this file are subject to the terms of either the GNU
1154.14 * General Public License Version 2 only ("GPL") or the Common
1154.15 @@ -13,9 +16,9 @@
1154.16 * specific language governing permissions and limitations under the
1154.17 * License. When distributing the software, include this License Header
1154.18 * Notice in each file and include the License file at
1154.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1154.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1154.21 * particular file as subject to the "Classpath" exception as provided
1154.22 - * by Sun in the GPL Version 2 section of the License file that
1154.23 + * by Oracle in the GPL Version 2 section of the License file that
1154.24 * accompanied this code. If applicable, add the following below the
1154.25 * License Header, with the fields enclosed by brackets [] replaced by
1154.26 * your own identifying information:
1155.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignBean.java Fri Jul 16 11:47:36 2010 -0400
1155.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignBean.java Fri Jul 16 14:21:50 2010 -0400
1155.3 @@ -1,7 +1,10 @@
1155.4 /*
1155.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1155.6 *
1155.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1155.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1155.9 + *
1155.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1155.11 + * Other names may be trademarks of their respective owners.
1155.12 *
1155.13 * The contents of this file are subject to the terms of either the GNU
1155.14 * General Public License Version 2 only ("GPL") or the Common
1155.15 @@ -13,9 +16,9 @@
1155.16 * specific language governing permissions and limitations under the
1155.17 * License. When distributing the software, include this License Header
1155.18 * Notice in each file and include the License file at
1155.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1155.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1155.21 * particular file as subject to the "Classpath" exception as provided
1155.22 - * by Sun in the GPL Version 2 section of the License file that
1155.23 + * by Oracle in the GPL Version 2 section of the License file that
1155.24 * accompanied this code. If applicable, add the following below the
1155.25 * License Header, with the fields enclosed by brackets [] replaced by
1155.26 * your own identifying information:
1156.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignBeanExt.java Fri Jul 16 11:47:36 2010 -0400
1156.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignBeanExt.java Fri Jul 16 14:21:50 2010 -0400
1156.3 @@ -1,7 +1,10 @@
1156.4 /*
1156.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1156.6 *
1156.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1156.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1156.9 + *
1156.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1156.11 + * Other names may be trademarks of their respective owners.
1156.12 *
1156.13 * The contents of this file are subject to the terms of either the GNU
1156.14 * General Public License Version 2 only ("GPL") or the Common
1156.15 @@ -13,9 +16,9 @@
1156.16 * specific language governing permissions and limitations under the
1156.17 * License. When distributing the software, include this License Header
1156.18 * Notice in each file and include the License file at
1156.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1156.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1156.21 * particular file as subject to the "Classpath" exception as provided
1156.22 - * by Sun in the GPL Version 2 section of the License file that
1156.23 + * by Oracle in the GPL Version 2 section of the License file that
1156.24 * accompanied this code. If applicable, add the following below the
1156.25 * License Header, with the fields enclosed by brackets [] replaced by
1156.26 * your own identifying information:
1157.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignEvent.java Fri Jul 16 11:47:36 2010 -0400
1157.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignEvent.java Fri Jul 16 14:21:50 2010 -0400
1157.3 @@ -1,7 +1,10 @@
1157.4 /*
1157.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1157.6 *
1157.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1157.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1157.9 + *
1157.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1157.11 + * Other names may be trademarks of their respective owners.
1157.12 *
1157.13 * The contents of this file are subject to the terms of either the GNU
1157.14 * General Public License Version 2 only ("GPL") or the Common
1157.15 @@ -13,9 +16,9 @@
1157.16 * specific language governing permissions and limitations under the
1157.17 * License. When distributing the software, include this License Header
1157.18 * Notice in each file and include the License file at
1157.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1157.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1157.21 * particular file as subject to the "Classpath" exception as provided
1157.22 - * by Sun in the GPL Version 2 section of the License file that
1157.23 + * by Oracle in the GPL Version 2 section of the License file that
1157.24 * accompanied this code. If applicable, add the following below the
1157.25 * License Header, with the fields enclosed by brackets [] replaced by
1157.26 * your own identifying information:
1158.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignProperty.java Fri Jul 16 11:47:36 2010 -0400
1158.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/BeansDesignProperty.java Fri Jul 16 14:21:50 2010 -0400
1158.3 @@ -1,7 +1,10 @@
1158.4 /*
1158.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1158.6 *
1158.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1158.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1158.9 + *
1158.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1158.11 + * Other names may be trademarks of their respective owners.
1158.12 *
1158.13 * The contents of this file are subject to the terms of either the GNU
1158.14 * General Public License Version 2 only ("GPL") or the Common
1158.15 @@ -13,9 +16,9 @@
1158.16 * specific language governing permissions and limitations under the
1158.17 * License. When distributing the software, include this License Header
1158.18 * Notice in each file and include the License file at
1158.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1158.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1158.21 * particular file as subject to the "Classpath" exception as provided
1158.22 - * by Sun in the GPL Version 2 section of the License file that
1158.23 + * by Oracle in the GPL Version 2 section of the License file that
1158.24 * accompanied this code. If applicable, add the following below the
1158.25 * License Header, with the fields enclosed by brackets [] replaced by
1158.26 * your own identifying information:
1159.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1159.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1159.3 @@ -1,7 +1,10 @@
1159.4 #
1159.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1159.6 #
1159.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1159.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1159.9 +#
1159.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1159.11 +# Other names may be trademarks of their respective owners.
1159.12 #
1159.13 # The contents of this file are subject to the terms of either the GNU
1159.14 # General Public License Version 2 only ("GPL") or the Common
1159.15 @@ -13,9 +16,9 @@
1159.16 # specific language governing permissions and limitations under the
1159.17 # License. When distributing the software, include this License Header
1159.18 # Notice in each file and include the License file at
1159.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1159.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1159.21 # particular file as subject to the "Classpath" exception as provided
1159.22 -# by Sun in the GPL Version 2 section of the License file that
1159.23 +# by Oracle in the GPL Version 2 section of the License file that
1159.24 # accompanied this code. If applicable, add the following below the
1159.25 # License Header, with the fields enclosed by brackets [] replaced by
1159.26 # your own identifying information:
1160.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/ContextMethodHelper.java Fri Jul 16 11:47:36 2010 -0400
1160.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/ContextMethodHelper.java Fri Jul 16 14:21:50 2010 -0400
1160.3 @@ -1,7 +1,10 @@
1160.4 /*
1160.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1160.6 *
1160.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1160.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1160.9 + *
1160.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1160.11 + * Other names may be trademarks of their respective owners.
1160.12 *
1160.13 * The contents of this file are subject to the terms of either the GNU
1160.14 * General Public License Version 2 only ("GPL") or the Common
1160.15 @@ -13,9 +16,9 @@
1160.16 * specific language governing permissions and limitations under the
1160.17 * License. When distributing the software, include this License Header
1160.18 * Notice in each file and include the License file at
1160.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1160.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1160.21 * particular file as subject to the "Classpath" exception as provided
1160.22 - * by Sun in the GPL Version 2 section of the License file that
1160.23 + * by Oracle in the GPL Version 2 section of the License file that
1160.24 * accompanied this code. If applicable, add the following below the
1160.25 * License Header, with the fields enclosed by brackets [] replaced by
1160.26 * your own identifying information:
1161.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/CustomizeAction.java Fri Jul 16 11:47:36 2010 -0400
1161.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/CustomizeAction.java Fri Jul 16 14:21:50 2010 -0400
1161.3 @@ -1,7 +1,10 @@
1161.4 /*
1161.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1161.6 *
1161.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1161.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1161.9 + *
1161.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1161.11 + * Other names may be trademarks of their respective owners.
1161.12 *
1161.13 * The contents of this file are subject to the terms of either the GNU
1161.14 * General Public License Version 2 only ("GPL") or the Common
1161.15 @@ -13,9 +16,9 @@
1161.16 * specific language governing permissions and limitations under the
1161.17 * License. When distributing the software, include this License Header
1161.18 * Notice in each file and include the License file at
1161.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1161.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1161.21 * particular file as subject to the "Classpath" exception as provided
1161.22 - * by Sun in the GPL Version 2 section of the License file that
1161.23 + * by Oracle in the GPL Version 2 section of the License file that
1161.24 * accompanied this code. If applicable, add the following below the
1161.25 * License Header, with the fields enclosed by brackets [] replaced by
1161.26 * your own identifying information:
1162.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/DesignBeanNode.java Fri Jul 16 11:47:36 2010 -0400
1162.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/DesignBeanNode.java Fri Jul 16 14:21:50 2010 -0400
1162.3 @@ -1,7 +1,10 @@
1162.4 /*
1162.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1162.6 *
1162.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1162.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1162.9 + *
1162.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1162.11 + * Other names may be trademarks of their respective owners.
1162.12 *
1162.13 * The contents of this file are subject to the terms of either the GNU
1162.14 * General Public License Version 2 only ("GPL") or the Common
1162.15 @@ -13,9 +16,9 @@
1162.16 * specific language governing permissions and limitations under the
1162.17 * License. When distributing the software, include this License Header
1162.18 * Notice in each file and include the License file at
1162.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1162.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1162.21 * particular file as subject to the "Classpath" exception as provided
1162.22 - * by Sun in the GPL Version 2 section of the License file that
1162.23 + * by Oracle in the GPL Version 2 section of the License file that
1162.24 * accompanied this code. If applicable, add the following below the
1162.25 * License Header, with the fields enclosed by brackets [] replaced by
1162.26 * your own identifying information:
1163.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/DesignBeanNodeHelper.java Fri Jul 16 11:47:36 2010 -0400
1163.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/DesignBeanNodeHelper.java Fri Jul 16 14:21:50 2010 -0400
1163.3 @@ -1,7 +1,10 @@
1163.4 /*
1163.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1163.6 *
1163.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1163.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1163.9 + *
1163.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1163.11 + * Other names may be trademarks of their respective owners.
1163.12 *
1163.13 * The contents of this file are subject to the terms of either the GNU
1163.14 * General Public License Version 2 only ("GPL") or the Common
1163.15 @@ -13,9 +16,9 @@
1163.16 * specific language governing permissions and limitations under the
1163.17 * License. When distributing the software, include this License Header
1163.18 * Notice in each file and include the License file at
1163.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1163.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1163.21 * particular file as subject to the "Classpath" exception as provided
1163.22 - * by Sun in the GPL Version 2 section of the License file that
1163.23 + * by Oracle in the GPL Version 2 section of the License file that
1163.24 * accompanied this code. If applicable, add the following below the
1163.25 * License Header, with the fields enclosed by brackets [] replaced by
1163.26 * your own identifying information:
1164.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/DesignBeanNodeLookup.java Fri Jul 16 11:47:36 2010 -0400
1164.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/DesignBeanNodeLookup.java Fri Jul 16 14:21:50 2010 -0400
1164.3 @@ -1,7 +1,10 @@
1164.4 /*
1164.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1164.6 *
1164.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1164.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1164.9 + *
1164.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1164.11 + * Other names may be trademarks of their respective owners.
1164.12 *
1164.13 * The contents of this file are subject to the terms of either the GNU
1164.14 * General Public License Version 2 only ("GPL") or the Common
1164.15 @@ -13,9 +16,9 @@
1164.16 * specific language governing permissions and limitations under the
1164.17 * License. When distributing the software, include this License Header
1164.18 * Notice in each file and include the License file at
1164.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1164.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1164.21 * particular file as subject to the "Classpath" exception as provided
1164.22 - * by Sun in the GPL Version 2 section of the License file that
1164.23 + * by Oracle in the GPL Version 2 section of the License file that
1164.24 * accompanied this code. If applicable, add the following below the
1164.25 * License Header, with the fields enclosed by brackets [] replaced by
1164.26 * your own identifying information:
1165.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/DesigntimeIdeBridgeImpl.java Fri Jul 16 11:47:36 2010 -0400
1165.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/DesigntimeIdeBridgeImpl.java Fri Jul 16 14:21:50 2010 -0400
1165.3 @@ -1,7 +1,10 @@
1165.4 /*
1165.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1165.6 *
1165.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1165.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1165.9 + *
1165.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1165.11 + * Other names may be trademarks of their respective owners.
1165.12 *
1165.13 * The contents of this file are subject to the terms of either the GNU
1165.14 * General Public License Version 2 only ("GPL") or the Common
1165.15 @@ -13,9 +16,9 @@
1165.16 * specific language governing permissions and limitations under the
1165.17 * License. When distributing the software, include this License Header
1165.18 * Notice in each file and include the License file at
1165.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1165.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1165.21 * particular file as subject to the "Classpath" exception as provided
1165.22 - * by Sun in the GPL Version 2 section of the License file that
1165.23 + * by Oracle in the GPL Version 2 section of the License file that
1165.24 * accompanied this code. If applicable, add the following below the
1165.25 * License Header, with the fields enclosed by brackets [] replaced by
1165.26 * your own identifying information:
1166.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/EventEditPanel.java Fri Jul 16 11:47:36 2010 -0400
1166.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/EventEditPanel.java Fri Jul 16 14:21:50 2010 -0400
1166.3 @@ -1,7 +1,10 @@
1166.4 /*
1166.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1166.6 *
1166.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1166.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1166.9 + *
1166.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1166.11 + * Other names may be trademarks of their respective owners.
1166.12 *
1166.13 * The contents of this file are subject to the terms of either the GNU
1166.14 * General Public License Version 2 only ("GPL") or the Common
1166.15 @@ -13,9 +16,9 @@
1166.16 * specific language governing permissions and limitations under the
1166.17 * License. When distributing the software, include this License Header
1166.18 * Notice in each file and include the License file at
1166.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1166.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1166.21 * particular file as subject to the "Classpath" exception as provided
1166.22 - * by Sun in the GPL Version 2 section of the License file that
1166.23 + * by Oracle in the GPL Version 2 section of the License file that
1166.24 * accompanied this code. If applicable, add the following below the
1166.25 * License Header, with the fields enclosed by brackets [] replaced by
1166.26 * your own identifying information:
1167.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/EventPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1167.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/EventPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1167.3 @@ -1,7 +1,10 @@
1167.4 /*
1167.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1167.6 *
1167.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1167.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1167.9 + *
1167.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1167.11 + * Other names may be trademarks of their respective owners.
1167.12 *
1167.13 * The contents of this file are subject to the terms of either the GNU
1167.14 * General Public License Version 2 only ("GPL") or the Common
1167.15 @@ -13,9 +16,9 @@
1167.16 * specific language governing permissions and limitations under the
1167.17 * License. When distributing the software, include this License Header
1167.18 * Notice in each file and include the License file at
1167.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1167.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1167.21 * particular file as subject to the "Classpath" exception as provided
1167.22 - * by Sun in the GPL Version 2 section of the License file that
1167.23 + * by Oracle in the GPL Version 2 section of the License file that
1167.24 * accompanied this code. If applicable, add the following below the
1167.25 * License Header, with the fields enclosed by brackets [] replaced by
1167.26 * your own identifying information:
1168.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/FacesDesignBean.java Fri Jul 16 11:47:36 2010 -0400
1168.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/FacesDesignBean.java Fri Jul 16 14:21:50 2010 -0400
1168.3 @@ -1,7 +1,10 @@
1168.4 /*
1168.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1168.6 *
1168.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1168.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1168.9 + *
1168.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1168.11 + * Other names may be trademarks of their respective owners.
1168.12 *
1168.13 * The contents of this file are subject to the terms of either the GNU
1168.14 * General Public License Version 2 only ("GPL") or the Common
1168.15 @@ -13,9 +16,9 @@
1168.16 * specific language governing permissions and limitations under the
1168.17 * License. When distributing the software, include this License Header
1168.18 * Notice in each file and include the License file at
1168.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1168.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1168.21 * particular file as subject to the "Classpath" exception as provided
1168.22 - * by Sun in the GPL Version 2 section of the License file that
1168.23 + * by Oracle in the GPL Version 2 section of the License file that
1168.24 * accompanied this code. If applicable, add the following below the
1168.25 * License Header, with the fields enclosed by brackets [] replaced by
1168.26 * your own identifying information:
1169.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/FacesDesignEvent.java Fri Jul 16 11:47:36 2010 -0400
1169.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/FacesDesignEvent.java Fri Jul 16 14:21:50 2010 -0400
1169.3 @@ -1,7 +1,10 @@
1169.4 /*
1169.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1169.6 *
1169.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1169.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1169.9 + *
1169.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1169.11 + * Other names may be trademarks of their respective owners.
1169.12 *
1169.13 * The contents of this file are subject to the terms of either the GNU
1169.14 * General Public License Version 2 only ("GPL") or the Common
1169.15 @@ -13,9 +16,9 @@
1169.16 * specific language governing permissions and limitations under the
1169.17 * License. When distributing the software, include this License Header
1169.18 * Notice in each file and include the License file at
1169.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1169.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1169.21 * particular file as subject to the "Classpath" exception as provided
1169.22 - * by Sun in the GPL Version 2 section of the License file that
1169.23 + * by Oracle in the GPL Version 2 section of the License file that
1169.24 * accompanied this code. If applicable, add the following below the
1169.25 * License Header, with the fields enclosed by brackets [] replaced by
1169.26 * your own identifying information:
1170.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/FacesDesignProperty.java Fri Jul 16 11:47:36 2010 -0400
1170.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/FacesDesignProperty.java Fri Jul 16 14:21:50 2010 -0400
1170.3 @@ -1,7 +1,10 @@
1170.4 /*
1170.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1170.6 *
1170.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1170.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1170.9 + *
1170.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1170.11 + * Other names may be trademarks of their respective owners.
1170.12 *
1170.13 * The contents of this file are subject to the terms of either the GNU
1170.14 * General Public License Version 2 only ("GPL") or the Common
1170.15 @@ -13,9 +16,9 @@
1170.16 * specific language governing permissions and limitations under the
1170.17 * License. When distributing the software, include this License Header
1170.18 * Notice in each file and include the License file at
1170.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1170.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1170.21 * particular file as subject to the "Classpath" exception as provided
1170.22 - * by Sun in the GPL Version 2 section of the License file that
1170.23 + * by Oracle in the GPL Version 2 section of the License file that
1170.24 * accompanied this code. If applicable, add the following below the
1170.25 * License Header, with the fields enclosed by brackets [] replaced by
1170.26 * your own identifying information:
1171.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/FacetTreeNode.java Fri Jul 16 11:47:36 2010 -0400
1171.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/FacetTreeNode.java Fri Jul 16 14:21:50 2010 -0400
1171.3 @@ -1,7 +1,10 @@
1171.4 /*
1171.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1171.6 *
1171.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1171.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1171.9 + *
1171.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1171.11 + * Other names may be trademarks of their respective owners.
1171.12 *
1171.13 * The contents of this file are subject to the terms of either the GNU
1171.14 * General Public License Version 2 only ("GPL") or the Common
1171.15 @@ -13,9 +16,9 @@
1171.16 * specific language governing permissions and limitations under the
1171.17 * License. When distributing the software, include this License Header
1171.18 * Notice in each file and include the License file at
1171.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1171.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1171.21 * particular file as subject to the "Classpath" exception as provided
1171.22 - * by Sun in the GPL Version 2 section of the License file that
1171.23 + * by Oracle in the GPL Version 2 section of the License file that
1171.24 * accompanied this code. If applicable, add the following below the
1171.25 * License Header, with the fields enclosed by brackets [] replaced by
1171.26 * your own identifying information:
1172.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/LiveUnit.java Fri Jul 16 11:47:36 2010 -0400
1172.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/LiveUnit.java Fri Jul 16 14:21:50 2010 -0400
1172.3 @@ -1,7 +1,10 @@
1172.4 /*
1172.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1172.6 *
1172.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1172.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1172.9 + *
1172.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1172.11 + * Other names may be trademarks of their respective owners.
1172.12 *
1172.13 * The contents of this file are subject to the terms of either the GNU
1172.14 * General Public License Version 2 only ("GPL") or the Common
1172.15 @@ -13,9 +16,9 @@
1172.16 * specific language governing permissions and limitations under the
1172.17 * License. When distributing the software, include this License Header
1172.18 * Notice in each file and include the License file at
1172.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1172.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1172.21 * particular file as subject to the "Classpath" exception as provided
1172.22 - * by Sun in the GPL Version 2 section of the License file that
1172.23 + * by Oracle in the GPL Version 2 section of the License file that
1172.24 * accompanied this code. If applicable, add the following below the
1172.25 * License Header, with the fields enclosed by brackets [] replaced by
1172.26 * your own identifying information:
1173.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/LiveUnitWrapper.java Fri Jul 16 11:47:36 2010 -0400
1173.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/LiveUnitWrapper.java Fri Jul 16 14:21:50 2010 -0400
1173.3 @@ -1,7 +1,10 @@
1173.4 /*
1173.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1173.6 *
1173.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1173.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1173.9 + *
1173.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1173.11 + * Other names may be trademarks of their respective owners.
1173.12 *
1173.13 * The contents of this file are subject to the terms of either the GNU
1173.14 * General Public License Version 2 only ("GPL") or the Common
1173.15 @@ -13,9 +16,9 @@
1173.16 * specific language governing permissions and limitations under the
1173.17 * License. When distributing the software, include this License Header
1173.18 * Notice in each file and include the License file at
1173.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1173.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1173.21 * particular file as subject to the "Classpath" exception as provided
1173.22 - * by Sun in the GPL Version 2 section of the License file that
1173.23 + * by Oracle in the GPL Version 2 section of the License file that
1173.24 * accompanied this code. If applicable, add the following below the
1173.25 * License Header, with the fields enclosed by brackets [] replaced by
1173.26 * your own identifying information:
1174.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/MarkupDesignBean.java Fri Jul 16 11:47:36 2010 -0400
1174.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/MarkupDesignBean.java Fri Jul 16 14:21:50 2010 -0400
1174.3 @@ -1,7 +1,10 @@
1174.4 /*
1174.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1174.6 *
1174.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1174.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1174.9 + *
1174.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1174.11 + * Other names may be trademarks of their respective owners.
1174.12 *
1174.13 * The contents of this file are subject to the terms of either the GNU
1174.14 * General Public License Version 2 only ("GPL") or the Common
1174.15 @@ -13,9 +16,9 @@
1174.16 * specific language governing permissions and limitations under the
1174.17 * License. When distributing the software, include this License Header
1174.18 * Notice in each file and include the License file at
1174.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1174.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1174.21 * particular file as subject to the "Classpath" exception as provided
1174.22 - * by Sun in the GPL Version 2 section of the License file that
1174.23 + * by Oracle in the GPL Version 2 section of the License file that
1174.24 * accompanied this code. If applicable, add the following below the
1174.25 * License Header, with the fields enclosed by brackets [] replaced by
1174.26 * your own identifying information:
1175.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/MethodBindDesignEvent.java Fri Jul 16 11:47:36 2010 -0400
1175.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/MethodBindDesignEvent.java Fri Jul 16 14:21:50 2010 -0400
1175.3 @@ -1,7 +1,10 @@
1175.4 /*
1175.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1175.6 *
1175.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1175.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1175.9 + *
1175.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1175.11 + * Other names may be trademarks of their respective owners.
1175.12 *
1175.13 * The contents of this file are subject to the terms of either the GNU
1175.14 * General Public License Version 2 only ("GPL") or the Common
1175.15 @@ -13,9 +16,9 @@
1175.16 * specific language governing permissions and limitations under the
1175.17 * License. When distributing the software, include this License Header
1175.18 * Notice in each file and include the License file at
1175.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1175.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1175.21 * particular file as subject to the "Classpath" exception as provided
1175.22 - * by Sun in the GPL Version 2 section of the License file that
1175.23 + * by Oracle in the GPL Version 2 section of the License file that
1175.24 * accompanied this code. If applicable, add the following below the
1175.25 * License Header, with the fields enclosed by brackets [] replaced by
1175.26 * your own identifying information:
1176.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/MethodBindDesignProperty.java Fri Jul 16 11:47:36 2010 -0400
1176.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/MethodBindDesignProperty.java Fri Jul 16 14:21:50 2010 -0400
1176.3 @@ -1,7 +1,10 @@
1176.4 /*
1176.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1176.6 *
1176.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1176.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1176.9 + *
1176.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1176.11 + * Other names may be trademarks of their respective owners.
1176.12 *
1176.13 * The contents of this file are subject to the terms of either the GNU
1176.14 * General Public License Version 2 only ("GPL") or the Common
1176.15 @@ -13,9 +16,9 @@
1176.16 * specific language governing permissions and limitations under the
1176.17 * License. When distributing the software, include this License Header
1176.18 * Notice in each file and include the License file at
1176.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1176.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1176.21 * particular file as subject to the "Classpath" exception as provided
1176.22 - * by Sun in the GPL Version 2 section of the License file that
1176.23 + * by Oracle in the GPL Version 2 section of the License file that
1176.24 * accompanied this code. If applicable, add the following below the
1176.25 * License Header, with the fields enclosed by brackets [] replaced by
1176.26 * your own identifying information:
1177.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/SourceDesignBean.java Fri Jul 16 11:47:36 2010 -0400
1177.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/SourceDesignBean.java Fri Jul 16 14:21:50 2010 -0400
1177.3 @@ -1,7 +1,10 @@
1177.4 /*
1177.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1177.6 *
1177.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1177.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1177.9 + *
1177.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1177.11 + * Other names may be trademarks of their respective owners.
1177.12 *
1177.13 * The contents of this file are subject to the terms of either the GNU
1177.14 * General Public License Version 2 only ("GPL") or the Common
1177.15 @@ -13,9 +16,9 @@
1177.16 * specific language governing permissions and limitations under the
1177.17 * License. When distributing the software, include this License Header
1177.18 * Notice in each file and include the License file at
1177.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1177.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1177.21 * particular file as subject to the "Classpath" exception as provided
1177.22 - * by Sun in the GPL Version 2 section of the License file that
1177.23 + * by Oracle in the GPL Version 2 section of the License file that
1177.24 * accompanied this code. If applicable, add the following below the
1177.25 * License Header, with the fields enclosed by brackets [] replaced by
1177.26 * your own identifying information:
1178.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/SourceDesignEvent.java Fri Jul 16 11:47:36 2010 -0400
1178.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/SourceDesignEvent.java Fri Jul 16 14:21:50 2010 -0400
1178.3 @@ -1,7 +1,10 @@
1178.4 /*
1178.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1178.6 *
1178.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1178.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1178.9 + *
1178.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1178.11 + * Other names may be trademarks of their respective owners.
1178.12 *
1178.13 * The contents of this file are subject to the terms of either the GNU
1178.14 * General Public License Version 2 only ("GPL") or the Common
1178.15 @@ -13,9 +16,9 @@
1178.16 * specific language governing permissions and limitations under the
1178.17 * License. When distributing the software, include this License Header
1178.18 * Notice in each file and include the License file at
1178.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1178.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1178.21 * particular file as subject to the "Classpath" exception as provided
1178.22 - * by Sun in the GPL Version 2 section of the License file that
1178.23 + * by Oracle in the GPL Version 2 section of the License file that
1178.24 * accompanied this code. If applicable, add the following below the
1178.25 * License Header, with the fields enclosed by brackets [] replaced by
1178.26 * your own identifying information:
1179.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/SourceDesignProperty.java Fri Jul 16 11:47:36 2010 -0400
1179.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/SourceDesignProperty.java Fri Jul 16 14:21:50 2010 -0400
1179.3 @@ -1,7 +1,10 @@
1179.4 /*
1179.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1179.6 *
1179.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1179.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1179.9 + *
1179.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1179.11 + * Other names may be trademarks of their respective owners.
1179.12 *
1179.13 * The contents of this file are subject to the terms of either the GNU
1179.14 * General Public License Version 2 only ("GPL") or the Common
1179.15 @@ -13,9 +16,9 @@
1179.16 * specific language governing permissions and limitations under the
1179.17 * License. When distributing the software, include this License Header
1179.18 * Notice in each file and include the License file at
1179.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1179.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1179.21 * particular file as subject to the "Classpath" exception as provided
1179.22 - * by Sun in the GPL Version 2 section of the License file that
1179.23 + * by Oracle in the GPL Version 2 section of the License file that
1179.24 * accompanied this code. If applicable, add the following below the
1179.25 * License Header, with the fields enclosed by brackets [] replaced by
1179.26 * your own identifying information:
1180.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/SourceLiveRoot.java Fri Jul 16 11:47:36 2010 -0400
1180.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/live/SourceLiveRoot.java Fri Jul 16 14:21:50 2010 -0400
1180.3 @@ -1,7 +1,10 @@
1180.4 /*
1180.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1180.6 *
1180.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1180.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1180.9 + *
1180.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1180.11 + * Other names may be trademarks of their respective owners.
1180.12 *
1180.13 * The contents of this file are subject to the terms of either the GNU
1180.14 * General Public License Version 2 only ("GPL") or the Common
1180.15 @@ -13,9 +16,9 @@
1180.16 * specific language governing permissions and limitations under the
1180.17 * License. When distributing the software, include this License Header
1180.18 * Notice in each file and include the License file at
1180.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1180.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1180.21 * particular file as subject to the "Classpath" exception as provided
1180.22 - * by Sun in the GPL Version 2 section of the License file that
1180.23 + * by Oracle in the GPL Version 2 section of the License file that
1180.24 * accompanied this code. If applicable, add the following below the
1180.25 * License Header, with the fields enclosed by brackets [] replaced by
1180.26 * your own identifying information:
1181.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1181.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1181.3 @@ -1,6 +1,9 @@
1181.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1181.5 #
1181.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1181.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1181.8 +#
1181.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1181.10 +# Other names may be trademarks of their respective owners.
1181.11 #
1181.12 # The contents of this file are subject to the terms of either the GNU
1181.13 # General Public License Version 2 only ("GPL") or the Common
1181.14 @@ -12,9 +15,9 @@
1181.15 # specific language governing permissions and limitations under the
1181.16 # License. When distributing the software, include this License Header
1181.17 # Notice in each file and include the License file at
1181.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1181.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1181.20 # particular file as subject to the "Classpath" exception as provided
1181.21 -# by Sun in the GPL Version 2 section of the License file that
1181.22 +# by Oracle in the GPL Version 2 section of the License file that
1181.23 # accompanied this code. If applicable, add the following below the
1181.24 # License Header, with the fields enclosed by brackets [] replaced by
1181.25 # your own identifying information:
1182.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup/JspxSerializer.java Fri Jul 16 11:47:36 2010 -0400
1182.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup/JspxSerializer.java Fri Jul 16 14:21:50 2010 -0400
1182.3 @@ -1,7 +1,10 @@
1182.4 /*
1182.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1182.6 *
1182.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1182.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1182.9 + *
1182.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1182.11 + * Other names may be trademarks of their respective owners.
1182.12 *
1182.13 * The contents of this file are subject to the terms of either the GNU
1182.14 * General Public License Version 2 only ("GPL") or the Common
1182.15 @@ -13,9 +16,9 @@
1182.16 * specific language governing permissions and limitations under the
1182.17 * License. When distributing the software, include this License Header
1182.18 * Notice in each file and include the License file at
1182.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1182.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1182.21 * particular file as subject to the "Classpath" exception as provided
1182.22 - * by Sun in the GPL Version 2 section of the License file that
1182.23 + * by Oracle in the GPL Version 2 section of the License file that
1182.24 * accompanied this code. If applicable, add the following below the
1182.25 * License Header, with the fields enclosed by brackets [] replaced by
1182.26 * your own identifying information:
1183.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup/MarkupUnit.java Fri Jul 16 11:47:36 2010 -0400
1183.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup/MarkupUnit.java Fri Jul 16 14:21:50 2010 -0400
1183.3 @@ -1,7 +1,10 @@
1183.4 /*
1183.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1183.6 *
1183.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1183.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1183.9 + *
1183.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1183.11 + * Other names may be trademarks of their respective owners.
1183.12 *
1183.13 * The contents of this file are subject to the terms of either the GNU
1183.14 * General Public License Version 2 only ("GPL") or the Common
1183.15 @@ -13,9 +16,9 @@
1183.16 * specific language governing permissions and limitations under the
1183.17 * License. When distributing the software, include this License Header
1183.18 * Notice in each file and include the License file at
1183.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1183.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1183.21 * particular file as subject to the "Classpath" exception as provided
1183.22 - * by Sun in the GPL Version 2 section of the License file that
1183.23 + * by Oracle in the GPL Version 2 section of the License file that
1183.24 * accompanied this code. If applicable, add the following below the
1183.25 * License Header, with the fields enclosed by brackets [] replaced by
1183.26 * your own identifying information:
1184.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup/MarkupVisitor.java Fri Jul 16 11:47:36 2010 -0400
1184.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/markup/MarkupVisitor.java Fri Jul 16 14:21:50 2010 -0400
1184.3 @@ -1,7 +1,10 @@
1184.4 /*
1184.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1184.6 *
1184.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1184.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1184.9 + *
1184.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1184.11 + * Other names may be trademarks of their respective owners.
1184.12 *
1184.13 * The contents of this file are subject to the terms of either the GNU
1184.14 * General Public License Version 2 only ("GPL") or the Common
1184.15 @@ -13,9 +16,9 @@
1184.16 * specific language governing permissions and limitations under the
1184.17 * License. When distributing the software, include this License Header
1184.18 * Notice in each file and include the License file at
1184.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1184.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1184.21 * particular file as subject to the "Classpath" exception as provided
1184.22 - * by Sun in the GPL Version 2 section of the License file that
1184.23 + * by Oracle in the GPL Version 2 section of the License file that
1184.24 * accompanied this code. If applicable, add the following below the
1184.25 * License Header, with the fields enclosed by brackets [] replaced by
1184.26 * your own identifying information:
1185.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/mf-layer.xml Fri Jul 16 11:47:36 2010 -0400
1185.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/mf-layer.xml Fri Jul 16 14:21:50 2010 -0400
1185.3 @@ -2,7 +2,10 @@
1185.4 <!--
1185.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1185.6
1185.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1185.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1185.9 +
1185.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1185.11 +Other names may be trademarks of their respective owners.
1185.12
1185.13
1185.14 The contents of this file are subject to the terms of either the GNU
1185.15 @@ -15,9 +18,9 @@
1185.16 specific language governing permissions and limitations under the
1185.17 License. When distributing the software, include this License Header
1185.18 Notice in each file and include the License file at
1185.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1185.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1185.21 particular file as subject to the "Classpath" exception as provided
1185.22 -by Sun in the GPL Version 2 section of the License file that
1185.23 +by Oracle in the GPL Version 2 section of the License file that
1185.24 accompanied this code. If applicable, add the following below the
1185.25 License Header, with the fields enclosed by brackets [] replaced by
1185.26 your own identifying information:
1186.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1186.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1186.3 @@ -1,6 +1,9 @@
1186.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1186.5 #
1186.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1186.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1186.8 +#
1186.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1186.10 +# Other names may be trademarks of their respective owners.
1186.11 #
1186.12 # The contents of this file are subject to the terms of either the GNU
1186.13 # General Public License Version 2 only ("GPL") or the Common
1186.14 @@ -12,9 +15,9 @@
1186.15 # specific language governing permissions and limitations under the
1186.16 # License. When distributing the software, include this License Header
1186.17 # Notice in each file and include the License file at
1186.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1186.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1186.20 # particular file as subject to the "Classpath" exception as provided
1186.21 -# by Sun in the GPL Version 2 section of the License file that
1186.22 +# by Oracle in the GPL Version 2 section of the License file that
1186.23 # accompanied this code. If applicable, add the following below the
1186.24 # License Header, with the fields enclosed by brackets [] replaced by
1186.25 # your own identifying information:
1187.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesConfigModel.java Fri Jul 16 11:47:36 2010 -0400
1187.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesConfigModel.java Fri Jul 16 14:21:50 2010 -0400
1187.3 @@ -1,7 +1,10 @@
1187.4 /*
1187.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1187.6 *
1187.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1187.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1187.9 + *
1187.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1187.11 + * Other names may be trademarks of their respective owners.
1187.12 *
1187.13 * The contents of this file are subject to the terms of either the GNU
1187.14 * General Public License Version 2 only ("GPL") or the Common
1187.15 @@ -13,9 +16,9 @@
1187.16 * specific language governing permissions and limitations under the
1187.17 * License. When distributing the software, include this License Header
1187.18 * Notice in each file and include the License file at
1187.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1187.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1187.21 * particular file as subject to the "Classpath" exception as provided
1187.22 - * by Sun in the GPL Version 2 section of the License file that
1187.23 + * by Oracle in the GPL Version 2 section of the License file that
1187.24 * accompanied this code. If applicable, add the following below the
1187.25 * License Header, with the fields enclosed by brackets [] replaced by
1187.26 * your own identifying information:
1188.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesModel.java Fri Jul 16 11:47:36 2010 -0400
1188.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesModel.java Fri Jul 16 14:21:50 2010 -0400
1188.3 @@ -1,7 +1,10 @@
1188.4 /*
1188.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1188.6 *
1188.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1188.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1188.9 + *
1188.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1188.11 + * Other names may be trademarks of their respective owners.
1188.12 *
1188.13 * The contents of this file are subject to the terms of either the GNU
1188.14 * General Public License Version 2 only ("GPL") or the Common
1188.15 @@ -13,9 +16,9 @@
1188.16 * specific language governing permissions and limitations under the
1188.17 * License. When distributing the software, include this License Header
1188.18 * Notice in each file and include the License file at
1188.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1188.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1188.21 * particular file as subject to the "Classpath" exception as provided
1188.22 - * by Sun in the GPL Version 2 section of the License file that
1188.23 + * by Oracle in the GPL Version 2 section of the License file that
1188.24 * accompanied this code. If applicable, add the following below the
1188.25 * License Header, with the fields enclosed by brackets [] replaced by
1188.26 * your own identifying information:
1189.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesModelSet.java Fri Jul 16 11:47:36 2010 -0400
1189.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesModelSet.java Fri Jul 16 14:21:50 2010 -0400
1189.3 @@ -1,7 +1,10 @@
1189.4 /*
1189.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1189.6 *
1189.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1189.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1189.9 + *
1189.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1189.11 + * Other names may be trademarks of their respective owners.
1189.12 *
1189.13 * The contents of this file are subject to the terms of either the GNU
1189.14 * General Public License Version 2 only ("GPL") or the Common
1189.15 @@ -13,9 +16,9 @@
1189.16 * specific language governing permissions and limitations under the
1189.17 * License. When distributing the software, include this License Header
1189.18 * Notice in each file and include the License file at
1189.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1189.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1189.21 * particular file as subject to the "Classpath" exception as provided
1189.22 - * by Sun in the GPL Version 2 section of the License file that
1189.23 + * by Oracle in the GPL Version 2 section of the License file that
1189.24 * accompanied this code. If applicable, add the following below the
1189.25 * License Header, with the fields enclosed by brackets [] replaced by
1189.26 * your own identifying information:
1190.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/ProjectBuiltQuery.java Fri Jul 16 11:47:36 2010 -0400
1190.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/ProjectBuiltQuery.java Fri Jul 16 14:21:50 2010 -0400
1190.3 @@ -1,7 +1,10 @@
1190.4 /*
1190.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1190.6 *
1190.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1190.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1190.9 + *
1190.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1190.11 + * Other names may be trademarks of their respective owners.
1190.12 *
1190.13 * The contents of this file are subject to the terms of either the GNU
1190.14 * General Public License Version 2 only ("GPL") or the Common
1190.15 @@ -13,9 +16,9 @@
1190.16 * specific language governing permissions and limitations under the
1190.17 * License. When distributing the software, include this License Header
1190.18 * Notice in each file and include the License file at
1190.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1190.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1190.21 * particular file as subject to the "Classpath" exception as provided
1190.22 - * by Sun in the GPL Version 2 section of the License file that
1190.23 + * by Oracle in the GPL Version 2 section of the License file that
1190.24 * accompanied this code. If applicable, add the following below the
1190.25 * License Header, with the fields enclosed by brackets [] replaced by
1190.26 * your own identifying information:
1191.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/parser_annotation.xml Fri Jul 16 11:47:36 2010 -0400
1191.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/parser_annotation.xml Fri Jul 16 14:21:50 2010 -0400
1191.3 @@ -2,7 +2,10 @@
1191.4 <!--
1191.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1191.6
1191.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1191.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1191.9 +
1191.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1191.11 +Other names may be trademarks of their respective owners.
1191.12
1191.13
1191.14 The contents of this file are subject to the terms of either the GNU
1191.15 @@ -15,9 +18,9 @@
1191.16 specific language governing permissions and limitations under the
1191.17 License. When distributing the software, include this License Header
1191.18 Notice in each file and include the License file at
1191.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1191.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1191.21 particular file as subject to the "Classpath" exception as provided
1191.22 -by Sun in the GPL Version 2 section of the License file that
1191.23 +by Oracle in the GPL Version 2 section of the License file that
1191.24 accompanied this code. If applicable, add the following below the
1191.25 License Header, with the fields enclosed by brackets [] replaced by
1191.26 your own identifying information:
1192.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/InsyncMimeResolver.java Fri Jul 16 11:47:36 2010 -0400
1192.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/InsyncMimeResolver.java Fri Jul 16 14:21:50 2010 -0400
1192.3 @@ -1,7 +1,10 @@
1192.4 /*
1192.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1192.6 *
1192.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1192.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1192.9 + *
1192.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1192.11 + * Other names may be trademarks of their respective owners.
1192.12 *
1192.13 * The contents of this file are subject to the terms of either the GNU
1192.14 * General Public License Version 2 only ("GPL") or the Common
1192.15 @@ -13,9 +16,9 @@
1192.16 * specific language governing permissions and limitations under the
1192.17 * License. When distributing the software, include this License Header
1192.18 * Notice in each file and include the License file at
1192.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1192.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1192.21 * particular file as subject to the "Classpath" exception as provided
1192.22 - * by Sun in the GPL Version 2 section of the License file that
1192.23 + * by Oracle in the GPL Version 2 section of the License file that
1192.24 * accompanied this code. If applicable, add the following below the
1192.25 * License Header, with the fields enclosed by brackets [] replaced by
1192.26 * your own identifying information:
1193.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/InsyncTestBase.java Fri Jul 16 11:47:36 2010 -0400
1193.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/InsyncTestBase.java Fri Jul 16 14:21:50 2010 -0400
1193.3 @@ -1,8 +1,11 @@
1193.4 /*
1193.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1193.6 - *
1193.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1193.8 - *
1193.9 + *
1193.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1193.11 + *
1193.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1193.13 + * Other names may be trademarks of their respective owners.
1193.14 + *
1193.15 * The contents of this file are subject to the terms of either the GNU
1193.16 * General Public License Version 2 only ("GPL") or the Common
1193.17 * Development and Distribution License("CDDL") (collectively, the
1193.18 @@ -13,9 +16,9 @@
1193.19 * specific language governing permissions and limitations under the
1193.20 * License. When distributing the software, include this License Header
1193.21 * Notice in each file and include the License file at
1193.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1193.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1193.24 * particular file as subject to the "Classpath" exception as provided
1193.25 - * by Sun in the GPL Version 2 section of the License file that
1193.26 + * by Oracle in the GPL Version 2 section of the License file that
1193.27 * accompanied this code. If applicable, add the following below the
1193.28 * License Header, with the fields enclosed by brackets [] replaced by
1193.29 * your own identifying information:
1194.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/JSFConfigUtils.java Fri Jul 16 11:47:36 2010 -0400
1194.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/JSFConfigUtils.java Fri Jul 16 14:21:50 2010 -0400
1194.3 @@ -1,8 +1,11 @@
1194.4 /*
1194.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1194.6 - *
1194.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1194.8 - *
1194.9 + *
1194.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1194.11 + *
1194.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1194.13 + * Other names may be trademarks of their respective owners.
1194.14 + *
1194.15 * The contents of this file are subject to the terms of either the GNU
1194.16 * General Public License Version 2 only ("GPL") or the Common
1194.17 * Development and Distribution License("CDDL") (collectively, the
1194.18 @@ -13,9 +16,9 @@
1194.19 * specific language governing permissions and limitations under the
1194.20 * License. When distributing the software, include this License Header
1194.21 * Notice in each file and include the License file at
1194.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1194.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1194.24 * particular file as subject to the "Classpath" exception as provided
1194.25 - * by Sun in the GPL Version 2 section of the License file that
1194.26 + * by Oracle in the GPL Version 2 section of the License file that
1194.27 * accompanied this code. If applicable, add the following below the
1194.28 * License Header, with the fields enclosed by brackets [] replaced by
1194.29 * your own identifying information:
1195.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/ProjectUtils.java Fri Jul 16 11:47:36 2010 -0400
1195.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/ProjectUtils.java Fri Jul 16 14:21:50 2010 -0400
1195.3 @@ -1,8 +1,11 @@
1195.4 /*
1195.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1195.6 - *
1195.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1195.8 - *
1195.9 + *
1195.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1195.11 + *
1195.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1195.13 + * Other names may be trademarks of their respective owners.
1195.14 + *
1195.15 * The contents of this file are subject to the terms of either the GNU
1195.16 * General Public License Version 2 only ("GPL") or the Common
1195.17 * Development and Distribution License("CDDL") (collectively, the
1195.18 @@ -13,9 +16,9 @@
1195.19 * specific language governing permissions and limitations under the
1195.20 * License. When distributing the software, include this License Header
1195.21 * Notice in each file and include the License file at
1195.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1195.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1195.24 * particular file as subject to the "Classpath" exception as provided
1195.25 - * by Sun in the GPL Version 2 section of the License file that
1195.26 + * by Oracle in the GPL Version 2 section of the License file that
1195.27 * accompanied this code. If applicable, add the following below the
1195.28 * License Header, with the fields enclosed by brackets [] replaced by
1195.29 * your own identifying information:
1196.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/RepositoryImpl.java Fri Jul 16 11:47:36 2010 -0400
1196.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/RepositoryImpl.java Fri Jul 16 14:21:50 2010 -0400
1196.3 @@ -1,7 +1,10 @@
1196.4 /*
1196.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1196.6 *
1196.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1196.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1196.9 + *
1196.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1196.11 + * Other names may be trademarks of their respective owners.
1196.12 *
1196.13 * The contents of this file are subject to the terms of either the GNU
1196.14 * General Public License Version 2 only ("GPL") or the Common
1196.15 @@ -13,9 +16,9 @@
1196.16 * specific language governing permissions and limitations under the
1196.17 * License. When distributing the software, include this License Header
1196.18 * Notice in each file and include the License file at
1196.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1196.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1196.21 * particular file as subject to the "Classpath" exception as provided
1196.22 - * by Sun in the GPL Version 2 section of the License file that
1196.23 + * by Oracle in the GPL Version 2 section of the License file that
1196.24 * accompanied this code. If applicable, add the following below the
1196.25 * License Header, with the fields enclosed by brackets [] replaced by
1196.26 * your own identifying information:
1197.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/java/ExpressionUtilsTest.java Fri Jul 16 11:47:36 2010 -0400
1197.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/java/ExpressionUtilsTest.java Fri Jul 16 14:21:50 2010 -0400
1197.3 @@ -1,8 +1,11 @@
1197.4 /*
1197.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1197.6 - *
1197.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1197.8 - *
1197.9 + *
1197.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1197.11 + *
1197.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1197.13 + * Other names may be trademarks of their respective owners.
1197.14 + *
1197.15 * The contents of this file are subject to the terms of either the GNU
1197.16 * General Public License Version 2 only ("GPL") or the Common
1197.17 * Development and Distribution License("CDDL") (collectively, the
1197.18 @@ -13,9 +16,9 @@
1197.19 * specific language governing permissions and limitations under the
1197.20 * License. When distributing the software, include this License Header
1197.21 * Notice in each file and include the License file at
1197.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1197.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1197.24 * particular file as subject to the "Classpath" exception as provided
1197.25 - * by Sun in the GPL Version 2 section of the License file that
1197.26 + * by Oracle in the GPL Version 2 section of the License file that
1197.27 * accompanied this code. If applicable, add the following below the
1197.28 * License Header, with the fields enclosed by brackets [] replaced by
1197.29 * your own identifying information:
1198.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/java/JavaClassTest.java Fri Jul 16 11:47:36 2010 -0400
1198.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/java/JavaClassTest.java Fri Jul 16 14:21:50 2010 -0400
1198.3 @@ -1,8 +1,11 @@
1198.4 /*
1198.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1198.6 - *
1198.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1198.8 - *
1198.9 + *
1198.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1198.11 + *
1198.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1198.13 + * Other names may be trademarks of their respective owners.
1198.14 + *
1198.15 * The contents of this file are subject to the terms of either the GNU
1198.16 * General Public License Version 2 only ("GPL") or the Common
1198.17 * Development and Distribution License("CDDL") (collectively, the
1198.18 @@ -13,9 +16,9 @@
1198.19 * specific language governing permissions and limitations under the
1198.20 * License. When distributing the software, include this License Header
1198.21 * Notice in each file and include the License file at
1198.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1198.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1198.24 * particular file as subject to the "Classpath" exception as provided
1198.25 - * by Sun in the GPL Version 2 section of the License file that
1198.26 + * by Oracle in the GPL Version 2 section of the License file that
1198.27 * accompanied this code. If applicable, add the following below the
1198.28 * License Header, with the fields enclosed by brackets [] replaced by
1198.29 * your own identifying information:
1199.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/java/JavaUnitTest.java Fri Jul 16 11:47:36 2010 -0400
1199.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/java/JavaUnitTest.java Fri Jul 16 14:21:50 2010 -0400
1199.3 @@ -1,8 +1,11 @@
1199.4 /*
1199.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1199.6 - *
1199.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1199.8 - *
1199.9 + *
1199.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1199.11 + *
1199.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1199.13 + * Other names may be trademarks of their respective owners.
1199.14 + *
1199.15 * The contents of this file are subject to the terms of either the GNU
1199.16 * General Public License Version 2 only ("GPL") or the Common
1199.17 * Development and Distribution License("CDDL") (collectively, the
1199.18 @@ -13,9 +16,9 @@
1199.19 * specific language governing permissions and limitations under the
1199.20 * License. When distributing the software, include this License Header
1199.21 * Notice in each file and include the License file at
1199.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1199.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1199.24 * particular file as subject to the "Classpath" exception as provided
1199.25 - * by Sun in the GPL Version 2 section of the License file that
1199.26 + * by Oracle in the GPL Version 2 section of the License file that
1199.27 * accompanied this code. If applicable, add the following below the
1199.28 * License Header, with the fields enclosed by brackets [] replaced by
1199.29 * your own identifying information:
1200.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/java/MethodTest.java Fri Jul 16 11:47:36 2010 -0400
1200.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/java/MethodTest.java Fri Jul 16 14:21:50 2010 -0400
1200.3 @@ -1,8 +1,11 @@
1200.4 /*
1200.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1200.6 - *
1200.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1200.8 - *
1200.9 + *
1200.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1200.11 + *
1200.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1200.13 + * Other names may be trademarks of their respective owners.
1200.14 + *
1200.15 * The contents of this file are subject to the terms of either the GNU
1200.16 * General Public License Version 2 only ("GPL") or the Common
1200.17 * Development and Distribution License("CDDL") (collectively, the
1200.18 @@ -13,9 +16,9 @@
1200.19 * specific language governing permissions and limitations under the
1200.20 * License. When distributing the software, include this License Header
1200.21 * Notice in each file and include the License file at
1200.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1200.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1200.24 * particular file as subject to the "Classpath" exception as provided
1200.25 - * by Sun in the GPL Version 2 section of the License file that
1200.26 + * by Oracle in the GPL Version 2 section of the License file that
1200.27 * accompanied this code. If applicable, add the following below the
1200.28 * License Header, with the fields enclosed by brackets [] replaced by
1200.29 * your own identifying information:
1201.1 --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/models/FacesModelSetTest.java Fri Jul 16 11:47:36 2010 -0400
1201.2 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/models/FacesModelSetTest.java Fri Jul 16 14:21:50 2010 -0400
1201.3 @@ -1,8 +1,11 @@
1201.4 /*
1201.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1201.6 - *
1201.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1201.8 - *
1201.9 + *
1201.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1201.11 + *
1201.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1201.13 + * Other names may be trademarks of their respective owners.
1201.14 + *
1201.15 * The contents of this file are subject to the terms of either the GNU
1201.16 * General Public License Version 2 only ("GPL") or the Common
1201.17 * Development and Distribution License("CDDL") (collectively, the
1201.18 @@ -13,9 +16,9 @@
1201.19 * specific language governing permissions and limitations under the
1201.20 * License. When distributing the software, include this License Header
1201.21 * Notice in each file and include the License file at
1201.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1201.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1201.24 * particular file as subject to the "Classpath" exception as provided
1201.25 - * by Sun in the GPL Version 2 section of the License file that
1201.26 + * by Oracle in the GPL Version 2 section of the License file that
1201.27 * accompanied this code. If applicable, add the following below the
1201.28 * License Header, with the fields enclosed by brackets [] replaced by
1201.29 * your own identifying information:
1202.1 --- a/visualweb.j2ee14classloaderprovider/build.xml Fri Jul 16 11:47:36 2010 -0400
1202.2 +++ b/visualweb.j2ee14classloaderprovider/build.xml Fri Jul 16 14:21:50 2010 -0400
1202.3 @@ -2,7 +2,10 @@
1202.4 <!--
1202.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1202.6
1202.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1202.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1202.9 +
1202.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1202.11 +Other names may be trademarks of their respective owners.
1202.12
1202.13
1202.14 The contents of this file are subject to the terms of either the GNU
1202.15 @@ -15,9 +18,9 @@
1202.16 specific language governing permissions and limitations under the
1202.17 License. When distributing the software, include this License Header
1202.18 Notice in each file and include the License file at
1202.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1202.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1202.21 particular file as subject to the "Classpath" exception as provided
1202.22 -by Sun in the GPL Version 2 section of the License file that
1202.23 +by Oracle in the GPL Version 2 section of the License file that
1202.24 accompanied this code. If applicable, add the following below the
1202.25 License Header, with the fields enclosed by brackets [] replaced by
1202.26 your own identifying information:
1203.1 --- a/visualweb.j2ee14classloaderprovider/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1203.2 +++ b/visualweb.j2ee14classloaderprovider/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1203.3 @@ -1,6 +1,9 @@
1203.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1203.5 #
1203.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1203.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1203.8 +#
1203.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1203.10 +# Other names may be trademarks of their respective owners.
1203.11 #
1203.12 # The contents of this file are subject to the terms of either the GNU
1203.13 # General Public License Version 2 only ("GPL") or the Common
1203.14 @@ -12,9 +15,9 @@
1203.15 # specific language governing permissions and limitations under the
1203.16 # License. When distributing the software, include this License Header
1203.17 # Notice in each file and include the License file at
1203.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1203.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1203.20 # particular file as subject to the "Classpath" exception as provided
1203.21 -# by Sun in the GPL Version 2 section of the License file that
1203.22 +# by Oracle in the GPL Version 2 section of the License file that
1203.23 # accompanied this code. If applicable, add the following below the
1203.24 # License Header, with the fields enclosed by brackets [] replaced by
1203.25 # your own identifying information:
1203.26 @@ -37,4 +40,4 @@
1203.27 # Version 2 license, then the option applies only if the new code is
1203.28 # made subject to such option by the copyright holder.
1203.29
1203.30 -javac.source=1.5
1203.31 +javac.source=1.6
1204.1 --- a/visualweb.j2ee14classloaderprovider/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1204.2 +++ b/visualweb.j2ee14classloaderprovider/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1204.3 @@ -2,7 +2,10 @@
1204.4 <!--
1204.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1204.6
1204.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1204.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1204.9 +
1204.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1204.11 +Other names may be trademarks of their respective owners.
1204.12
1204.13
1204.14 The contents of this file are subject to the terms of either the GNU
1204.15 @@ -15,9 +18,9 @@
1204.16 specific language governing permissions and limitations under the
1204.17 License. When distributing the software, include this License Header
1204.18 Notice in each file and include the License file at
1204.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1204.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1204.21 particular file as subject to the "Classpath" exception as provided
1204.22 -by Sun in the GPL Version 2 section of the License file that
1204.23 +by Oracle in the GPL Version 2 section of the License file that
1204.24 accompanied this code. If applicable, add the following below the
1204.25 License Header, with the fields enclosed by brackets [] replaced by
1204.26 your own identifying information:
1204.27 @@ -273,7 +276,15 @@
1204.28 <build-prerequisite/>
1204.29 <compile-dependency/>
1204.30 <run-dependency>
1204.31 - <specification-version>6.8</specification-version>
1204.32 + <specification-version>8.0</specification-version>
1204.33 + </run-dependency>
1204.34 + </dependency>
1204.35 + <dependency>
1204.36 + <code-name-base>org.openide.util.lookup</code-name-base>
1204.37 + <build-prerequisite/>
1204.38 + <compile-dependency/>
1204.39 + <run-dependency>
1204.40 + <specification-version>8.0</specification-version>
1204.41 </run-dependency>
1204.42 </dependency>
1204.43 </module-dependencies>
1205.1 --- a/visualweb.j2ee14classloaderprovider/src/org/netbeans/modules/visualweb/j2ee14classloaderprovider/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1205.2 +++ b/visualweb.j2ee14classloaderprovider/src/org/netbeans/modules/visualweb/j2ee14classloaderprovider/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1205.3 @@ -1,6 +1,9 @@
1205.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1205.5 #
1205.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1205.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1205.8 +#
1205.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1205.10 +# Other names may be trademarks of their respective owners.
1205.11 #
1205.12 # The contents of this file are subject to the terms of either the GNU
1205.13 # General Public License Version 2 only ("GPL") or the Common
1205.14 @@ -12,9 +15,9 @@
1205.15 # specific language governing permissions and limitations under the
1205.16 # License. When distributing the software, include this License Header
1205.17 # Notice in each file and include the License file at
1205.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1205.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1205.20 # particular file as subject to the "Classpath" exception as provided
1205.21 -# by Sun in the GPL Version 2 section of the License file that
1205.22 +# by Oracle in the GPL Version 2 section of the License file that
1205.23 # accompanied this code. If applicable, add the following below the
1205.24 # License Header, with the fields enclosed by brackets [] replaced by
1205.25 # your own identifying information:
1206.1 --- a/visualweb.j2ee14classloaderprovider/src/org/netbeans/modules/visualweb/j2ee14classloaderprovider/J2EE14CommonClassloaderProvider.java Fri Jul 16 11:47:36 2010 -0400
1206.2 +++ b/visualweb.j2ee14classloaderprovider/src/org/netbeans/modules/visualweb/j2ee14classloaderprovider/J2EE14CommonClassloaderProvider.java Fri Jul 16 14:21:50 2010 -0400
1206.3 @@ -1,7 +1,10 @@
1206.4 /*
1206.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1206.6 *
1206.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1206.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1206.9 + *
1206.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1206.11 + * Other names may be trademarks of their respective owners.
1206.12 *
1206.13 * The contents of this file are subject to the terms of either the GNU
1206.14 * General Public License Version 2 only ("GPL") or the Common
1206.15 @@ -13,9 +16,9 @@
1206.16 * specific language governing permissions and limitations under the
1206.17 * License. When distributing the software, include this License Header
1206.18 * Notice in each file and include the License file at
1206.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1206.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1206.21 * particular file as subject to the "Classpath" exception as provided
1206.22 - * by Sun in the GPL Version 2 section of the License file that
1206.23 + * by Oracle in the GPL Version 2 section of the License file that
1206.24 * accompanied this code. If applicable, add the following below the
1206.25 * License Header, with the fields enclosed by brackets [] replaced by
1206.26 * your own identifying information:
1207.1 --- a/visualweb.j2ee15classloaderprovider/build.xml Fri Jul 16 11:47:36 2010 -0400
1207.2 +++ b/visualweb.j2ee15classloaderprovider/build.xml Fri Jul 16 14:21:50 2010 -0400
1207.3 @@ -2,7 +2,10 @@
1207.4 <!--
1207.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1207.6
1207.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1207.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1207.9 +
1207.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1207.11 +Other names may be trademarks of their respective owners.
1207.12
1207.13
1207.14 The contents of this file are subject to the terms of either the GNU
1207.15 @@ -15,9 +18,9 @@
1207.16 specific language governing permissions and limitations under the
1207.17 License. When distributing the software, include this License Header
1207.18 Notice in each file and include the License file at
1207.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1207.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1207.21 particular file as subject to the "Classpath" exception as provided
1207.22 -by Sun in the GPL Version 2 section of the License file that
1207.23 +by Oracle in the GPL Version 2 section of the License file that
1207.24 accompanied this code. If applicable, add the following below the
1207.25 License Header, with the fields enclosed by brackets [] replaced by
1207.26 your own identifying information:
1208.1 --- a/visualweb.j2ee15classloaderprovider/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1208.2 +++ b/visualweb.j2ee15classloaderprovider/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1208.3 @@ -1,6 +1,9 @@
1208.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1208.5 #
1208.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1208.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1208.8 +#
1208.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1208.10 +# Other names may be trademarks of their respective owners.
1208.11 #
1208.12 # The contents of this file are subject to the terms of either the GNU
1208.13 # General Public License Version 2 only ("GPL") or the Common
1208.14 @@ -12,9 +15,9 @@
1208.15 # specific language governing permissions and limitations under the
1208.16 # License. When distributing the software, include this License Header
1208.17 # Notice in each file and include the License file at
1208.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1208.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1208.20 # particular file as subject to the "Classpath" exception as provided
1208.21 -# by Sun in the GPL Version 2 section of the License file that
1208.22 +# by Oracle in the GPL Version 2 section of the License file that
1208.23 # accompanied this code. If applicable, add the following below the
1208.24 # License Header, with the fields enclosed by brackets [] replaced by
1208.25 # your own identifying information:
1208.26 @@ -37,4 +40,4 @@
1208.27 # Version 2 license, then the option applies only if the new code is
1208.28 # made subject to such option by the copyright holder.
1208.29
1208.30 -javac.source=1.5
1208.31 +javac.source=1.6
1209.1 --- a/visualweb.j2ee15classloaderprovider/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1209.2 +++ b/visualweb.j2ee15classloaderprovider/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1209.3 @@ -2,7 +2,10 @@
1209.4 <!--
1209.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1209.6
1209.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1209.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1209.9 +
1209.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1209.11 +Other names may be trademarks of their respective owners.
1209.12
1209.13
1209.14 The contents of this file are subject to the terms of either the GNU
1209.15 @@ -15,9 +18,9 @@
1209.16 specific language governing permissions and limitations under the
1209.17 License. When distributing the software, include this License Header
1209.18 Notice in each file and include the License file at
1209.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1209.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1209.21 particular file as subject to the "Classpath" exception as provided
1209.22 -by Sun in the GPL Version 2 section of the License file that
1209.23 +by Oracle in the GPL Version 2 section of the License file that
1209.24 accompanied this code. If applicable, add the following below the
1209.25 License Header, with the fields enclosed by brackets [] replaced by
1209.26 your own identifying information:
1209.27 @@ -272,7 +275,15 @@
1209.28 <build-prerequisite/>
1209.29 <compile-dependency/>
1209.30 <run-dependency>
1209.31 - <specification-version>6.8</specification-version>
1209.32 + <specification-version>8.0</specification-version>
1209.33 + </run-dependency>
1209.34 + </dependency>
1209.35 + <dependency>
1209.36 + <code-name-base>org.openide.util.lookup</code-name-base>
1209.37 + <build-prerequisite/>
1209.38 + <compile-dependency/>
1209.39 + <run-dependency>
1209.40 + <specification-version>8.0</specification-version>
1209.41 </run-dependency>
1209.42 </dependency>
1209.43 </module-dependencies>
1210.1 --- a/visualweb.j2ee15classloaderprovider/src/org/netbeans/modules/visualweb/j2ee15classloaderprovider/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1210.2 +++ b/visualweb.j2ee15classloaderprovider/src/org/netbeans/modules/visualweb/j2ee15classloaderprovider/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1210.3 @@ -1,6 +1,9 @@
1210.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1210.5 #
1210.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1210.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1210.8 +#
1210.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1210.10 +# Other names may be trademarks of their respective owners.
1210.11 #
1210.12 # The contents of this file are subject to the terms of either the GNU
1210.13 # General Public License Version 2 only ("GPL") or the Common
1210.14 @@ -12,9 +15,9 @@
1210.15 # specific language governing permissions and limitations under the
1210.16 # License. When distributing the software, include this License Header
1210.17 # Notice in each file and include the License file at
1210.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1210.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1210.20 # particular file as subject to the "Classpath" exception as provided
1210.21 -# by Sun in the GPL Version 2 section of the License file that
1210.22 +# by Oracle in the GPL Version 2 section of the License file that
1210.23 # accompanied this code. If applicable, add the following below the
1210.24 # License Header, with the fields enclosed by brackets [] replaced by
1210.25 # your own identifying information:
1211.1 --- a/visualweb.j2ee15classloaderprovider/src/org/netbeans/modules/visualweb/j2ee15classloaderprovider/J2EE15CommonClassloaderProvider.java Fri Jul 16 11:47:36 2010 -0400
1211.2 +++ b/visualweb.j2ee15classloaderprovider/src/org/netbeans/modules/visualweb/j2ee15classloaderprovider/J2EE15CommonClassloaderProvider.java Fri Jul 16 14:21:50 2010 -0400
1211.3 @@ -1,7 +1,10 @@
1211.4 /*
1211.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1211.6 *
1211.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1211.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1211.9 + *
1211.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1211.11 + * Other names may be trademarks of their respective owners.
1211.12 *
1211.13 * The contents of this file are subject to the terms of either the GNU
1211.14 * General Public License Version 2 only ("GPL") or the Common
1211.15 @@ -13,9 +16,9 @@
1211.16 * specific language governing permissions and limitations under the
1211.17 * License. When distributing the software, include this License Header
1211.18 * Notice in each file and include the License file at
1211.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1211.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1211.21 * particular file as subject to the "Classpath" exception as provided
1211.22 - * by Sun in the GPL Version 2 section of the License file that
1211.23 + * by Oracle in the GPL Version 2 section of the License file that
1211.24 * accompanied this code. If applicable, add the following below the
1211.25 * License Header, with the fields enclosed by brackets [] replaced by
1211.26 * your own identifying information:
1212.1 --- a/visualweb.jsfsupport.components/build.xml Fri Jul 16 11:47:36 2010 -0400
1212.2 +++ b/visualweb.jsfsupport.components/build.xml Fri Jul 16 14:21:50 2010 -0400
1212.3 @@ -2,7 +2,10 @@
1212.4 <!--
1212.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1212.6
1212.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1212.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1212.9 +
1212.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1212.11 +Other names may be trademarks of their respective owners.
1212.12
1212.13
1212.14 The contents of this file are subject to the terms of either the GNU
1212.15 @@ -15,9 +18,9 @@
1212.16 specific language governing permissions and limitations under the
1212.17 License. When distributing the software, include this License Header
1212.18 Notice in each file and include the License file at
1212.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1212.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1212.21 particular file as subject to the "Classpath" exception as provided
1212.22 -by Sun in the GPL Version 2 section of the License file that
1212.23 +by Oracle in the GPL Version 2 section of the License file that
1212.24 accompanied this code. If applicable, add the following below the
1212.25 License Header, with the fields enclosed by brackets [] replaced by
1212.26 your own identifying information:
1213.1 --- a/visualweb.jsfsupport.components/library/build.xml Fri Jul 16 11:47:36 2010 -0400
1213.2 +++ b/visualweb.jsfsupport.components/library/build.xml Fri Jul 16 14:21:50 2010 -0400
1213.3 @@ -2,7 +2,10 @@
1213.4 <!--
1213.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1213.6
1213.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1213.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1213.9 +
1213.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1213.11 +Other names may be trademarks of their respective owners.
1213.12
1213.13
1213.14 The contents of this file are subject to the terms of either the GNU
1213.15 @@ -15,9 +18,9 @@
1213.16 specific language governing permissions and limitations under the
1213.17 License. When distributing the software, include this License Header
1213.18 Notice in each file and include the License file at
1213.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1213.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1213.21 particular file as subject to the "Classpath" exception as provided
1213.22 -by Sun in the GPL Version 2 section of the License file that
1213.23 +by Oracle in the GPL Version 2 section of the License file that
1213.24 accompanied this code. If applicable, add the following below the
1213.25 License Header, with the fields enclosed by brackets [] replaced by
1213.26 your own identifying information:
1214.1 --- a/visualweb.jsfsupport.components/library/conf/faces-config.xml Fri Jul 16 11:47:36 2010 -0400
1214.2 +++ b/visualweb.jsfsupport.components/library/conf/faces-config.xml Fri Jul 16 14:21:50 2010 -0400
1214.3 @@ -2,7 +2,10 @@
1214.4 <!--
1214.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1214.6
1214.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1214.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1214.9 +
1214.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1214.11 +Other names may be trademarks of their respective owners.
1214.12
1214.13
1214.14 The contents of this file are subject to the terms of either the GNU
1214.15 @@ -15,9 +18,9 @@
1214.16 specific language governing permissions and limitations under the
1214.17 License. When distributing the software, include this License Header
1214.18 Notice in each file and include the License file at
1214.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1214.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1214.21 particular file as subject to the "Classpath" exception as provided
1214.22 -by Sun in the GPL Version 2 section of the License file that
1214.23 +by Oracle in the GPL Version 2 section of the License file that
1214.24 accompanied this code. If applicable, add the following below the
1214.25 License Header, with the fields enclosed by brackets [] replaced by
1214.26 your own identifying information:
1215.1 --- a/visualweb.jsfsupport.components/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1215.2 +++ b/visualweb.jsfsupport.components/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1215.3 @@ -1,6 +1,9 @@
1215.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1215.5 #
1215.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1215.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1215.8 +#
1215.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1215.10 +# Other names may be trademarks of their respective owners.
1215.11 #
1215.12 # The contents of this file are subject to the terms of either the GNU
1215.13 # General Public License Version 2 only ("GPL") or the Common
1215.14 @@ -12,9 +15,9 @@
1215.15 # specific language governing permissions and limitations under the
1215.16 # License. When distributing the software, include this License Header
1215.17 # Notice in each file and include the License file at
1215.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1215.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1215.20 # particular file as subject to the "Classpath" exception as provided
1215.21 -# by Sun in the GPL Version 2 section of the License file that
1215.22 +# by Oracle in the GPL Version 2 section of the License file that
1215.23 # accompanied this code. If applicable, add the following below the
1215.24 # License Header, with the fields enclosed by brackets [] replaced by
1215.25 # your own identifying information:
1215.26 @@ -61,10 +64,9 @@
1215.27 src.zip=${dist.dir}/jsfcl-src.zip
1215.28
1215.29 #file.reference.jsf-api.jar=../../../ravelibs/jsf-api/release/modules/ext/jsf-api.jar
1215.30 -#file.reference.servlet-api-2.5.jar=../../../ravebuild/netbeans/enterprise3/modules/ext/servlet2.5-jsp2.1-api.jar
1215.31
1215.32 # Have JSF1.2 API, JSP & Servlet API
1215.33 -file.reference.servlet2.5-jsp2.1-api.jar=../../servletjspapi/external/servlet2.5-jsp2.1-api.jar
1215.34 +file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
1215.35 file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
1215.36
1215.37
1215.38 @@ -72,7 +74,7 @@
1215.39 jar.compress=false
1215.40 javac.classpath=\
1215.41 ${file.reference.rowset-1.0.1.jar}:\
1215.42 - ${file.reference.servlet2.5-jsp2.1-api.jar}:\
1215.43 + ${file.reference.servlet3.0-jsp2.2-api.jar}:\
1215.44 ${file.reference.jsf-api.jar}
1215.45
1215.46 # ${file.reference.jsf-api.jar}:\
1216.1 --- a/visualweb.jsfsupport.components/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1216.2 +++ b/visualweb.jsfsupport.components/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1216.3 @@ -2,7 +2,10 @@
1216.4 <!--
1216.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1216.6
1216.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1216.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1216.9 +
1216.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1216.11 +Other names may be trademarks of their respective owners.
1216.12
1216.13
1216.14 The contents of this file are subject to the terms of either the GNU
1216.15 @@ -15,9 +18,9 @@
1216.16 specific language governing permissions and limitations under the
1216.17 License. When distributing the software, include this License Header
1216.18 Notice in each file and include the License file at
1216.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1216.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1216.21 particular file as subject to the "Classpath" exception as provided
1216.22 -by Sun in the GPL Version 2 section of the License file that
1216.23 +by Oracle in the GPL Version 2 section of the License file that
1216.24 accompanied this code. If applicable, add the following below the
1216.25 License Header, with the fields enclosed by brackets [] replaced by
1216.26 your own identifying information:
1217.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/AbstractApplicationBean.java Fri Jul 16 11:47:36 2010 -0400
1217.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/AbstractApplicationBean.java Fri Jul 16 14:21:50 2010 -0400
1217.3 @@ -7,7 +7,10 @@
1217.4 /*
1217.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1217.6 *
1217.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1217.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1217.9 + *
1217.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1217.11 + * Other names may be trademarks of their respective owners.
1217.12 *
1217.13 * The contents of this file are subject to the terms of either the GNU
1217.14 * General Public License Version 2 only ("GPL") or the Common
1217.15 @@ -19,9 +22,9 @@
1217.16 * specific language governing permissions and limitations under the
1217.17 * License. When distributing the software, include this License Header
1217.18 * Notice in each file and include the License file at
1217.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1217.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1217.21 * particular file as subject to the "Classpath" exception as provided
1217.22 - * by Sun in the GPL Version 2 section of the License file that
1217.23 + * by Oracle in the GPL Version 2 section of the License file that
1217.24 * accompanied this code. If applicable, add the following below the
1217.25 * License Header, with the fields enclosed by brackets [] replaced by
1217.26 * your own identifying information:
1218.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/AbstractPageBean.java Fri Jul 16 11:47:36 2010 -0400
1218.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/AbstractPageBean.java Fri Jul 16 14:21:50 2010 -0400
1218.3 @@ -1,7 +1,10 @@
1218.4 /*
1218.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1218.6 *
1218.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1218.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1218.9 + *
1218.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1218.11 + * Other names may be trademarks of their respective owners.
1218.12 *
1218.13 * The contents of this file are subject to the terms of either the GNU
1218.14 * General Public License Version 2 only ("GPL") or the Common
1218.15 @@ -13,9 +16,9 @@
1218.16 * specific language governing permissions and limitations under the
1218.17 * License. When distributing the software, include this License Header
1218.18 * Notice in each file and include the License file at
1218.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1218.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1218.21 * particular file as subject to the "Classpath" exception as provided
1218.22 - * by Sun in the GPL Version 2 section of the License file that
1218.23 + * by Oracle in the GPL Version 2 section of the License file that
1218.24 * accompanied this code. If applicable, add the following below the
1218.25 * License Header, with the fields enclosed by brackets [] replaced by
1218.26 * your own identifying information:
1219.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/AbstractRequestBean.java Fri Jul 16 11:47:36 2010 -0400
1219.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/AbstractRequestBean.java Fri Jul 16 14:21:50 2010 -0400
1219.3 @@ -1,7 +1,10 @@
1219.4 /*
1219.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1219.6 *
1219.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1219.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1219.9 + *
1219.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1219.11 + * Other names may be trademarks of their respective owners.
1219.12 *
1219.13 * The contents of this file are subject to the terms of either the GNU
1219.14 * General Public License Version 2 only ("GPL") or the Common
1219.15 @@ -13,9 +16,9 @@
1219.16 * specific language governing permissions and limitations under the
1219.17 * License. When distributing the software, include this License Header
1219.18 * Notice in each file and include the License file at
1219.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1219.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1219.21 * particular file as subject to the "Classpath" exception as provided
1219.22 - * by Sun in the GPL Version 2 section of the License file that
1219.23 + * by Oracle in the GPL Version 2 section of the License file that
1219.24 * accompanied this code. If applicable, add the following below the
1219.25 * License Header, with the fields enclosed by brackets [] replaced by
1219.26 * your own identifying information:
1220.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/AbstractSessionBean.java Fri Jul 16 11:47:36 2010 -0400
1220.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/AbstractSessionBean.java Fri Jul 16 14:21:50 2010 -0400
1220.3 @@ -1,7 +1,10 @@
1220.4 /*
1220.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1220.6 *
1220.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1220.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1220.9 + *
1220.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1220.11 + * Other names may be trademarks of their respective owners.
1220.12 *
1220.13 * The contents of this file are subject to the terms of either the GNU
1220.14 * General Public License Version 2 only ("GPL") or the Common
1220.15 @@ -13,9 +16,9 @@
1220.16 * specific language governing permissions and limitations under the
1220.17 * License. When distributing the software, include this License Header
1220.18 * Notice in each file and include the License file at
1220.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1220.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1220.21 * particular file as subject to the "Classpath" exception as provided
1220.22 - * by Sun in the GPL Version 2 section of the License file that
1220.23 + * by Oracle in the GPL Version 2 section of the License file that
1220.24 * accompanied this code. If applicable, add the following below the
1220.25 * License Header, with the fields enclosed by brackets [] replaced by
1220.26 * your own identifying information:
1221.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/FacesBean.java Fri Jul 16 11:47:36 2010 -0400
1221.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/FacesBean.java Fri Jul 16 14:21:50 2010 -0400
1221.3 @@ -1,7 +1,10 @@
1221.4 /*
1221.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1221.6 *
1221.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1221.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1221.9 + *
1221.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1221.11 + * Other names may be trademarks of their respective owners.
1221.12 *
1221.13 * The contents of this file are subject to the terms of either the GNU
1221.14 * General Public License Version 2 only ("GPL") or the Common
1221.15 @@ -13,9 +16,9 @@
1221.16 * specific language governing permissions and limitations under the
1221.17 * License. When distributing the software, include this License Header
1221.18 * Notice in each file and include the License file at
1221.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1221.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1221.21 * particular file as subject to the "Classpath" exception as provided
1221.22 - * by Sun in the GPL Version 2 section of the License file that
1221.23 + * by Oracle in the GPL Version 2 section of the License file that
1221.24 * accompanied this code. If applicable, add the following below the
1221.25 * License Header, with the fields enclosed by brackets [] replaced by
1221.26 * your own identifying information:
1222.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/PageBeanMapper.java Fri Jul 16 11:47:36 2010 -0400
1222.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/PageBeanMapper.java Fri Jul 16 14:21:50 2010 -0400
1222.3 @@ -1,7 +1,10 @@
1222.4 /*
1222.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1222.6 *
1222.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1222.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1222.9 + *
1222.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1222.11 + * Other names may be trademarks of their respective owners.
1222.12 *
1222.13 * The contents of this file are subject to the terms of either the GNU
1222.14 * General Public License Version 2 only ("GPL") or the Common
1222.15 @@ -13,9 +16,9 @@
1222.16 * specific language governing permissions and limitations under the
1222.17 * License. When distributing the software, include this License Header
1222.18 * Notice in each file and include the License file at
1222.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1222.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1222.21 * particular file as subject to the "Classpath" exception as provided
1222.22 - * by Sun in the GPL Version 2 section of the License file that
1222.23 + * by Oracle in the GPL Version 2 section of the License file that
1222.24 * accompanied this code. If applicable, add the following below the
1222.25 * License Header, with the fields enclosed by brackets [] replaced by
1222.26 * your own identifying information:
1223.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/PageBeanMapperImpl.java Fri Jul 16 11:47:36 2010 -0400
1223.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/PageBeanMapperImpl.java Fri Jul 16 14:21:50 2010 -0400
1223.3 @@ -1,7 +1,10 @@
1223.4 /*
1223.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1223.6 *
1223.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1223.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1223.9 + *
1223.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1223.11 + * Other names may be trademarks of their respective owners.
1223.12 *
1223.13 * The contents of this file are subject to the terms of either the GNU
1223.14 * General Public License Version 2 only ("GPL") or the Common
1223.15 @@ -13,9 +16,9 @@
1223.16 * specific language governing permissions and limitations under the
1223.17 * License. When distributing the software, include this License Header
1223.18 * Notice in each file and include the License file at
1223.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1223.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1223.21 * particular file as subject to the "Classpath" exception as provided
1223.22 - * by Sun in the GPL Version 2 section of the License file that
1223.23 + * by Oracle in the GPL Version 2 section of the License file that
1223.24 * accompanied this code. If applicable, add the following below the
1223.25 * License Header, with the fields enclosed by brackets [] replaced by
1223.26 * your own identifying information:
1224.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/ViewHandlerImpl.java Fri Jul 16 11:47:36 2010 -0400
1224.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/app/ViewHandlerImpl.java Fri Jul 16 14:21:50 2010 -0400
1224.3 @@ -1,7 +1,10 @@
1224.4 /*
1224.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1224.6 *
1224.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1224.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1224.9 + *
1224.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1224.11 + * Other names may be trademarks of their respective owners.
1224.12 *
1224.13 * The contents of this file are subject to the terms of either the GNU
1224.14 * General Public License Version 2 only ("GPL") or the Common
1224.15 @@ -13,9 +16,9 @@
1224.16 * specific language governing permissions and limitations under the
1224.17 * License. When distributing the software, include this License Header
1224.18 * Notice in each file and include the License file at
1224.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1224.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1224.21 * particular file as subject to the "Classpath" exception as provided
1224.22 - * by Sun in the GPL Version 2 section of the License file that
1224.23 + * by Oracle in the GPL Version 2 section of the License file that
1224.24 * accompanied this code. If applicable, add the following below the
1224.25 * License Header, with the fields enclosed by brackets [] replaced by
1224.26 * your own identifying information:
1225.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/component/EncodingComponent.java Fri Jul 16 11:47:36 2010 -0400
1225.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/component/EncodingComponent.java Fri Jul 16 14:21:50 2010 -0400
1225.3 @@ -1,7 +1,10 @@
1225.4 /*
1225.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1225.6 *
1225.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1225.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1225.9 + *
1225.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1225.11 + * Other names may be trademarks of their respective owners.
1225.12 *
1225.13 * The contents of this file are subject to the terms of either the GNU
1225.14 * General Public License Version 2 only ("GPL") or the Common
1225.15 @@ -13,9 +16,9 @@
1225.16 * specific language governing permissions and limitations under the
1225.17 * License. When distributing the software, include this License Header
1225.18 * Notice in each file and include the License file at
1225.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1225.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1225.21 * particular file as subject to the "Classpath" exception as provided
1225.22 - * by Sun in the GPL Version 2 section of the License file that
1225.23 + * by Oracle in the GPL Version 2 section of the License file that
1225.24 * accompanied this code. If applicable, add the following below the
1225.25 * License Header, with the fields enclosed by brackets [] replaced by
1225.26 * your own identifying information:
1226.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/convert/CalendarConverter.java Fri Jul 16 11:47:36 2010 -0400
1226.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/convert/CalendarConverter.java Fri Jul 16 14:21:50 2010 -0400
1226.3 @@ -1,7 +1,10 @@
1226.4 /*
1226.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1226.6 *
1226.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1226.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1226.9 + *
1226.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1226.11 + * Other names may be trademarks of their respective owners.
1226.12 *
1226.13 * The contents of this file are subject to the terms of either the GNU
1226.14 * General Public License Version 2 only ("GPL") or the Common
1226.15 @@ -13,9 +16,9 @@
1226.16 * specific language governing permissions and limitations under the
1226.17 * License. When distributing the software, include this License Header
1226.18 * Notice in each file and include the License file at
1226.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1226.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1226.21 * particular file as subject to the "Classpath" exception as provided
1226.22 - * by Sun in the GPL Version 2 section of the License file that
1226.23 + * by Oracle in the GPL Version 2 section of the License file that
1226.24 * accompanied this code. If applicable, add the following below the
1226.25 * License Header, with the fields enclosed by brackets [] replaced by
1226.26 * your own identifying information:
1227.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/convert/SqlDateConverter.java Fri Jul 16 11:47:36 2010 -0400
1227.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/convert/SqlDateConverter.java Fri Jul 16 14:21:50 2010 -0400
1227.3 @@ -1,7 +1,10 @@
1227.4 /*
1227.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1227.6 *
1227.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1227.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1227.9 + *
1227.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1227.11 + * Other names may be trademarks of their respective owners.
1227.12 *
1227.13 * The contents of this file are subject to the terms of either the GNU
1227.14 * General Public License Version 2 only ("GPL") or the Common
1227.15 @@ -13,9 +16,9 @@
1227.16 * specific language governing permissions and limitations under the
1227.17 * License. When distributing the software, include this License Header
1227.18 * Notice in each file and include the License file at
1227.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1227.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1227.21 * particular file as subject to the "Classpath" exception as provided
1227.22 - * by Sun in the GPL Version 2 section of the License file that
1227.23 + * by Oracle in the GPL Version 2 section of the License file that
1227.24 * accompanied this code. If applicable, add the following below the
1227.25 * License Header, with the fields enclosed by brackets [] replaced by
1227.26 * your own identifying information:
1228.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/convert/SqlTimeConverter.java Fri Jul 16 11:47:36 2010 -0400
1228.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/convert/SqlTimeConverter.java Fri Jul 16 14:21:50 2010 -0400
1228.3 @@ -1,7 +1,10 @@
1228.4 /*
1228.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1228.6 *
1228.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1228.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1228.9 + *
1228.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1228.11 + * Other names may be trademarks of their respective owners.
1228.12 *
1228.13 * The contents of this file are subject to the terms of either the GNU
1228.14 * General Public License Version 2 only ("GPL") or the Common
1228.15 @@ -13,9 +16,9 @@
1228.16 * specific language governing permissions and limitations under the
1228.17 * License. When distributing the software, include this License Header
1228.18 * Notice in each file and include the License file at
1228.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1228.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1228.21 * particular file as subject to the "Classpath" exception as provided
1228.22 - * by Sun in the GPL Version 2 section of the License file that
1228.23 + * by Oracle in the GPL Version 2 section of the License file that
1228.24 * accompanied this code. If applicable, add the following below the
1228.25 * License Header, with the fields enclosed by brackets [] replaced by
1228.26 * your own identifying information:
1229.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/convert/SqlTimestampConverter.java Fri Jul 16 11:47:36 2010 -0400
1229.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/convert/SqlTimestampConverter.java Fri Jul 16 14:21:50 2010 -0400
1229.3 @@ -1,7 +1,10 @@
1229.4 /*
1229.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1229.6 *
1229.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1229.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1229.9 + *
1229.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1229.11 + * Other names may be trademarks of their respective owners.
1229.12 *
1229.13 * The contents of this file are subject to the terms of either the GNU
1229.14 * General Public License Version 2 only ("GPL") or the Common
1229.15 @@ -13,9 +16,9 @@
1229.16 * specific language governing permissions and limitations under the
1229.17 * License. When distributing the software, include this License Header
1229.18 * Notice in each file and include the License file at
1229.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1229.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1229.21 * particular file as subject to the "Classpath" exception as provided
1229.22 - * by Sun in the GPL Version 2 section of the License file that
1229.23 + * by Oracle in the GPL Version 2 section of the License file that
1229.24 * accompanied this code. If applicable, add the following below the
1229.25 * License Header, with the fields enclosed by brackets [] replaced by
1229.26 * your own identifying information:
1230.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/data/CachedRowSetDataModel.java Fri Jul 16 11:47:36 2010 -0400
1230.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/data/CachedRowSetDataModel.java Fri Jul 16 14:21:50 2010 -0400
1230.3 @@ -1,7 +1,10 @@
1230.4 /*
1230.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1230.6 *
1230.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1230.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1230.9 + *
1230.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1230.11 + * Other names may be trademarks of their respective owners.
1230.12 *
1230.13 * The contents of this file are subject to the terms of either the GNU
1230.14 * General Public License Version 2 only ("GPL") or the Common
1230.15 @@ -13,9 +16,9 @@
1230.16 * specific language governing permissions and limitations under the
1230.17 * License. When distributing the software, include this License Header
1230.18 * Notice in each file and include the License file at
1230.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1230.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1230.21 * particular file as subject to the "Classpath" exception as provided
1230.22 - * by Sun in the GPL Version 2 section of the License file that
1230.23 + * by Oracle in the GPL Version 2 section of the License file that
1230.24 * accompanied this code. If applicable, add the following below the
1230.25 * License Header, with the fields enclosed by brackets [] replaced by
1230.26 * your own identifying information:
1231.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/data/DefaultSelectItemsArray.java Fri Jul 16 11:47:36 2010 -0400
1231.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/data/DefaultSelectItemsArray.java Fri Jul 16 14:21:50 2010 -0400
1231.3 @@ -1,7 +1,10 @@
1231.4 /*
1231.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1231.6 *
1231.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1231.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1231.9 + *
1231.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1231.11 + * Other names may be trademarks of their respective owners.
1231.12 *
1231.13 * The contents of this file are subject to the terms of either the GNU
1231.14 * General Public License Version 2 only ("GPL") or the Common
1231.15 @@ -13,9 +16,9 @@
1231.16 * specific language governing permissions and limitations under the
1231.17 * License. When distributing the software, include this License Header
1231.18 * Notice in each file and include the License file at
1231.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1231.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1231.21 * particular file as subject to the "Classpath" exception as provided
1231.22 - * by Sun in the GPL Version 2 section of the License file that
1231.23 + * by Oracle in the GPL Version 2 section of the License file that
1231.24 * accompanied this code. If applicable, add the following below the
1231.25 * License Header, with the fields enclosed by brackets [] replaced by
1231.26 * your own identifying information:
1232.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/data/DefaultTableDataModel.java Fri Jul 16 11:47:36 2010 -0400
1232.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/data/DefaultTableDataModel.java Fri Jul 16 14:21:50 2010 -0400
1232.3 @@ -1,7 +1,10 @@
1232.4 /*
1232.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1232.6 *
1232.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1232.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1232.9 + *
1232.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1232.11 + * Other names may be trademarks of their respective owners.
1232.12 *
1232.13 * The contents of this file are subject to the terms of either the GNU
1232.14 * General Public License Version 2 only ("GPL") or the Common
1232.15 @@ -13,9 +16,9 @@
1232.16 * specific language governing permissions and limitations under the
1232.17 * License. When distributing the software, include this License Header
1232.18 * Notice in each file and include the License file at
1232.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1232.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1232.21 * particular file as subject to the "Classpath" exception as provided
1232.22 - * by Sun in the GPL Version 2 section of the License file that
1232.23 + * by Oracle in the GPL Version 2 section of the License file that
1232.24 * accompanied this code. If applicable, add the following below the
1232.25 * License Header, with the fields enclosed by brackets [] replaced by
1232.26 * your own identifying information:
1233.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/data/RowSetDataModel.java Fri Jul 16 11:47:36 2010 -0400
1233.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/data/RowSetDataModel.java Fri Jul 16 14:21:50 2010 -0400
1233.3 @@ -1,7 +1,10 @@
1233.4 /*
1233.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1233.6 *
1233.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1233.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1233.9 + *
1233.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1233.11 + * Other names may be trademarks of their respective owners.
1233.12 *
1233.13 * The contents of this file are subject to the terms of either the GNU
1233.14 * General Public License Version 2 only ("GPL") or the Common
1233.15 @@ -13,9 +16,9 @@
1233.16 * specific language governing permissions and limitations under the
1233.17 * License. When distributing the software, include this License Header
1233.18 * Notice in each file and include the License file at
1233.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1233.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1233.21 * particular file as subject to the "Classpath" exception as provided
1233.22 - * by Sun in the GPL Version 2 section of the License file that
1233.23 + * by Oracle in the GPL Version 2 section of the License file that
1233.24 * accompanied this code. If applicable, add the following below the
1233.25 * License Header, with the fields enclosed by brackets [] replaced by
1233.26 * your own identifying information:
1234.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/taglib/EncodingTag.java Fri Jul 16 11:47:36 2010 -0400
1234.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/jsfcl/taglib/EncodingTag.java Fri Jul 16 14:21:50 2010 -0400
1234.3 @@ -1,7 +1,10 @@
1234.4 /*
1234.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1234.6 *
1234.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1234.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1234.9 + *
1234.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1234.11 + * Other names may be trademarks of their respective owners.
1234.12 *
1234.13 * The contents of this file are subject to the terms of either the GNU
1234.14 * General Public License Version 2 only ("GPL") or the Common
1234.15 @@ -13,9 +16,9 @@
1234.16 * specific language governing permissions and limitations under the
1234.17 * License. When distributing the software, include this License Header
1234.18 * Notice in each file and include the License file at
1234.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1234.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1234.21 * particular file as subject to the "Classpath" exception as provided
1234.22 - * by Sun in the GPL Version 2 section of the License file that
1234.23 + * by Oracle in the GPL Version 2 section of the License file that
1234.24 * accompanied this code. If applicable, add the following below the
1234.25 * License Header, with the fields enclosed by brackets [] replaced by
1234.26 * your own identifying information:
1235.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/component/EncodingComponent.java Fri Jul 16 11:47:36 2010 -0400
1235.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/component/EncodingComponent.java Fri Jul 16 14:21:50 2010 -0400
1235.3 @@ -1,7 +1,10 @@
1235.4 /*
1235.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1235.6 *
1235.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1235.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1235.9 + *
1235.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1235.11 + * Other names may be trademarks of their respective owners.
1235.12 *
1235.13 * The contents of this file are subject to the terms of either the GNU
1235.14 * General Public License Version 2 only ("GPL") or the Common
1235.15 @@ -13,9 +16,9 @@
1235.16 * specific language governing permissions and limitations under the
1235.17 * License. When distributing the software, include this License Header
1235.18 * Notice in each file and include the License file at
1235.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1235.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1235.21 * particular file as subject to the "Classpath" exception as provided
1235.22 - * by Sun in the GPL Version 2 section of the License file that
1235.23 + * by Oracle in the GPL Version 2 section of the License file that
1235.24 * accompanied this code. If applicable, add the following below the
1235.25 * License Header, with the fields enclosed by brackets [] replaced by
1235.26 * your own identifying information:
1236.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/converter/CalendarConverter.java Fri Jul 16 11:47:36 2010 -0400
1236.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/converter/CalendarConverter.java Fri Jul 16 14:21:50 2010 -0400
1236.3 @@ -1,7 +1,10 @@
1236.4 /*
1236.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1236.6 *
1236.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1236.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1236.9 + *
1236.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1236.11 + * Other names may be trademarks of their respective owners.
1236.12 *
1236.13 * The contents of this file are subject to the terms of either the GNU
1236.14 * General Public License Version 2 only ("GPL") or the Common
1236.15 @@ -13,9 +16,9 @@
1236.16 * specific language governing permissions and limitations under the
1236.17 * License. When distributing the software, include this License Header
1236.18 * Notice in each file and include the License file at
1236.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1236.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1236.21 * particular file as subject to the "Classpath" exception as provided
1236.22 - * by Sun in the GPL Version 2 section of the License file that
1236.23 + * by Oracle in the GPL Version 2 section of the License file that
1236.24 * accompanied this code. If applicable, add the following below the
1236.25 * License Header, with the fields enclosed by brackets [] replaced by
1236.26 * your own identifying information:
1237.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/converter/SqlDateConverter.java Fri Jul 16 11:47:36 2010 -0400
1237.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/converter/SqlDateConverter.java Fri Jul 16 14:21:50 2010 -0400
1237.3 @@ -1,7 +1,10 @@
1237.4 /*
1237.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1237.6 *
1237.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1237.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1237.9 + *
1237.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1237.11 + * Other names may be trademarks of their respective owners.
1237.12 *
1237.13 * The contents of this file are subject to the terms of either the GNU
1237.14 * General Public License Version 2 only ("GPL") or the Common
1237.15 @@ -13,9 +16,9 @@
1237.16 * specific language governing permissions and limitations under the
1237.17 * License. When distributing the software, include this License Header
1237.18 * Notice in each file and include the License file at
1237.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1237.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1237.21 * particular file as subject to the "Classpath" exception as provided
1237.22 - * by Sun in the GPL Version 2 section of the License file that
1237.23 + * by Oracle in the GPL Version 2 section of the License file that
1237.24 * accompanied this code. If applicable, add the following below the
1237.25 * License Header, with the fields enclosed by brackets [] replaced by
1237.26 * your own identifying information:
1238.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/converter/SqlTimeConverter.java Fri Jul 16 11:47:36 2010 -0400
1238.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/converter/SqlTimeConverter.java Fri Jul 16 14:21:50 2010 -0400
1238.3 @@ -1,7 +1,10 @@
1238.4 /*
1238.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1238.6 *
1238.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1238.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1238.9 + *
1238.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1238.11 + * Other names may be trademarks of their respective owners.
1238.12 *
1238.13 * The contents of this file are subject to the terms of either the GNU
1238.14 * General Public License Version 2 only ("GPL") or the Common
1238.15 @@ -13,9 +16,9 @@
1238.16 * specific language governing permissions and limitations under the
1238.17 * License. When distributing the software, include this License Header
1238.18 * Notice in each file and include the License file at
1238.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1238.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1238.21 * particular file as subject to the "Classpath" exception as provided
1238.22 - * by Sun in the GPL Version 2 section of the License file that
1238.23 + * by Oracle in the GPL Version 2 section of the License file that
1238.24 * accompanied this code. If applicable, add the following below the
1238.25 * License Header, with the fields enclosed by brackets [] replaced by
1238.26 * your own identifying information:
1239.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/converter/SqlTimestampConverter.java Fri Jul 16 11:47:36 2010 -0400
1239.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/converter/SqlTimestampConverter.java Fri Jul 16 14:21:50 2010 -0400
1239.3 @@ -1,7 +1,10 @@
1239.4 /*
1239.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1239.6 *
1239.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1239.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1239.9 + *
1239.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1239.11 + * Other names may be trademarks of their respective owners.
1239.12 *
1239.13 * The contents of this file are subject to the terms of either the GNU
1239.14 * General Public License Version 2 only ("GPL") or the Common
1239.15 @@ -13,9 +16,9 @@
1239.16 * specific language governing permissions and limitations under the
1239.17 * License. When distributing the software, include this License Header
1239.18 * Notice in each file and include the License file at
1239.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1239.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1239.21 * particular file as subject to the "Classpath" exception as provided
1239.22 - * by Sun in the GPL Version 2 section of the License file that
1239.23 + * by Oracle in the GPL Version 2 section of the License file that
1239.24 * accompanied this code. If applicable, add the following below the
1239.25 * License Header, with the fields enclosed by brackets [] replaced by
1239.26 * your own identifying information:
1240.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1240.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1240.3 @@ -1,6 +1,9 @@
1240.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1240.5 #
1240.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1240.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1240.8 +#
1240.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1240.10 +# Other names may be trademarks of their respective owners.
1240.11 #
1240.12 # The contents of this file are subject to the terms of either the GNU
1240.13 # General Public License Version 2 only ("GPL") or the Common
1240.14 @@ -12,9 +15,9 @@
1240.15 # specific language governing permissions and limitations under the
1240.16 # License. When distributing the software, include this License Header
1240.17 # Notice in each file and include the License file at
1240.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1240.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1240.20 # particular file as subject to the "Classpath" exception as provided
1240.21 -# by Sun in the GPL Version 2 section of the License file that
1240.22 +# by Oracle in the GPL Version 2 section of the License file that
1240.23 # accompanied this code. If applicable, add the following below the
1240.24 # License Header, with the fields enclosed by brackets [] replaced by
1240.25 # your own identifying information:
1241.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/CachedRowSetDataModel.java Fri Jul 16 11:47:36 2010 -0400
1241.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/CachedRowSetDataModel.java Fri Jul 16 14:21:50 2010 -0400
1241.3 @@ -1,7 +1,10 @@
1241.4 /*
1241.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1241.6 *
1241.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1241.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1241.9 + *
1241.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1241.11 + * Other names may be trademarks of their respective owners.
1241.12 *
1241.13 * The contents of this file are subject to the terms of either the GNU
1241.14 * General Public License Version 2 only ("GPL") or the Common
1241.15 @@ -13,9 +16,9 @@
1241.16 * specific language governing permissions and limitations under the
1241.17 * License. When distributing the software, include this License Header
1241.18 * Notice in each file and include the License file at
1241.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1241.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1241.21 * particular file as subject to the "Classpath" exception as provided
1241.22 - * by Sun in the GPL Version 2 section of the License file that
1241.23 + * by Oracle in the GPL Version 2 section of the License file that
1241.24 * accompanied this code. If applicable, add the following below the
1241.25 * License Header, with the fields enclosed by brackets [] replaced by
1241.26 * your own identifying information:
1242.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/ColumnBinding.java Fri Jul 16 11:47:36 2010 -0400
1242.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/ColumnBinding.java Fri Jul 16 14:21:50 2010 -0400
1242.3 @@ -1,7 +1,10 @@
1242.4 /*
1242.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1242.6 *
1242.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1242.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1242.9 + *
1242.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1242.11 + * Other names may be trademarks of their respective owners.
1242.12 *
1242.13 * The contents of this file are subject to the terms of either the GNU
1242.14 * General Public License Version 2 only ("GPL") or the Common
1242.15 @@ -13,9 +16,9 @@
1242.16 * specific language governing permissions and limitations under the
1242.17 * License. When distributing the software, include this License Header
1242.18 * Notice in each file and include the License file at
1242.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1242.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1242.21 * particular file as subject to the "Classpath" exception as provided
1242.22 - * by Sun in the GPL Version 2 section of the License file that
1242.23 + * by Oracle in the GPL Version 2 section of the License file that
1242.24 * accompanied this code. If applicable, add the following below the
1242.25 * License Header, with the fields enclosed by brackets [] replaced by
1242.26 * your own identifying information:
1243.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/DataCache.java Fri Jul 16 11:47:36 2010 -0400
1243.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/DataCache.java Fri Jul 16 14:21:50 2010 -0400
1243.3 @@ -1,7 +1,10 @@
1243.4 /*
1243.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1243.6 *
1243.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1243.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1243.9 + *
1243.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1243.11 + * Other names may be trademarks of their respective owners.
1243.12 *
1243.13 * The contents of this file are subject to the terms of either the GNU
1243.14 * General Public License Version 2 only ("GPL") or the Common
1243.15 @@ -13,9 +16,9 @@
1243.16 * specific language governing permissions and limitations under the
1243.17 * License. When distributing the software, include this License Header
1243.18 * Notice in each file and include the License file at
1243.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1243.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1243.21 * particular file as subject to the "Classpath" exception as provided
1243.22 - * by Sun in the GPL Version 2 section of the License file that
1243.23 + * by Oracle in the GPL Version 2 section of the License file that
1243.24 * accompanied this code. If applicable, add the following below the
1243.25 * License Header, with the fields enclosed by brackets [] replaced by
1243.26 * your own identifying information:
1244.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/DataValueBinder.java Fri Jul 16 11:47:36 2010 -0400
1244.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/DataValueBinder.java Fri Jul 16 14:21:50 2010 -0400
1244.3 @@ -1,7 +1,10 @@
1244.4 /*
1244.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1244.6 *
1244.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1244.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1244.9 + *
1244.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1244.11 + * Other names may be trademarks of their respective owners.
1244.12 *
1244.13 * The contents of this file are subject to the terms of either the GNU
1244.14 * General Public License Version 2 only ("GPL") or the Common
1244.15 @@ -13,9 +16,9 @@
1244.16 * specific language governing permissions and limitations under the
1244.17 * License. When distributing the software, include this License Header
1244.18 * Notice in each file and include the License file at
1244.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1244.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1244.21 * particular file as subject to the "Classpath" exception as provided
1244.22 - * by Sun in the GPL Version 2 section of the License file that
1244.23 + * by Oracle in the GPL Version 2 section of the License file that
1244.24 * accompanied this code. If applicable, add the following below the
1244.25 * License Header, with the fields enclosed by brackets [] replaced by
1244.26 * your own identifying information:
1245.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/DefaultSelectItemsArray.java Fri Jul 16 11:47:36 2010 -0400
1245.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/DefaultSelectItemsArray.java Fri Jul 16 14:21:50 2010 -0400
1245.3 @@ -1,7 +1,10 @@
1245.4 /*
1245.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1245.6 *
1245.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1245.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1245.9 + *
1245.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1245.11 + * Other names may be trademarks of their respective owners.
1245.12 *
1245.13 * The contents of this file are subject to the terms of either the GNU
1245.14 * General Public License Version 2 only ("GPL") or the Common
1245.15 @@ -13,9 +16,9 @@
1245.16 * specific language governing permissions and limitations under the
1245.17 * License. When distributing the software, include this License Header
1245.18 * Notice in each file and include the License file at
1245.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1245.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1245.21 * particular file as subject to the "Classpath" exception as provided
1245.22 - * by Sun in the GPL Version 2 section of the License file that
1245.23 + * by Oracle in the GPL Version 2 section of the License file that
1245.24 * accompanied this code. If applicable, add the following below the
1245.25 * License Header, with the fields enclosed by brackets [] replaced by
1245.26 * your own identifying information:
1246.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/DefaultTableDataModel.java Fri Jul 16 11:47:36 2010 -0400
1246.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/DefaultTableDataModel.java Fri Jul 16 14:21:50 2010 -0400
1246.3 @@ -1,7 +1,10 @@
1246.4 /*
1246.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1246.6 *
1246.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1246.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1246.9 + *
1246.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1246.11 + * Other names may be trademarks of their respective owners.
1246.12 *
1246.13 * The contents of this file are subject to the terms of either the GNU
1246.14 * General Public License Version 2 only ("GPL") or the Common
1246.15 @@ -13,9 +16,9 @@
1246.16 * specific language governing permissions and limitations under the
1246.17 * License. When distributing the software, include this License Header
1246.18 * Notice in each file and include the License file at
1246.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1246.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1246.21 * particular file as subject to the "Classpath" exception as provided
1246.22 - * by Sun in the GPL Version 2 section of the License file that
1246.23 + * by Oracle in the GPL Version 2 section of the License file that
1246.24 * accompanied this code. If applicable, add the following below the
1246.25 * License Header, with the fields enclosed by brackets [] replaced by
1246.26 * your own identifying information:
1247.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/ItemsRowSetBindable.java Fri Jul 16 11:47:36 2010 -0400
1247.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/ItemsRowSetBindable.java Fri Jul 16 14:21:50 2010 -0400
1247.3 @@ -1,7 +1,10 @@
1247.4 /*
1247.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1247.6 *
1247.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1247.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1247.9 + *
1247.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1247.11 + * Other names may be trademarks of their respective owners.
1247.12 *
1247.13 * The contents of this file are subject to the terms of either the GNU
1247.14 * General Public License Version 2 only ("GPL") or the Common
1247.15 @@ -13,9 +16,9 @@
1247.16 * specific language governing permissions and limitations under the
1247.17 * License. When distributing the software, include this License Header
1247.18 * Notice in each file and include the License file at
1247.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1247.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1247.21 * particular file as subject to the "Classpath" exception as provided
1247.22 - * by Sun in the GPL Version 2 section of the License file that
1247.23 + * by Oracle in the GPL Version 2 section of the License file that
1247.24 * accompanied this code. If applicable, add the following below the
1247.25 * License Header, with the fields enclosed by brackets [] replaced by
1247.26 * your own identifying information:
1248.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/ResultSetPropertyResolver.java Fri Jul 16 11:47:36 2010 -0400
1248.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/ResultSetPropertyResolver.java Fri Jul 16 14:21:50 2010 -0400
1248.3 @@ -1,7 +1,10 @@
1248.4 /*
1248.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1248.6 *
1248.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1248.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1248.9 + *
1248.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1248.11 + * Other names may be trademarks of their respective owners.
1248.12 *
1248.13 * The contents of this file are subject to the terms of either the GNU
1248.14 * General Public License Version 2 only ("GPL") or the Common
1248.15 @@ -13,9 +16,9 @@
1248.16 * specific language governing permissions and limitations under the
1248.17 * License. When distributing the software, include this License Header
1248.18 * Notice in each file and include the License file at
1248.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1248.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1248.21 * particular file as subject to the "Classpath" exception as provided
1248.22 - * by Sun in the GPL Version 2 section of the License file that
1248.23 + * by Oracle in the GPL Version 2 section of the License file that
1248.24 * accompanied this code. If applicable, add the following below the
1248.25 * License Header, with the fields enclosed by brackets [] replaced by
1248.26 * your own identifying information:
1249.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/RowSetBindable.java Fri Jul 16 11:47:36 2010 -0400
1249.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/RowSetBindable.java Fri Jul 16 14:21:50 2010 -0400
1249.3 @@ -1,7 +1,10 @@
1249.4 /*
1249.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1249.6 *
1249.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1249.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1249.9 + *
1249.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1249.11 + * Other names may be trademarks of their respective owners.
1249.12 *
1249.13 * The contents of this file are subject to the terms of either the GNU
1249.14 * General Public License Version 2 only ("GPL") or the Common
1249.15 @@ -13,9 +16,9 @@
1249.16 * specific language governing permissions and limitations under the
1249.17 * License. When distributing the software, include this License Header
1249.18 * Notice in each file and include the License file at
1249.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1249.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1249.21 * particular file as subject to the "Classpath" exception as provided
1249.22 - * by Sun in the GPL Version 2 section of the License file that
1249.23 + * by Oracle in the GPL Version 2 section of the License file that
1249.24 * accompanied this code. If applicable, add the following below the
1249.25 * License Header, with the fields enclosed by brackets [] replaced by
1249.26 * your own identifying information:
1250.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/RowSetColumnBindable.java Fri Jul 16 11:47:36 2010 -0400
1250.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/RowSetColumnBindable.java Fri Jul 16 14:21:50 2010 -0400
1250.3 @@ -1,7 +1,10 @@
1250.4 /*
1250.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1250.6 *
1250.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1250.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1250.9 + *
1250.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1250.11 + * Other names may be trademarks of their respective owners.
1250.12 *
1250.13 * The contents of this file are subject to the terms of either the GNU
1250.14 * General Public License Version 2 only ("GPL") or the Common
1250.15 @@ -13,9 +16,9 @@
1250.16 * specific language governing permissions and limitations under the
1250.17 * License. When distributing the software, include this License Header
1250.18 * Notice in each file and include the License file at
1250.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1250.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1250.21 * particular file as subject to the "Classpath" exception as provided
1250.22 - * by Sun in the GPL Version 2 section of the License file that
1250.23 + * by Oracle in the GPL Version 2 section of the License file that
1250.24 * accompanied this code. If applicable, add the following below the
1250.25 * License Header, with the fields enclosed by brackets [] replaced by
1250.26 * your own identifying information:
1251.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/RowSetColumnBinding.java Fri Jul 16 11:47:36 2010 -0400
1251.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/RowSetColumnBinding.java Fri Jul 16 14:21:50 2010 -0400
1251.3 @@ -1,7 +1,10 @@
1251.4 /*
1251.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1251.6 *
1251.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1251.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1251.9 + *
1251.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1251.11 + * Other names may be trademarks of their respective owners.
1251.12 *
1251.13 * The contents of this file are subject to the terms of either the GNU
1251.14 * General Public License Version 2 only ("GPL") or the Common
1251.15 @@ -13,9 +16,9 @@
1251.16 * specific language governing permissions and limitations under the
1251.17 * License. When distributing the software, include this License Header
1251.18 * Notice in each file and include the License file at
1251.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1251.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1251.21 * particular file as subject to the "Classpath" exception as provided
1251.22 - * by Sun in the GPL Version 2 section of the License file that
1251.23 + * by Oracle in the GPL Version 2 section of the License file that
1251.24 * accompanied this code. If applicable, add the following below the
1251.25 * License Header, with the fields enclosed by brackets [] replaced by
1251.26 * your own identifying information:
1252.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/RowSetDataModel.java Fri Jul 16 11:47:36 2010 -0400
1252.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/data/RowSetDataModel.java Fri Jul 16 14:21:50 2010 -0400
1252.3 @@ -1,7 +1,10 @@
1252.4 /*
1252.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1252.6 *
1252.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1252.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1252.9 + *
1252.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1252.11 + * Other names may be trademarks of their respective owners.
1252.12 *
1252.13 * The contents of this file are subject to the terms of either the GNU
1252.14 * General Public License Version 2 only ("GPL") or the Common
1252.15 @@ -13,9 +16,9 @@
1252.16 * specific language governing permissions and limitations under the
1252.17 * License. When distributing the software, include this License Header
1252.18 * Notice in each file and include the License file at
1252.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1252.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1252.21 * particular file as subject to the "Classpath" exception as provided
1252.22 - * by Sun in the GPL Version 2 section of the License file that
1252.23 + * by Oracle in the GPL Version 2 section of the License file that
1252.24 * accompanied this code. If applicable, add the following below the
1252.25 * License Header, with the fields enclosed by brackets [] replaced by
1252.26 * your own identifying information:
1253.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/event/Action.java Fri Jul 16 11:47:36 2010 -0400
1253.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/event/Action.java Fri Jul 16 14:21:50 2010 -0400
1253.3 @@ -1,7 +1,10 @@
1253.4 /*
1253.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1253.6 *
1253.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1253.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1253.9 + *
1253.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1253.11 + * Other names may be trademarks of their respective owners.
1253.12 *
1253.13 * The contents of this file are subject to the terms of either the GNU
1253.14 * General Public License Version 2 only ("GPL") or the Common
1253.15 @@ -13,9 +16,9 @@
1253.16 * specific language governing permissions and limitations under the
1253.17 * License. When distributing the software, include this License Header
1253.18 * Notice in each file and include the License file at
1253.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1253.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1253.21 * particular file as subject to the "Classpath" exception as provided
1253.22 - * by Sun in the GPL Version 2 section of the License file that
1253.23 + * by Oracle in the GPL Version 2 section of the License file that
1253.24 * accompanied this code. If applicable, add the following below the
1253.25 * License Header, with the fields enclosed by brackets [] replaced by
1253.26 * your own identifying information:
1254.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/lifecycle/CreatorLifeCycle.java Fri Jul 16 11:47:36 2010 -0400
1254.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/lifecycle/CreatorLifeCycle.java Fri Jul 16 14:21:50 2010 -0400
1254.3 @@ -1,7 +1,10 @@
1254.4 /*
1254.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1254.6 *
1254.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1254.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1254.9 + *
1254.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1254.11 + * Other names may be trademarks of their respective owners.
1254.12 *
1254.13 * The contents of this file are subject to the terms of either the GNU
1254.14 * General Public License Version 2 only ("GPL") or the Common
1254.15 @@ -13,9 +16,9 @@
1254.16 * specific language governing permissions and limitations under the
1254.17 * License. When distributing the software, include this License Header
1254.18 * Notice in each file and include the License file at
1254.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1254.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1254.21 * particular file as subject to the "Classpath" exception as provided
1254.22 - * by Sun in the GPL Version 2 section of the License file that
1254.23 + * by Oracle in the GPL Version 2 section of the License file that
1254.24 * accompanied this code. If applicable, add the following below the
1254.25 * License Header, with the fields enclosed by brackets [] replaced by
1254.26 * your own identifying information:
1255.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/lifecycle/LifeCycleAdapter.java Fri Jul 16 11:47:36 2010 -0400
1255.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/lifecycle/LifeCycleAdapter.java Fri Jul 16 14:21:50 2010 -0400
1255.3 @@ -1,7 +1,10 @@
1255.4 /*
1255.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1255.6 *
1255.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1255.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1255.9 + *
1255.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1255.11 + * Other names may be trademarks of their respective owners.
1255.12 *
1255.13 * The contents of this file are subject to the terms of either the GNU
1255.14 * General Public License Version 2 only ("GPL") or the Common
1255.15 @@ -13,9 +16,9 @@
1255.16 * specific language governing permissions and limitations under the
1255.17 * License. When distributing the software, include this License Header
1255.18 * Notice in each file and include the License file at
1255.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1255.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1255.21 * particular file as subject to the "Classpath" exception as provided
1255.22 - * by Sun in the GPL Version 2 section of the License file that
1255.23 + * by Oracle in the GPL Version 2 section of the License file that
1255.24 * accompanied this code. If applicable, add the following below the
1255.25 * License Header, with the fields enclosed by brackets [] replaced by
1255.26 * your own identifying information:
1256.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/lifecycle/LifeCycleEvent.java Fri Jul 16 11:47:36 2010 -0400
1256.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/lifecycle/LifeCycleEvent.java Fri Jul 16 14:21:50 2010 -0400
1256.3 @@ -1,7 +1,10 @@
1256.4 /*
1256.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1256.6 *
1256.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1256.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1256.9 + *
1256.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1256.11 + * Other names may be trademarks of their respective owners.
1256.12 *
1256.13 * The contents of this file are subject to the terms of either the GNU
1256.14 * General Public License Version 2 only ("GPL") or the Common
1256.15 @@ -13,9 +16,9 @@
1256.16 * specific language governing permissions and limitations under the
1256.17 * License. When distributing the software, include this License Header
1256.18 * Notice in each file and include the License file at
1256.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1256.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1256.21 * particular file as subject to the "Classpath" exception as provided
1256.22 - * by Sun in the GPL Version 2 section of the License file that
1256.23 + * by Oracle in the GPL Version 2 section of the License file that
1256.24 * accompanied this code. If applicable, add the following below the
1256.25 * License Header, with the fields enclosed by brackets [] replaced by
1256.26 * your own identifying information:
1257.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/lifecycle/LifeCycleListener.java Fri Jul 16 11:47:36 2010 -0400
1257.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/lifecycle/LifeCycleListener.java Fri Jul 16 14:21:50 2010 -0400
1257.3 @@ -1,7 +1,10 @@
1257.4 /*
1257.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1257.6 *
1257.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1257.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1257.9 + *
1257.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1257.11 + * Other names may be trademarks of their respective owners.
1257.12 *
1257.13 * The contents of this file are subject to the terms of either the GNU
1257.14 * General Public License Version 2 only ("GPL") or the Common
1257.15 @@ -13,9 +16,9 @@
1257.16 * specific language governing permissions and limitations under the
1257.17 * License. When distributing the software, include this License Header
1257.18 * Notice in each file and include the License file at
1257.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1257.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1257.21 * particular file as subject to the "Classpath" exception as provided
1257.22 - * by Sun in the GPL Version 2 section of the License file that
1257.23 + * by Oracle in the GPL Version 2 section of the License file that
1257.24 * accompanied this code. If applicable, add the following below the
1257.25 * License Header, with the fields enclosed by brackets [] replaced by
1257.26 * your own identifying information:
1258.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/renderer/AbstractRenderer.java Fri Jul 16 11:47:36 2010 -0400
1258.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/renderer/AbstractRenderer.java Fri Jul 16 14:21:50 2010 -0400
1258.3 @@ -1,7 +1,10 @@
1258.4 /*
1258.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1258.6 *
1258.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1258.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1258.9 + *
1258.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1258.11 + * Other names may be trademarks of their respective owners.
1258.12 *
1258.13 * The contents of this file are subject to the terms of either the GNU
1258.14 * General Public License Version 2 only ("GPL") or the Common
1258.15 @@ -13,9 +16,9 @@
1258.16 * specific language governing permissions and limitations under the
1258.17 * License. When distributing the software, include this License Header
1258.18 * Notice in each file and include the License file at
1258.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1258.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1258.21 * particular file as subject to the "Classpath" exception as provided
1258.22 - * by Sun in the GPL Version 2 section of the License file that
1258.23 + * by Oracle in the GPL Version 2 section of the License file that
1258.24 * accompanied this code. If applicable, add the following below the
1258.25 * License Header, with the fields enclosed by brackets [] replaced by
1258.26 * your own identifying information:
1259.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/renderer/EncodingRenderer.java Fri Jul 16 11:47:36 2010 -0400
1259.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/renderer/EncodingRenderer.java Fri Jul 16 14:21:50 2010 -0400
1259.3 @@ -1,7 +1,10 @@
1259.4 /*
1259.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1259.6 *
1259.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1259.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1259.9 + *
1259.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1259.11 + * Other names may be trademarks of their respective owners.
1259.12 *
1259.13 * The contents of this file are subject to the terms of either the GNU
1259.14 * General Public License Version 2 only ("GPL") or the Common
1259.15 @@ -13,9 +16,9 @@
1259.16 * specific language governing permissions and limitations under the
1259.17 * License. When distributing the software, include this License Header
1259.18 * Notice in each file and include the License file at
1259.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1259.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1259.21 * particular file as subject to the "Classpath" exception as provided
1259.22 - * by Sun in the GPL Version 2 section of the License file that
1259.23 + * by Oracle in the GPL Version 2 section of the License file that
1259.24 * accompanied this code. If applicable, add the following below the
1259.25 * License Header, with the fields enclosed by brackets [] replaced by
1259.26 * your own identifying information:
1260.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/taglib/AbstractTag.java Fri Jul 16 11:47:36 2010 -0400
1260.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/taglib/AbstractTag.java Fri Jul 16 14:21:50 2010 -0400
1260.3 @@ -1,7 +1,10 @@
1260.4 /*
1260.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1260.6 *
1260.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1260.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1260.9 + *
1260.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1260.11 + * Other names may be trademarks of their respective owners.
1260.12 *
1260.13 * The contents of this file are subject to the terms of either the GNU
1260.14 * General Public License Version 2 only ("GPL") or the Common
1260.15 @@ -13,9 +16,9 @@
1260.16 * specific language governing permissions and limitations under the
1260.17 * License. When distributing the software, include this License Header
1260.18 * Notice in each file and include the License file at
1260.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1260.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1260.21 * particular file as subject to the "Classpath" exception as provided
1260.22 - * by Sun in the GPL Version 2 section of the License file that
1260.23 + * by Oracle in the GPL Version 2 section of the License file that
1260.24 * accompanied this code. If applicable, add the following below the
1260.25 * License Header, with the fields enclosed by brackets [] replaced by
1260.26 * your own identifying information:
1261.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/taglib/EncodingTag.java Fri Jul 16 11:47:36 2010 -0400
1261.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/taglib/EncodingTag.java Fri Jul 16 14:21:50 2010 -0400
1261.3 @@ -1,7 +1,10 @@
1261.4 /*
1261.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1261.6 *
1261.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1261.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1261.9 + *
1261.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1261.11 + * Other names may be trademarks of their respective owners.
1261.12 *
1261.13 * The contents of this file are subject to the terms of either the GNU
1261.14 * General Public License Version 2 only ("GPL") or the Common
1261.15 @@ -13,9 +16,9 @@
1261.16 * specific language governing permissions and limitations under the
1261.17 * License. When distributing the software, include this License Header
1261.18 * Notice in each file and include the License file at
1261.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1261.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1261.21 * particular file as subject to the "Classpath" exception as provided
1261.22 - * by Sun in the GPL Version 2 section of the License file that
1261.23 + * by Oracle in the GPL Version 2 section of the License file that
1261.24 * accompanied this code. If applicable, add the following below the
1261.25 * License Header, with the fields enclosed by brackets [] replaced by
1261.26 * your own identifying information:
1262.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/util/ComponentBundle.java Fri Jul 16 11:47:36 2010 -0400
1262.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/util/ComponentBundle.java Fri Jul 16 14:21:50 2010 -0400
1262.3 @@ -1,7 +1,10 @@
1262.4 /*
1262.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1262.6 *
1262.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1262.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1262.9 + *
1262.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1262.11 + * Other names may be trademarks of their respective owners.
1262.12 *
1262.13 * The contents of this file are subject to the terms of either the GNU
1262.14 * General Public License Version 2 only ("GPL") or the Common
1262.15 @@ -13,9 +16,9 @@
1262.16 * specific language governing permissions and limitations under the
1262.17 * License. When distributing the software, include this License Header
1262.18 * Notice in each file and include the License file at
1262.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1262.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1262.21 * particular file as subject to the "Classpath" exception as provided
1262.22 - * by Sun in the GPL Version 2 section of the License file that
1262.23 + * by Oracle in the GPL Version 2 section of the License file that
1262.24 * accompanied this code. If applicable, add the following below the
1262.25 * License Header, with the fields enclosed by brackets [] replaced by
1262.26 * your own identifying information:
1263.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/util/DesignTimeComponentBundle.java Fri Jul 16 11:47:36 2010 -0400
1263.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/util/DesignTimeComponentBundle.java Fri Jul 16 14:21:50 2010 -0400
1263.3 @@ -1,7 +1,10 @@
1263.4 /*
1263.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1263.6 *
1263.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1263.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1263.9 + *
1263.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1263.11 + * Other names may be trademarks of their respective owners.
1263.12 *
1263.13 * The contents of this file are subject to the terms of either the GNU
1263.14 * General Public License Version 2 only ("GPL") or the Common
1263.15 @@ -13,9 +16,9 @@
1263.16 * specific language governing permissions and limitations under the
1263.17 * License. When distributing the software, include this License Header
1263.18 * Notice in each file and include the License file at
1263.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1263.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1263.21 * particular file as subject to the "Classpath" exception as provided
1263.22 - * by Sun in the GPL Version 2 section of the License file that
1263.23 + * by Oracle in the GPL Version 2 section of the License file that
1263.24 * accompanied this code. If applicable, add the following below the
1263.25 * License Header, with the fields enclosed by brackets [] replaced by
1263.26 * your own identifying information:
1264.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/util/LoggerUtil.java Fri Jul 16 11:47:36 2010 -0400
1264.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/util/LoggerUtil.java Fri Jul 16 14:21:50 2010 -0400
1264.3 @@ -1,7 +1,10 @@
1264.4 /*
1264.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1264.6 *
1264.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1264.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1264.9 + *
1264.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1264.11 + * Other names may be trademarks of their respective owners.
1264.12 *
1264.13 * The contents of this file are subject to the terms of either the GNU
1264.14 * General Public License Version 2 only ("GPL") or the Common
1264.15 @@ -13,9 +16,9 @@
1264.16 * specific language governing permissions and limitations under the
1264.17 * License. When distributing the software, include this License Header
1264.18 * Notice in each file and include the License file at
1264.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1264.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1264.21 * particular file as subject to the "Classpath" exception as provided
1264.22 - * by Sun in the GPL Version 2 section of the License file that
1264.23 + * by Oracle in the GPL Version 2 section of the License file that
1264.24 * accompanied this code. If applicable, add the following below the
1264.25 * License Header, with the fields enclosed by brackets [] replaced by
1264.26 * your own identifying information:
1265.1 --- a/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/util/LoggerUtilSimpleFormatter.java Fri Jul 16 11:47:36 2010 -0400
1265.2 +++ b/visualweb.jsfsupport.components/library/src/com/sun/rave/faces/util/LoggerUtilSimpleFormatter.java Fri Jul 16 14:21:50 2010 -0400
1265.3 @@ -1,7 +1,10 @@
1265.4 /*
1265.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1265.6 *
1265.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1265.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1265.9 + *
1265.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1265.11 + * Other names may be trademarks of their respective owners.
1265.12 *
1265.13 * The contents of this file are subject to the terms of either the GNU
1265.14 * General Public License Version 2 only ("GPL") or the Common
1265.15 @@ -13,9 +16,9 @@
1265.16 * specific language governing permissions and limitations under the
1265.17 * License. When distributing the software, include this License Header
1265.18 * Notice in each file and include the License file at
1265.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1265.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1265.21 * particular file as subject to the "Classpath" exception as provided
1265.22 - * by Sun in the GPL Version 2 section of the License file that
1265.23 + * by Oracle in the GPL Version 2 section of the License file that
1265.24 * accompanied this code. If applicable, add the following below the
1265.25 * License Header, with the fields enclosed by brackets [] replaced by
1265.26 * your own identifying information:
1266.1 --- a/visualweb.jsfsupport.components/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1266.2 +++ b/visualweb.jsfsupport.components/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1266.3 @@ -1,6 +1,9 @@
1266.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1266.5 #
1266.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1266.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1266.8 +#
1266.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1266.10 +# Other names may be trademarks of their respective owners.
1266.11 #
1266.12 # The contents of this file are subject to the terms of either the GNU
1266.13 # General Public License Version 2 only ("GPL") or the Common
1266.14 @@ -12,9 +15,9 @@
1266.15 # specific language governing permissions and limitations under the
1266.16 # License. When distributing the software, include this License Header
1266.17 # Notice in each file and include the License file at
1266.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1266.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1266.20 # particular file as subject to the "Classpath" exception as provided
1266.21 -# by Sun in the GPL Version 2 section of the License file that
1266.22 +# by Oracle in the GPL Version 2 section of the License file that
1266.23 # accompanied this code. If applicable, add the following below the
1266.24 # License Header, with the fields enclosed by brackets [] replaced by
1266.25 # your own identifying information:
1267.1 --- a/visualweb.jsfsupport.components/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1267.2 +++ b/visualweb.jsfsupport.components/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1267.3 @@ -2,7 +2,10 @@
1267.4 <!--
1267.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1267.6
1267.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1267.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1267.9 +
1267.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1267.11 +Other names may be trademarks of their respective owners.
1267.12
1267.13
1267.14 The contents of this file are subject to the terms of either the GNU
1267.15 @@ -15,9 +18,9 @@
1267.16 specific language governing permissions and limitations under the
1267.17 License. When distributing the software, include this License Header
1267.18 Notice in each file and include the License file at
1267.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1267.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1267.21 particular file as subject to the "Classpath" exception as provided
1267.22 -by Sun in the GPL Version 2 section of the License file that
1267.23 +by Oracle in the GPL Version 2 section of the License file that
1267.24 accompanied this code. If applicable, add the following below the
1267.25 License Header, with the fields enclosed by brackets [] replaced by
1267.26 your own identifying information:
1268.1 --- a/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1268.2 +++ b/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1268.3 @@ -1,6 +1,9 @@
1268.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1268.5 #
1268.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1268.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1268.8 +#
1268.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1268.10 +# Other names may be trademarks of their respective owners.
1268.11 #
1268.12 # The contents of this file are subject to the terms of either the GNU
1268.13 # General Public License Version 2 only ("GPL") or the Common
1268.14 @@ -12,9 +15,9 @@
1268.15 # specific language governing permissions and limitations under the
1268.16 # License. When distributing the software, include this License Header
1268.17 # Notice in each file and include the License file at
1268.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1268.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1268.20 # particular file as subject to the "Classpath" exception as provided
1268.21 -# by Sun in the GPL Version 2 section of the License file that
1268.22 +# by Oracle in the GPL Version 2 section of the License file that
1268.23 # accompanied this code. If applicable, add the following below the
1268.24 # License Header, with the fields enclosed by brackets [] replaced by
1268.25 # your own identifying information:
1269.1 --- a/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1269.2 +++ b/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1269.3 @@ -1,6 +1,9 @@
1269.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1269.5 #
1269.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1269.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1269.8 +#
1269.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1269.10 +# Other names may be trademarks of their respective owners.
1269.11 #
1269.12 # The contents of this file are subject to the terms of either the GNU
1269.13 # General Public License Version 2 only ("GPL") or the Common
1269.14 @@ -12,9 +15,9 @@
1269.15 # specific language governing permissions and limitations under the
1269.16 # License. When distributing the software, include this License Header
1269.17 # Notice in each file and include the License file at
1269.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1269.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1269.20 # particular file as subject to the "Classpath" exception as provided
1269.21 -# by Sun in the GPL Version 2 section of the License file that
1269.22 +# by Oracle in the GPL Version 2 section of the License file that
1269.23 # accompanied this code. If applicable, add the following below the
1269.24 # License Header, with the fields enclosed by brackets [] replaced by
1269.25 # your own identifying information:
1270.1 --- a/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/jsf12-support.xml Fri Jul 16 11:47:36 2010 -0400
1270.2 +++ b/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/jsf12-support.xml Fri Jul 16 14:21:50 2010 -0400
1270.3 @@ -2,7 +2,10 @@
1270.4 <!--
1270.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1270.6
1270.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1270.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1270.9 +
1270.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1270.11 +Other names may be trademarks of their respective owners.
1270.12
1270.13
1270.14 The contents of this file are subject to the terms of either the GNU
1270.15 @@ -15,9 +18,9 @@
1270.16 specific language governing permissions and limitations under the
1270.17 License. When distributing the software, include this License Header
1270.18 Notice in each file and include the License file at
1270.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1270.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1270.21 particular file as subject to the "Classpath" exception as provided
1270.22 -by Sun in the GPL Version 2 section of the License file that
1270.23 +by Oracle in the GPL Version 2 section of the License file that
1270.24 accompanied this code. If applicable, add the following below the
1270.25 License Header, with the fields enclosed by brackets [] replaced by
1270.26 your own identifying information:
1270.27 @@ -48,21 +51,21 @@
1270.28 <localizing-bundle>org.netbeans.modules.visualweb.jsfsupport.components.resources.Bundle</localizing-bundle>
1270.29 <volume>
1270.30 <type>classpath</type>
1270.31 - <resource>jar:nbinst:///modules/ext/jsfcl.jar!/</resource>
1270.32 - <resource>jar:nbinst:///modules/ext/appbase.jar!/</resource>
1270.33 - <resource>jar:nbinst:///modules/ext/dataprovider.jar!/</resource>
1270.34 - <resource>jar:nbinst:///modules/ext/sqlx.jar!/</resource>
1270.35 + <resource>jar:nbinst://org.netbeans.modules.visualweb.jsfsupport.components/modules/ext/jsfcl.jar!/</resource>
1270.36 + <resource>jar:nbinst://org.netbeans.modules.visualweb.web.ui.appbase/modules/ext/appbase.jar!/</resource>
1270.37 + <resource>jar:nbinst://org.netbeans.modules.visualweb.dataprovider/modules/ext/dataprovider.jar!/</resource>
1270.38 + <resource>jar:nbinst://org.netbeans.modules.visualweb.rowset/modules/ext/sqlx.jar!/</resource>
1270.39 </volume>
1270.40 <volume>
1270.41 <type>src</type>
1270.42 - <resource>jar:nbinst:///docs/appbase-src.zip!/</resource>
1270.43 - <resource>jar:nbinst:///docs/dataprovider-src.zip!/</resource>
1270.44 - <resource>jar:nbinst:///docs/jsfcl-src.zip!/</resource>
1270.45 + <resource>jar:nbinst://org.netbeans.modules.visualweb.web.ui.appbase/docs/appbase-src.zip!/</resource>
1270.46 + <resource>jar:nbinst://org.netbeans.modules.visualweb.dataprovider/docs/dataprovider-src.zip!/</resource>
1270.47 + <resource>jar:nbinst://org.netbeans.modules.visualweb.jsfsupport.components/docs/jsfcl-src.zip!/</resource>
1270.48 </volume>
1270.49 <volume>
1270.50 <type>javadoc</type>
1270.51 - <resource>jar:nbinst:///docs/appbase-doc.zip!/</resource>
1270.52 - <resource>jar:nbinst:///docs/dataprovider-doc.zip!/</resource>
1270.53 - <resource>jar:nbinst:///docs/jsfcl-doc.zip!/</resource>
1270.54 + <resource>jar:nbinst://org.netbeans.modules.visualweb.web.ui.appbase/docs/appbase-doc.zip!/</resource>
1270.55 + <resource>jar:nbinst://org.netbeans.modules.visualweb.dataprovider/docs/dataprovider-doc.zip!/</resource>
1270.56 + <resource>jar:nbinst://org.netbeans.modules.visualweb.jsfsupport.components/docs/jsfcl-doc.zip!/</resource>
1270.57 </volume>
1270.58 </library>
1271.1 --- a/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/jsfsupport-designtime.xml Fri Jul 16 11:47:36 2010 -0400
1271.2 +++ b/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/jsfsupport-designtime.xml Fri Jul 16 14:21:50 2010 -0400
1271.3 @@ -2,7 +2,10 @@
1271.4 <!--
1271.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1271.6
1271.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1271.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1271.9 +
1271.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1271.11 +Other names may be trademarks of their respective owners.
1271.12
1271.13
1271.14 The contents of this file are subject to the terms of either the GNU
1271.15 @@ -15,9 +18,9 @@
1271.16 specific language governing permissions and limitations under the
1271.17 License. When distributing the software, include this License Header
1271.18 Notice in each file and include the License file at
1271.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1271.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1271.21 particular file as subject to the "Classpath" exception as provided
1271.22 -by Sun in the GPL Version 2 section of the License file that
1271.23 +by Oracle in the GPL Version 2 section of the License file that
1271.24 accompanied this code. If applicable, add the following below the
1271.25 License Header, with the fields enclosed by brackets [] replaced by
1271.26 your own identifying information:
1271.27 @@ -48,21 +51,21 @@
1271.28 <localizing-bundle>org.netbeans.modules.visualweb.jsfsupport.components.resources.Bundle</localizing-bundle>
1271.29 <volume>
1271.30 <type>classpath</type>
1271.31 - <resource>jar:nbinst:///modules/ext/jsfcl.jar!/</resource>
1271.32 - <resource>jar:nbinst:///modules/ext/appbase.jar!/</resource>
1271.33 - <resource>jar:nbinst:///modules/ext/dataprovider.jar!/</resource>
1271.34 - <resource>jar:nbinst:///modules/ext/sqlx.jar!/</resource>
1271.35 + <resource>jar:nbinst://org.netbeans.modules.visualweb.jsfsupport.components/modules/ext/jsfcl.jar!/</resource>
1271.36 + <resource>jar:nbinst://org.netbeans.modules.visualweb.web.ui.appbase/modules/ext/appbase.jar!/</resource>
1271.37 + <resource>jar:nbinst://org.netbeans.modules.visualweb.dataprovider/modules/ext/dataprovider.jar!/</resource>
1271.38 + <resource>jar:nbinst://org.netbeans.modules.visualweb.rowset/modules/ext/sqlx.jar!/</resource>
1271.39 </volume>
1271.40 <volume>
1271.41 <type>src</type>
1271.42 - <resource>jar:nbinst:///docs/appbase-src.zip!/</resource>
1271.43 - <resource>jar:nbinst:///docs/dataprovider-src.zip!/</resource>
1271.44 - <resource>jar:nbinst:///docs/jsfcl-src.zip!/</resource>
1271.45 + <resource>jar:nbinst://org.netbeans.modules.visualweb.web.ui.appbase/docs/appbase-src.zip!/</resource>
1271.46 + <resource>jar:nbinst://org.netbeans.modules.visualweb.dataprovider/docs/dataprovider-src.zip!/</resource>
1271.47 + <resource>jar:nbinst://org.netbeans.modules.visualweb.jsfsupport.components/docs/jsfcl-src.zip!/</resource>
1271.48 </volume>
1271.49 <volume>
1271.50 <type>javadoc</type>
1271.51 - <resource>jar:nbinst:///docs/appbase-doc.zip!/</resource>
1271.52 - <resource>jar:nbinst:///docs/dataprovider-doc.zip!/</resource>
1271.53 - <resource>jar:nbinst:///docs/jsfcl-doc.zip!/</resource>
1271.54 + <resource>jar:nbinst://org.netbeans.modules.visualweb.web.ui.appbase/docs/appbase-doc.zip!/</resource>
1271.55 + <resource>jar:nbinst://org.netbeans.modules.visualweb.dataprovider/docs/dataprovider-doc.zip!/</resource>
1271.56 + <resource>jar:nbinst://org.netbeans.modules.visualweb.jsfsupport.components/docs/jsfcl-doc.zip!/</resource>
1271.57 </volume>
1271.58 </library>
1272.1 --- a/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/jsfsupport-runtime.xml Fri Jul 16 11:47:36 2010 -0400
1272.2 +++ b/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/jsfsupport-runtime.xml Fri Jul 16 14:21:50 2010 -0400
1272.3 @@ -2,7 +2,10 @@
1272.4 <!--
1272.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1272.6
1272.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1272.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1272.9 +
1272.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1272.11 +Other names may be trademarks of their respective owners.
1272.12
1272.13
1272.14 The contents of this file are subject to the terms of either the GNU
1272.15 @@ -15,9 +18,9 @@
1272.16 specific language governing permissions and limitations under the
1272.17 License. When distributing the software, include this License Header
1272.18 Notice in each file and include the License file at
1272.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1272.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1272.21 particular file as subject to the "Classpath" exception as provided
1272.22 -by Sun in the GPL Version 2 section of the License file that
1272.23 +by Oracle in the GPL Version 2 section of the License file that
1272.24 accompanied this code. If applicable, add the following below the
1272.25 License Header, with the fields enclosed by brackets [] replaced by
1272.26 your own identifying information:
1272.27 @@ -48,9 +51,9 @@
1272.28 <localizing-bundle>org.netbeans.modules.visualweb.jsfsupport.components.resources.Bundle</localizing-bundle>
1272.29 <volume>
1272.30 <type>classpath</type>
1272.31 - <resource>jar:nbinst:///modules/ext/jsfcl.jar!/</resource>
1272.32 - <resource>jar:nbinst:///modules/ext/appbase.jar!/</resource>
1272.33 - <resource>jar:nbinst:///modules/ext/dataprovider.jar!/</resource>
1272.34 - <resource>jar:nbinst:///modules/ext/sqlx.jar!/</resource>
1272.35 + <resource>jar:nbinst://org.netbeans.modules.visualweb.jsfsupport.components/modules/ext/jsfcl.jar!/</resource>
1272.36 + <resource>jar:nbinst://org.netbeans.modules.visualweb.web.ui.appbase/modules/ext/appbase.jar!/</resource>
1272.37 + <resource>jar:nbinst://org.netbeans.modules.visualweb.dataprovider/modules/ext/dataprovider.jar!/</resource>
1272.38 + <resource>jar:nbinst://org.netbeans.modules.visualweb.rowset/modules/ext/sqlx.jar!/</resource>
1272.39 </volume>
1272.40 </library>
1273.1 --- a/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
1273.2 +++ b/visualweb.jsfsupport.components/src/org/netbeans/modules/visualweb/jsfsupport/components/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
1273.3 @@ -2,7 +2,10 @@
1273.4 <!--
1273.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1273.6
1273.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1273.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1273.9 +
1273.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1273.11 +Other names may be trademarks of their respective owners.
1273.12
1273.13
1273.14 The contents of this file are subject to the terms of either the GNU
1273.15 @@ -15,9 +18,9 @@
1273.16 specific language governing permissions and limitations under the
1273.17 License. When distributing the software, include this License Header
1273.18 Notice in each file and include the License file at
1273.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1273.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1273.21 particular file as subject to the "Classpath" exception as provided
1273.22 -by Sun in the GPL Version 2 section of the License file that
1273.23 +by Oracle in the GPL Version 2 section of the License file that
1273.24 accompanied this code. If applicable, add the following below the
1273.25 License Header, with the fields enclosed by brackets [] replaced by
1273.26 your own identifying information:
1274.1 --- a/visualweb.jsfsupport.components/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/converter/CalendarConverterTest.java Fri Jul 16 11:47:36 2010 -0400
1274.2 +++ b/visualweb.jsfsupport.components/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/converter/CalendarConverterTest.java Fri Jul 16 14:21:50 2010 -0400
1274.3 @@ -5,9 +5,12 @@
1274.4
1274.5 /*
1274.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1274.7 - *
1274.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1274.9 - *
1274.10 + *
1274.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1274.12 + *
1274.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1274.14 + * Other names may be trademarks of their respective owners.
1274.15 + *
1274.16 * The contents of this file are subject to the terms of either the GNU
1274.17 * General Public License Version 2 only ("GPL") or the Common
1274.18 * Development and Distribution License("CDDL") (collectively, the
1274.19 @@ -18,7 +21,7 @@
1274.20 * specific language governing permissions and limitations under the
1274.21 * License. When distributing the software, include this License Header
1274.22 * Notice in each file and include the License file at
1274.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1274.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1274.25 * particular file as subject to the "Classpath" exception as provided
1274.26 * by Sun in the GPL Version 2 section of the License file that
1274.27 * accompanied this code. If applicable, add the following below the
1275.1 --- a/visualweb.jsfsupport.components/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/converter/SqlDateConverterTest.java Fri Jul 16 11:47:36 2010 -0400
1275.2 +++ b/visualweb.jsfsupport.components/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/converter/SqlDateConverterTest.java Fri Jul 16 14:21:50 2010 -0400
1275.3 @@ -4,9 +4,12 @@
1275.4
1275.5 /*
1275.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1275.7 - *
1275.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1275.9 - *
1275.10 + *
1275.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1275.12 + *
1275.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1275.14 + * Other names may be trademarks of their respective owners.
1275.15 + *
1275.16 * The contents of this file are subject to the terms of either the GNU
1275.17 * General Public License Version 2 only ("GPL") or the Common
1275.18 * Development and Distribution License("CDDL") (collectively, the
1275.19 @@ -17,7 +20,7 @@
1275.20 * specific language governing permissions and limitations under the
1275.21 * License. When distributing the software, include this License Header
1275.22 * Notice in each file and include the License file at
1275.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1275.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1275.25 * particular file as subject to the "Classpath" exception as provided
1275.26 * by Sun in the GPL Version 2 section of the License file that
1275.27 * accompanied this code. If applicable, add the following below the
1276.1 --- a/visualweb.jsfsupport.components/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/converter/SqlTimeConverterTest.java Fri Jul 16 11:47:36 2010 -0400
1276.2 +++ b/visualweb.jsfsupport.components/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/converter/SqlTimeConverterTest.java Fri Jul 16 14:21:50 2010 -0400
1276.3 @@ -4,9 +4,12 @@
1276.4
1276.5 /*
1276.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1276.7 - *
1276.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1276.9 - *
1276.10 + *
1276.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1276.12 + *
1276.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1276.14 + * Other names may be trademarks of their respective owners.
1276.15 + *
1276.16 * The contents of this file are subject to the terms of either the GNU
1276.17 * General Public License Version 2 only ("GPL") or the Common
1276.18 * Development and Distribution License("CDDL") (collectively, the
1276.19 @@ -17,7 +20,7 @@
1276.20 * specific language governing permissions and limitations under the
1276.21 * License. When distributing the software, include this License Header
1276.22 * Notice in each file and include the License file at
1276.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1276.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1276.25 * particular file as subject to the "Classpath" exception as provided
1276.26 * by Sun in the GPL Version 2 section of the License file that
1276.27 * accompanied this code. If applicable, add the following below the
1277.1 --- a/visualweb.jsfsupport.components/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/converter/SqlTimestampConverterTest.java Fri Jul 16 11:47:36 2010 -0400
1277.2 +++ b/visualweb.jsfsupport.components/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/converter/SqlTimestampConverterTest.java Fri Jul 16 14:21:50 2010 -0400
1277.3 @@ -4,9 +4,12 @@
1277.4
1277.5 /*
1277.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1277.7 - *
1277.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1277.9 - *
1277.10 + *
1277.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1277.12 + *
1277.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1277.14 + * Other names may be trademarks of their respective owners.
1277.15 + *
1277.16 * The contents of this file are subject to the terms of either the GNU
1277.17 * General Public License Version 2 only ("GPL") or the Common
1277.18 * Development and Distribution License("CDDL") (collectively, the
1277.19 @@ -17,7 +20,7 @@
1277.20 * specific language governing permissions and limitations under the
1277.21 * License. When distributing the software, include this License Header
1277.22 * Notice in each file and include the License file at
1277.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1277.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1277.25 * particular file as subject to the "Classpath" exception as provided
1277.26 * by Sun in the GPL Version 2 section of the License file that
1277.27 * accompanied this code. If applicable, add the following below the
1278.1 --- a/visualweb.jsfsupport.designtime/build.xml Fri Jul 16 11:47:36 2010 -0400
1278.2 +++ b/visualweb.jsfsupport.designtime/build.xml Fri Jul 16 14:21:50 2010 -0400
1278.3 @@ -2,7 +2,10 @@
1278.4 <!--
1278.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1278.6
1278.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1278.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1278.9 +
1278.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1278.11 +Other names may be trademarks of their respective owners.
1278.12
1278.13
1278.14 The contents of this file are subject to the terms of either the GNU
1278.15 @@ -15,9 +18,9 @@
1278.16 specific language governing permissions and limitations under the
1278.17 License. When distributing the software, include this License Header
1278.18 Notice in each file and include the License file at
1278.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1278.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1278.21 particular file as subject to the "Classpath" exception as provided
1278.22 -by Sun in the GPL Version 2 section of the License file that
1278.23 +by Oracle in the GPL Version 2 section of the License file that
1278.24 accompanied this code. If applicable, add the following below the
1278.25 License Header, with the fields enclosed by brackets [] replaced by
1278.26 your own identifying information:
1279.1 --- a/visualweb.jsfsupport.designtime/conf/faces-config.xml Fri Jul 16 11:47:36 2010 -0400
1279.2 +++ b/visualweb.jsfsupport.designtime/conf/faces-config.xml Fri Jul 16 14:21:50 2010 -0400
1279.3 @@ -2,7 +2,10 @@
1279.4 <!--
1279.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1279.6
1279.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1279.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1279.9 +
1279.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1279.11 +Other names may be trademarks of their respective owners.
1279.12
1279.13
1279.14 The contents of this file are subject to the terms of either the GNU
1279.15 @@ -15,9 +18,9 @@
1279.16 specific language governing permissions and limitations under the
1279.17 License. When distributing the software, include this License Header
1279.18 Notice in each file and include the License file at
1279.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1279.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1279.21 particular file as subject to the "Classpath" exception as provided
1279.22 -by Sun in the GPL Version 2 section of the License file that
1279.23 +by Oracle in the GPL Version 2 section of the License file that
1279.24 accompanied this code. If applicable, add the following below the
1279.25 License Header, with the fields enclosed by brackets [] replaced by
1279.26 your own identifying information:
1280.1 --- a/visualweb.jsfsupport.designtime/conf/sun-faces-config.xml Fri Jul 16 11:47:36 2010 -0400
1280.2 +++ b/visualweb.jsfsupport.designtime/conf/sun-faces-config.xml Fri Jul 16 14:21:50 2010 -0400
1280.3 @@ -2,7 +2,10 @@
1280.4 <!--
1280.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1280.6
1280.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1280.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1280.9 +
1280.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1280.11 +Other names may be trademarks of their respective owners.
1280.12
1280.13
1280.14 The contents of this file are subject to the terms of either the GNU
1280.15 @@ -15,9 +18,9 @@
1280.16 specific language governing permissions and limitations under the
1280.17 License. When distributing the software, include this License Header
1280.18 Notice in each file and include the License file at
1280.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1280.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1280.21 particular file as subject to the "Classpath" exception as provided
1280.22 -by Sun in the GPL Version 2 section of the License file that
1280.23 +by Oracle in the GPL Version 2 section of the License file that
1280.24 accompanied this code. If applicable, add the following below the
1280.25 License Header, with the fields enclosed by brackets [] replaced by
1280.26 your own identifying information:
1281.1 --- a/visualweb.jsfsupport.designtime/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1281.2 +++ b/visualweb.jsfsupport.designtime/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1281.3 @@ -1,6 +1,9 @@
1281.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1281.5 #
1281.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1281.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1281.8 +#
1281.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1281.10 +# Other names may be trademarks of their respective owners.
1281.11 #
1281.12 # The contents of this file are subject to the terms of either the GNU
1281.13 # General Public License Version 2 only ("GPL") or the Common
1281.14 @@ -12,9 +15,9 @@
1281.15 # specific language governing permissions and limitations under the
1281.16 # License. When distributing the software, include this License Header
1281.17 # Notice in each file and include the License file at
1281.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1281.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1281.20 # particular file as subject to the "Classpath" exception as provided
1281.21 -# by Sun in the GPL Version 2 section of the License file that
1281.22 +# by Oracle in the GPL Version 2 section of the License file that
1281.23 # accompanied this code. If applicable, add the following below the
1281.24 # License Header, with the fields enclosed by brackets [] replaced by
1281.25 # your own identifying information:
1281.26 @@ -39,6 +42,6 @@
1281.27
1281.28 cp.extra=
1281.29 javac.compilerargs=-Xlint:unchecked
1281.30 -javac.source=1.5
1281.31 +javac.source=1.6
1281.32
1281.33 sigtest.skip.check=true
1282.1 --- a/visualweb.jsfsupport.designtime/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1282.2 +++ b/visualweb.jsfsupport.designtime/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1282.3 @@ -2,7 +2,10 @@
1282.4 <!--
1282.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1282.6
1282.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1282.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1282.9 +
1282.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1282.11 +Other names may be trademarks of their respective owners.
1282.12
1282.13
1282.14 The contents of this file are subject to the terms of either the GNU
1282.15 @@ -15,9 +18,9 @@
1282.16 specific language governing permissions and limitations under the
1282.17 License. When distributing the software, include this License Header
1282.18 Notice in each file and include the License file at
1282.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1282.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1282.21 particular file as subject to the "Classpath" exception as provided
1282.22 -by Sun in the GPL Version 2 section of the License file that
1282.23 +by Oracle in the GPL Version 2 section of the License file that
1282.24 accompanied this code. If applicable, add the following below the
1282.25 License Header, with the fields enclosed by brackets [] replaced by
1282.26 your own identifying information:
1282.27 @@ -203,7 +206,15 @@
1282.28 <build-prerequisite/>
1282.29 <compile-dependency/>
1282.30 <run-dependency>
1282.31 - <specification-version>6.8.11</specification-version>
1282.32 + <specification-version>8.0</specification-version>
1282.33 + </run-dependency>
1282.34 + </dependency>
1282.35 + <dependency>
1282.36 + <code-name-base>org.openide.util.lookup</code-name-base>
1282.37 + <build-prerequisite/>
1282.38 + <compile-dependency/>
1282.39 + <run-dependency>
1282.40 + <specification-version>8.0</specification-version>
1282.41 </run-dependency>
1282.42 </dependency>
1282.43 </module-dependencies>
1283.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/AbstractPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1283.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/AbstractPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1283.3 @@ -1,7 +1,10 @@
1283.4 /*
1283.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1283.6 *
1283.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1283.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1283.9 + *
1283.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1283.11 + * Other names may be trademarks of their respective owners.
1283.12 *
1283.13 * The contents of this file are subject to the terms of either the GNU
1283.14 * General Public License Version 2 only ("GPL") or the Common
1283.15 @@ -13,9 +16,9 @@
1283.16 * specific language governing permissions and limitations under the
1283.17 * License. When distributing the software, include this License Header
1283.18 * Notice in each file and include the License file at
1283.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1283.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1283.21 * particular file as subject to the "Classpath" exception as provided
1283.22 - * by Sun in the GPL Version 2 section of the License file that
1283.23 + * by Oracle in the GPL Version 2 section of the License file that
1283.24 * accompanied this code. If applicable, add the following below the
1283.25 * License Header, with the fields enclosed by brackets [] replaced by
1283.26 * your own identifying information:
1284.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/AbstractPropertyJPanel.java Fri Jul 16 11:47:36 2010 -0400
1284.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/AbstractPropertyJPanel.java Fri Jul 16 14:21:50 2010 -0400
1284.3 @@ -1,7 +1,10 @@
1284.4 /*
1284.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1284.6 *
1284.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1284.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1284.9 + *
1284.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1284.11 + * Other names may be trademarks of their respective owners.
1284.12 *
1284.13 * The contents of this file are subject to the terms of either the GNU
1284.14 * General Public License Version 2 only ("GPL") or the Common
1284.15 @@ -13,9 +16,9 @@
1284.16 * specific language governing permissions and limitations under the
1284.17 * License. When distributing the software, include this License Header
1284.18 * Notice in each file and include the License file at
1284.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1284.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1284.21 * particular file as subject to the "Classpath" exception as provided
1284.22 - * by Sun in the GPL Version 2 section of the License file that
1284.23 + * by Oracle in the GPL Version 2 section of the License file that
1284.24 * accompanied this code. If applicable, add the following below the
1284.25 * License Header, with the fields enclosed by brackets [] replaced by
1284.26 * your own identifying information:
1285.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/AutoSubmitOnChangeCheckedAction.java Fri Jul 16 11:47:36 2010 -0400
1285.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/AutoSubmitOnChangeCheckedAction.java Fri Jul 16 14:21:50 2010 -0400
1285.3 @@ -1,7 +1,10 @@
1285.4 /*
1285.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1285.6 *
1285.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1285.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1285.9 + *
1285.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1285.11 + * Other names may be trademarks of their respective owners.
1285.12 *
1285.13 * The contents of this file are subject to the terms of either the GNU
1285.14 * General Public License Version 2 only ("GPL") or the Common
1285.15 @@ -13,9 +16,9 @@
1285.16 * specific language governing permissions and limitations under the
1285.17 * License. When distributing the software, include this License Header
1285.18 * Notice in each file and include the License file at
1285.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1285.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1285.21 * particular file as subject to the "Classpath" exception as provided
1285.22 - * by Sun in the GPL Version 2 section of the License file that
1285.23 + * by Oracle in the GPL Version 2 section of the License file that
1285.24 * accompanied this code. If applicable, add the following below the
1285.25 * License Header, with the fields enclosed by brackets [] replaced by
1285.26 * your own identifying information:
1286.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/BeanDescriptorBase.java Fri Jul 16 11:47:36 2010 -0400
1286.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/BeanDescriptorBase.java Fri Jul 16 14:21:50 2010 -0400
1286.3 @@ -1,7 +1,10 @@
1286.4 /*
1286.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1286.6 *
1286.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1286.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1286.9 + *
1286.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1286.11 + * Other names may be trademarks of their respective owners.
1286.12 *
1286.13 * The contents of this file are subject to the terms of either the GNU
1286.14 * General Public License Version 2 only ("GPL") or the Common
1286.15 @@ -13,9 +16,9 @@
1286.16 * specific language governing permissions and limitations under the
1286.17 * License. When distributing the software, include this License Header
1286.18 * Notice in each file and include the License file at
1286.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1286.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1286.21 * particular file as subject to the "Classpath" exception as provided
1286.22 - * by Sun in the GPL Version 2 section of the License file that
1286.23 + * by Oracle in the GPL Version 2 section of the License file that
1286.24 * accompanied this code. If applicable, add the following below the
1286.25 * License Header, with the fields enclosed by brackets [] replaced by
1286.26 * your own identifying information:
1287.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1287.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1287.3 @@ -1,6 +1,9 @@
1287.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1287.5 #
1287.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1287.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1287.8 +#
1287.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1287.10 +# Other names may be trademarks of their respective owners.
1287.11 #
1287.12 # The contents of this file are subject to the terms of either the GNU
1287.13 # General Public License Version 2 only ("GPL") or the Common
1287.14 @@ -12,9 +15,9 @@
1287.15 # specific language governing permissions and limitations under the
1287.16 # License. When distributing the software, include this License Header
1287.17 # Notice in each file and include the License file at
1287.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1287.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1287.20 # particular file as subject to the "Classpath" exception as provided
1287.21 -# by Sun in the GPL Version 2 section of the License file that
1287.22 +# by Oracle in the GPL Version 2 section of the License file that
1287.23 # accompanied this code. If applicable, add the following below the
1287.24 # License Header, with the fields enclosed by brackets [] replaced by
1287.25 # your own identifying information:
1288.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/HtmlBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1288.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/HtmlBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1288.3 @@ -1,7 +1,10 @@
1288.4 /*
1288.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1288.6 *
1288.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1288.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1288.9 + *
1288.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1288.11 + * Other names may be trademarks of their respective owners.
1288.12 *
1288.13 * The contents of this file are subject to the terms of either the GNU
1288.14 * General Public License Version 2 only ("GPL") or the Common
1288.15 @@ -13,9 +16,9 @@
1288.16 * specific language governing permissions and limitations under the
1288.17 * License. When distributing the software, include this License Header
1288.18 * Notice in each file and include the License file at
1288.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1288.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1288.21 * particular file as subject to the "Classpath" exception as provided
1288.22 - * by Sun in the GPL Version 2 section of the License file that
1288.23 + * by Oracle in the GPL Version 2 section of the License file that
1288.24 * accompanied this code. If applicable, add the following below the
1288.25 * License Header, with the fields enclosed by brackets [] replaced by
1288.26 * your own identifying information:
1289.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/HtmlDesignInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1289.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/HtmlDesignInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1289.3 @@ -1,7 +1,10 @@
1289.4 /*
1289.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1289.6 *
1289.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1289.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1289.9 + *
1289.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1289.11 + * Other names may be trademarks of their respective owners.
1289.12 *
1289.13 * The contents of this file are subject to the terms of either the GNU
1289.14 * General Public License Version 2 only ("GPL") or the Common
1289.15 @@ -13,9 +16,9 @@
1289.16 * specific language governing permissions and limitations under the
1289.17 * License. When distributing the software, include this License Header
1289.18 * Notice in each file and include the License file at
1289.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1289.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1289.21 * particular file as subject to the "Classpath" exception as provided
1289.22 - * by Sun in the GPL Version 2 section of the License file that
1289.23 + * by Oracle in the GPL Version 2 section of the License file that
1289.24 * accompanied this code. If applicable, add the following below the
1289.25 * License Header, with the fields enclosed by brackets [] replaced by
1289.26 * your own identifying information:
1290.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/HtmlNonGeneratedBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1290.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/HtmlNonGeneratedBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1290.3 @@ -1,7 +1,10 @@
1290.4 /*
1290.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1290.6 *
1290.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1290.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1290.9 + *
1290.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1290.11 + * Other names may be trademarks of their respective owners.
1290.12 *
1290.13 * The contents of this file are subject to the terms of either the GNU
1290.14 * General Public License Version 2 only ("GPL") or the Common
1290.15 @@ -13,9 +16,9 @@
1290.16 * specific language governing permissions and limitations under the
1290.17 * License. When distributing the software, include this License Header
1290.18 * Notice in each file and include the License file at
1290.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1290.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1290.21 * particular file as subject to the "Classpath" exception as provided
1290.22 - * by Sun in the GPL Version 2 section of the License file that
1290.23 + * by Oracle in the GPL Version 2 section of the License file that
1290.24 * accompanied this code. If applicable, add the following below the
1290.25 * License Header, with the fields enclosed by brackets [] replaced by
1290.26 * your own identifying information:
1291.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/PropertyDescriptorBase.java Fri Jul 16 11:47:36 2010 -0400
1291.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/PropertyDescriptorBase.java Fri Jul 16 14:21:50 2010 -0400
1291.3 @@ -1,7 +1,10 @@
1291.4 /*
1291.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1291.6 *
1291.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1291.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1291.9 + *
1291.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1291.11 + * Other names may be trademarks of their respective owners.
1291.12 *
1291.13 * The contents of this file are subject to the terms of either the GNU
1291.14 * General Public License Version 2 only ("GPL") or the Common
1291.15 @@ -13,9 +16,9 @@
1291.16 * specific language governing permissions and limitations under the
1291.17 * License. When distributing the software, include this License Header
1291.18 * Notice in each file and include the License file at
1291.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1291.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1291.21 * particular file as subject to the "Classpath" exception as provided
1291.22 - * by Sun in the GPL Version 2 section of the License file that
1291.23 + * by Oracle in the GPL Version 2 section of the License file that
1291.24 * accompanied this code. If applicable, add the following below the
1291.25 * License Header, with the fields enclosed by brackets [] replaced by
1291.26 * your own identifying information:
1292.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingCallback.java Fri Jul 16 11:47:36 2010 -0400
1292.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingCallback.java Fri Jul 16 14:21:50 2010 -0400
1292.3 @@ -1,7 +1,10 @@
1292.4 /*
1292.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1292.6 *
1292.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1292.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1292.9 + *
1292.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1292.11 + * Other names may be trademarks of their respective owners.
1292.12 *
1292.13 * The contents of this file are subject to the terms of either the GNU
1292.14 * General Public License Version 2 only ("GPL") or the Common
1292.15 @@ -13,9 +16,9 @@
1292.16 * specific language governing permissions and limitations under the
1292.17 * License. When distributing the software, include this License Header
1292.18 * Notice in each file and include the License file at
1292.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1292.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1292.21 * particular file as subject to the "Classpath" exception as provided
1292.22 - * by Sun in the GPL Version 2 section of the License file that
1292.23 + * by Oracle in the GPL Version 2 section of the License file that
1292.24 * accompanied this code. If applicable, add the following below the
1292.25 * License Header, with the fields enclosed by brackets [] replaced by
1292.26 * your own identifying information:
1293.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1293.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1293.3 @@ -1,7 +1,10 @@
1293.4 /*
1293.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1293.6 *
1293.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1293.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1293.9 + *
1293.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1293.11 + * Other names may be trademarks of their respective owners.
1293.12 *
1293.13 * The contents of this file are subject to the terms of either the GNU
1293.14 * General Public License Version 2 only ("GPL") or the Common
1293.15 @@ -13,9 +16,9 @@
1293.16 * specific language governing permissions and limitations under the
1293.17 * License. When distributing the software, include this License Header
1293.18 * Notice in each file and include the License file at
1293.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1293.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1293.21 * particular file as subject to the "Classpath" exception as provided
1293.22 - * by Sun in the GPL Version 2 section of the License file that
1293.23 + * by Oracle in the GPL Version 2 section of the License file that
1293.24 * accompanied this code. If applicable, add the following below the
1293.25 * License Header, with the fields enclosed by brackets [] replaced by
1293.26 * your own identifying information:
1294.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingPanel.java Fri Jul 16 11:47:36 2010 -0400
1294.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingPanel.java Fri Jul 16 14:21:50 2010 -0400
1294.3 @@ -1,7 +1,10 @@
1294.4 /*
1294.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1294.6 *
1294.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1294.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1294.9 + *
1294.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1294.11 + * Other names may be trademarks of their respective owners.
1294.12 *
1294.13 * The contents of this file are subject to the terms of either the GNU
1294.14 * General Public License Version 2 only ("GPL") or the Common
1294.15 @@ -13,9 +16,9 @@
1294.16 * specific language governing permissions and limitations under the
1294.17 * License. When distributing the software, include this License Header
1294.18 * Notice in each file and include the License file at
1294.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1294.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1294.21 * particular file as subject to the "Classpath" exception as provided
1294.22 - * by Sun in the GPL Version 2 section of the License file that
1294.23 + * by Oracle in the GPL Version 2 section of the License file that
1294.24 * accompanied this code. If applicable, add the following below the
1294.25 * License Header, with the fields enclosed by brackets [] replaced by
1294.26 * your own identifying information:
1295.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingTargetNode.java Fri Jul 16 11:47:36 2010 -0400
1295.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingTargetNode.java Fri Jul 16 14:21:50 2010 -0400
1295.3 @@ -1,7 +1,10 @@
1295.4 /*
1295.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1295.6 *
1295.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1295.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1295.9 + *
1295.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1295.11 + * Other names may be trademarks of their respective owners.
1295.12 *
1295.13 * The contents of this file are subject to the terms of either the GNU
1295.14 * General Public License Version 2 only ("GPL") or the Common
1295.15 @@ -13,9 +16,9 @@
1295.16 * specific language governing permissions and limitations under the
1295.17 * License. When distributing the software, include this License Header
1295.18 * Notice in each file and include the License file at
1295.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1295.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1295.21 * particular file as subject to the "Classpath" exception as provided
1295.22 - * by Sun in the GPL Version 2 section of the License file that
1295.23 + * by Oracle in the GPL Version 2 section of the License file that
1295.24 * accompanied this code. If applicable, add the following below the
1295.25 * License Header, with the fields enclosed by brackets [] replaced by
1295.26 * your own identifying information:
1296.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingsCustomizer.java Fri Jul 16 11:47:36 2010 -0400
1296.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingsCustomizer.java Fri Jul 16 14:21:50 2010 -0400
1296.3 @@ -1,7 +1,10 @@
1296.4 /*
1296.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1296.6 *
1296.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1296.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1296.9 + *
1296.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1296.11 + * Other names may be trademarks of their respective owners.
1296.12 *
1296.13 * The contents of this file are subject to the terms of either the GNU
1296.14 * General Public License Version 2 only ("GPL") or the Common
1296.15 @@ -13,9 +16,9 @@
1296.16 * specific language governing permissions and limitations under the
1296.17 * License. When distributing the software, include this License Header
1296.18 * Notice in each file and include the License file at
1296.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1296.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1296.21 * particular file as subject to the "Classpath" exception as provided
1296.22 - * by Sun in the GPL Version 2 section of the License file that
1296.23 + * by Oracle in the GPL Version 2 section of the License file that
1296.24 * accompanied this code. If applicable, add the following below the
1296.25 * License Header, with the fields enclosed by brackets [] replaced by
1296.26 * your own identifying information:
1297.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingsCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1297.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/BindingsCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1297.3 @@ -1,7 +1,10 @@
1297.4 /*
1297.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1297.6 *
1297.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1297.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1297.9 + *
1297.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1297.11 + * Other names may be trademarks of their respective owners.
1297.12 *
1297.13 * The contents of this file are subject to the terms of either the GNU
1297.14 * General Public License Version 2 only ("GPL") or the Common
1297.15 @@ -13,9 +16,9 @@
1297.16 * specific language governing permissions and limitations under the
1297.17 * License. When distributing the software, include this License Header
1297.18 * Notice in each file and include the License file at
1297.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1297.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1297.21 * particular file as subject to the "Classpath" exception as provided
1297.22 - * by Sun in the GPL Version 2 section of the License file that
1297.23 + * by Oracle in the GPL Version 2 section of the License file that
1297.24 * accompanied this code. If applicable, add the following below the
1297.25 * License Header, with the fields enclosed by brackets [] replaced by
1297.26 * your own identifying information:
1298.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1298.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1298.3 @@ -1,6 +1,9 @@
1298.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1298.5 #
1298.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1298.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1298.8 +#
1298.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1298.10 +# Other names may be trademarks of their respective owners.
1298.11 #
1298.12 # The contents of this file are subject to the terms of either the GNU
1298.13 # General Public License Version 2 only ("GPL") or the Common
1298.14 @@ -12,9 +15,9 @@
1298.15 # specific language governing permissions and limitations under the
1298.16 # License. When distributing the software, include this License Header
1298.17 # Notice in each file and include the License file at
1298.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1298.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1298.20 # particular file as subject to the "Classpath" exception as provided
1298.21 -# by Sun in the GPL Version 2 section of the License file that
1298.22 +# by Oracle in the GPL Version 2 section of the License file that
1298.23 # accompanied this code. If applicable, add the following below the
1298.24 # License Header, with the fields enclosed by brackets [] replaced by
1298.25 # your own identifying information:
1299.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/MapTargetNodeFactory.java Fri Jul 16 11:47:36 2010 -0400
1299.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/MapTargetNodeFactory.java Fri Jul 16 14:21:50 2010 -0400
1299.3 @@ -1,7 +1,10 @@
1299.4 /*
1299.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1299.6 *
1299.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1299.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1299.9 + *
1299.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1299.11 + * Other names may be trademarks of their respective owners.
1299.12 *
1299.13 * The contents of this file are subject to the terms of either the GNU
1299.14 * General Public License Version 2 only ("GPL") or the Common
1299.15 @@ -13,9 +16,9 @@
1299.16 * specific language governing permissions and limitations under the
1299.17 * License. When distributing the software, include this License Header
1299.18 * Notice in each file and include the License file at
1299.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1299.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1299.21 * particular file as subject to the "Classpath" exception as provided
1299.22 - * by Sun in the GPL Version 2 section of the License file that
1299.23 + * by Oracle in the GPL Version 2 section of the License file that
1299.24 * accompanied this code. If applicable, add the following below the
1299.25 * License Header, with the fields enclosed by brackets [] replaced by
1299.26 * your own identifying information:
1300.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/ResultSetTargetNodeFactory.java Fri Jul 16 11:47:36 2010 -0400
1300.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/ResultSetTargetNodeFactory.java Fri Jul 16 14:21:50 2010 -0400
1300.3 @@ -1,7 +1,10 @@
1300.4 /*
1300.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1300.6 *
1300.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1300.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1300.9 + *
1300.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1300.11 + * Other names may be trademarks of their respective owners.
1300.12 *
1300.13 * The contents of this file are subject to the terms of either the GNU
1300.14 * General Public License Version 2 only ("GPL") or the Common
1300.15 @@ -13,9 +16,9 @@
1300.16 * specific language governing permissions and limitations under the
1300.17 * License. When distributing the software, include this License Header
1300.18 * Notice in each file and include the License file at
1300.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1300.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1300.21 * particular file as subject to the "Classpath" exception as provided
1300.22 - * by Sun in the GPL Version 2 section of the License file that
1300.23 + * by Oracle in the GPL Version 2 section of the License file that
1300.24 * accompanied this code. If applicable, add the following below the
1300.25 * License Header, with the fields enclosed by brackets [] replaced by
1300.26 * your own identifying information:
1301.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/SourcePanel.java Fri Jul 16 11:47:36 2010 -0400
1301.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/SourcePanel.java Fri Jul 16 14:21:50 2010 -0400
1301.3 @@ -1,7 +1,10 @@
1301.4 /*
1301.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1301.6 *
1301.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1301.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1301.9 + *
1301.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1301.11 + * Other names may be trademarks of their respective owners.
1301.12 *
1301.13 * The contents of this file are subject to the terms of either the GNU
1301.14 * General Public License Version 2 only ("GPL") or the Common
1301.15 @@ -13,9 +16,9 @@
1301.16 * specific language governing permissions and limitations under the
1301.17 * License. When distributing the software, include this License Header
1301.18 * Notice in each file and include the License file at
1301.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1301.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1301.21 * particular file as subject to the "Classpath" exception as provided
1301.22 - * by Sun in the GPL Version 2 section of the License file that
1301.23 + * by Oracle in the GPL Version 2 section of the License file that
1301.24 * accompanied this code. If applicable, add the following below the
1301.25 * License Header, with the fields enclosed by brackets [] replaced by
1301.26 * your own identifying information:
1302.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/TargetNodeFactory.java Fri Jul 16 11:47:36 2010 -0400
1302.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/TargetNodeFactory.java Fri Jul 16 14:21:50 2010 -0400
1302.3 @@ -1,7 +1,10 @@
1302.4 /*
1302.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1302.6 *
1302.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1302.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1302.9 + *
1302.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1302.11 + * Other names may be trademarks of their respective owners.
1302.12 *
1302.13 * The contents of this file are subject to the terms of either the GNU
1302.14 * General Public License Version 2 only ("GPL") or the Common
1302.15 @@ -13,9 +16,9 @@
1302.16 * specific language governing permissions and limitations under the
1302.17 * License. When distributing the software, include this License Header
1302.18 * Notice in each file and include the License file at
1302.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1302.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1302.21 * particular file as subject to the "Classpath" exception as provided
1302.22 - * by Sun in the GPL Version 2 section of the License file that
1302.23 + * by Oracle in the GPL Version 2 section of the License file that
1302.24 * accompanied this code. If applicable, add the following below the
1302.25 * License Header, with the fields enclosed by brackets [] replaced by
1302.26 * your own identifying information:
1303.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/TargetPanel.java Fri Jul 16 11:47:36 2010 -0400
1303.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/binding/TargetPanel.java Fri Jul 16 14:21:50 2010 -0400
1303.3 @@ -1,7 +1,10 @@
1303.4 /*
1303.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1303.6 *
1303.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1303.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1303.9 + *
1303.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1303.11 + * Other names may be trademarks of their respective owners.
1303.12 *
1303.13 * The contents of this file are subject to the terms of either the GNU
1303.14 * General Public License Version 2 only ("GPL") or the Common
1303.15 @@ -13,9 +16,9 @@
1303.16 * specific language governing permissions and limitations under the
1303.17 * License. When distributing the software, include this License Header
1303.18 * Notice in each file and include the License file at
1303.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1303.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1303.21 * particular file as subject to the "Classpath" exception as provided
1303.22 - * by Sun in the GPL Version 2 section of the License file that
1303.23 + * by Oracle in the GPL Version 2 section of the License file that
1303.24 * accompanied this code. If applicable, add the following below the
1303.25 * License Header, with the fields enclosed by brackets [] replaced by
1303.26 * your own identifying information:
1304.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/Bundle-JSF-base.properties Fri Jul 16 11:47:36 2010 -0400
1304.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/Bundle-JSF-base.properties Fri Jul 16 14:21:50 2010 -0400
1304.3 @@ -1,6 +1,9 @@
1304.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1304.5 #
1304.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1304.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1304.8 +#
1304.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1304.10 +# Other names may be trademarks of their respective owners.
1304.11 #
1304.12 # The contents of this file are subject to the terms of either the GNU
1304.13 # General Public License Version 2 only ("GPL") or the Common
1304.14 @@ -12,9 +15,9 @@
1304.15 # specific language governing permissions and limitations under the
1304.16 # License. When distributing the software, include this License Header
1304.17 # Notice in each file and include the License file at
1304.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1304.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1304.20 # particular file as subject to the "Classpath" exception as provided
1304.21 -# by Sun in the GPL Version 2 section of the License file that
1304.22 +# by Oracle in the GPL Version 2 section of the License file that
1304.23 # accompanied this code. If applicable, add the following below the
1304.24 # License Header, with the fields enclosed by brackets [] replaced by
1304.25 # your own identifying information:
1305.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/EncodingComponentBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1305.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/EncodingComponentBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1305.3 @@ -1,7 +1,10 @@
1305.4 /*
1305.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1305.6 *
1305.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1305.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1305.9 + *
1305.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1305.11 + * Other names may be trademarks of their respective owners.
1305.12 *
1305.13 * The contents of this file are subject to the terms of either the GNU
1305.14 * General Public License Version 2 only ("GPL") or the Common
1305.15 @@ -13,9 +16,9 @@
1305.16 * specific language governing permissions and limitations under the
1305.17 * License. When distributing the software, include this License Header
1305.18 * Notice in each file and include the License file at
1305.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1305.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1305.21 * particular file as subject to the "Classpath" exception as provided
1305.22 - * by Sun in the GPL Version 2 section of the License file that
1305.23 + * by Oracle in the GPL Version 2 section of the License file that
1305.24 * accompanied this code. If applicable, add the following below the
1305.25 * License Header, with the fields enclosed by brackets [] replaced by
1305.26 * your own identifying information:
1306.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/EncodingComponentBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1306.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/EncodingComponentBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1306.3 @@ -1,7 +1,10 @@
1306.4 /*
1306.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1306.6 *
1306.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1306.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1306.9 + *
1306.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1306.11 + * Other names may be trademarks of their respective owners.
1306.12 *
1306.13 * The contents of this file are subject to the terms of either the GNU
1306.14 * General Public License Version 2 only ("GPL") or the Common
1306.15 @@ -13,9 +16,9 @@
1306.16 * specific language governing permissions and limitations under the
1306.17 * License. When distributing the software, include this License Header
1306.18 * Notice in each file and include the License file at
1306.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1306.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1306.21 * particular file as subject to the "Classpath" exception as provided
1306.22 - * by Sun in the GPL Version 2 section of the License file that
1306.23 + * by Oracle in the GPL Version 2 section of the License file that
1306.24 * accompanied this code. If applicable, add the following below the
1306.25 * License Header, with the fields enclosed by brackets [] replaced by
1306.26 * your own identifying information:
1307.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/EncodingComponentDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1307.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/EncodingComponentDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1307.3 @@ -1,7 +1,10 @@
1307.4 /*
1307.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1307.6 *
1307.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1307.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1307.9 + *
1307.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1307.11 + * Other names may be trademarks of their respective owners.
1307.12 *
1307.13 * The contents of this file are subject to the terms of either the GNU
1307.14 * General Public License Version 2 only ("GPL") or the Common
1307.15 @@ -13,9 +16,9 @@
1307.16 * specific language governing permissions and limitations under the
1307.17 * License. When distributing the software, include this License Header
1307.18 * Notice in each file and include the License file at
1307.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1307.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1307.21 * particular file as subject to the "Classpath" exception as provided
1307.22 - * by Sun in the GPL Version 2 section of the License file that
1307.23 + * by Oracle in the GPL Version 2 section of the License file that
1307.24 * accompanied this code. If applicable, add the following below the
1307.25 * License Header, with the fields enclosed by brackets [] replaced by
1307.26 * your own identifying information:
1308.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/Bundle-JSF-base.properties Fri Jul 16 11:47:36 2010 -0400
1308.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/Bundle-JSF-base.properties Fri Jul 16 14:21:50 2010 -0400
1308.3 @@ -1,6 +1,9 @@
1308.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1308.5 #
1308.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1308.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1308.8 +#
1308.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1308.10 +# Other names may be trademarks of their respective owners.
1308.11 #
1308.12 # The contents of this file are subject to the terms of either the GNU
1308.13 # General Public License Version 2 only ("GPL") or the Common
1308.14 @@ -12,9 +15,9 @@
1308.15 # specific language governing permissions and limitations under the
1308.16 # License. When distributing the software, include this License Header
1308.17 # Notice in each file and include the License file at
1308.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1308.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1308.20 # particular file as subject to the "Classpath" exception as provided
1308.21 -# by Sun in the GPL Version 2 section of the License file that
1308.22 +# by Oracle in the GPL Version 2 section of the License file that
1308.23 # accompanied this code. If applicable, add the following below the
1308.24 # License Header, with the fields enclosed by brackets [] replaced by
1308.25 # your own identifying information:
1309.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlFormBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1309.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlFormBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1309.3 @@ -1,7 +1,10 @@
1309.4 /*
1309.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1309.6 *
1309.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1309.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1309.9 + *
1309.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1309.11 + * Other names may be trademarks of their respective owners.
1309.12 *
1309.13 * The contents of this file are subject to the terms of either the GNU
1309.14 * General Public License Version 2 only ("GPL") or the Common
1309.15 @@ -13,9 +16,9 @@
1309.16 * specific language governing permissions and limitations under the
1309.17 * License. When distributing the software, include this License Header
1309.18 * Notice in each file and include the License file at
1309.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1309.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1309.21 * particular file as subject to the "Classpath" exception as provided
1309.22 - * by Sun in the GPL Version 2 section of the License file that
1309.23 + * by Oracle in the GPL Version 2 section of the License file that
1309.24 * accompanied this code. If applicable, add the following below the
1309.25 * License Header, with the fields enclosed by brackets [] replaced by
1309.26 * your own identifying information:
1310.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlFormBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1310.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlFormBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1310.3 @@ -1,7 +1,10 @@
1310.4 /*
1310.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1310.6 *
1310.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1310.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1310.9 + *
1310.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1310.11 + * Other names may be trademarks of their respective owners.
1310.12 *
1310.13 * The contents of this file are subject to the terms of either the GNU
1310.14 * General Public License Version 2 only ("GPL") or the Common
1310.15 @@ -13,9 +16,9 @@
1310.16 * specific language governing permissions and limitations under the
1310.17 * License. When distributing the software, include this License Header
1310.18 * Notice in each file and include the License file at
1310.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1310.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1310.21 * particular file as subject to the "Classpath" exception as provided
1310.22 - * by Sun in the GPL Version 2 section of the License file that
1310.23 + * by Oracle in the GPL Version 2 section of the License file that
1310.24 * accompanied this code. If applicable, add the following below the
1310.25 * License Header, with the fields enclosed by brackets [] replaced by
1310.26 * your own identifying information:
1311.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlFormDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1311.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlFormDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1311.3 @@ -1,7 +1,10 @@
1311.4 /*
1311.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1311.6 *
1311.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1311.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1311.9 + *
1311.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1311.11 + * Other names may be trademarks of their respective owners.
1311.12 *
1311.13 * The contents of this file are subject to the terms of either the GNU
1311.14 * General Public License Version 2 only ("GPL") or the Common
1311.15 @@ -13,9 +16,9 @@
1311.16 * specific language governing permissions and limitations under the
1311.17 * License. When distributing the software, include this License Header
1311.18 * Notice in each file and include the License file at
1311.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1311.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1311.21 * particular file as subject to the "Classpath" exception as provided
1311.22 - * by Sun in the GPL Version 2 section of the License file that
1311.23 + * by Oracle in the GPL Version 2 section of the License file that
1311.24 * accompanied this code. If applicable, add the following below the
1311.25 * License Header, with the fields enclosed by brackets [] replaced by
1311.26 * your own identifying information:
1312.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1312.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1312.3 @@ -1,7 +1,10 @@
1312.4 /*
1312.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1312.6 *
1312.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1312.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1312.9 + *
1312.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1312.11 + * Other names may be trademarks of their respective owners.
1312.12 *
1312.13 * The contents of this file are subject to the terms of either the GNU
1312.14 * General Public License Version 2 only ("GPL") or the Common
1312.15 @@ -13,9 +16,9 @@
1312.16 * specific language governing permissions and limitations under the
1312.17 * License. When distributing the software, include this License Header
1312.18 * Notice in each file and include the License file at
1312.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1312.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1312.21 * particular file as subject to the "Classpath" exception as provided
1312.22 - * by Sun in the GPL Version 2 section of the License file that
1312.23 + * by Oracle in the GPL Version 2 section of the License file that
1312.24 * accompanied this code. If applicable, add the following below the
1312.25 * License Header, with the fields enclosed by brackets [] replaced by
1312.26 * your own identifying information:
1313.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1313.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1313.3 @@ -1,7 +1,10 @@
1313.4 /*
1313.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1313.6 *
1313.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1313.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1313.9 + *
1313.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1313.11 + * Other names may be trademarks of their respective owners.
1313.12 *
1313.13 * The contents of this file are subject to the terms of either the GNU
1313.14 * General Public License Version 2 only ("GPL") or the Common
1313.15 @@ -13,9 +16,9 @@
1313.16 * specific language governing permissions and limitations under the
1313.17 * License. When distributing the software, include this License Header
1313.18 * Notice in each file and include the License file at
1313.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1313.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1313.21 * particular file as subject to the "Classpath" exception as provided
1313.22 - * by Sun in the GPL Version 2 section of the License file that
1313.23 + * by Oracle in the GPL Version 2 section of the License file that
1313.24 * accompanied this code. If applicable, add the following below the
1313.25 * License Header, with the fields enclosed by brackets [] replaced by
1313.26 * your own identifying information:
1314.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1314.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGridDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1314.3 @@ -1,7 +1,10 @@
1314.4 /*
1314.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1314.6 *
1314.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1314.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1314.9 + *
1314.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1314.11 + * Other names may be trademarks of their respective owners.
1314.12 *
1314.13 * The contents of this file are subject to the terms of either the GNU
1314.14 * General Public License Version 2 only ("GPL") or the Common
1314.15 @@ -13,9 +16,9 @@
1314.16 * specific language governing permissions and limitations under the
1314.17 * License. When distributing the software, include this License Header
1314.18 * Notice in each file and include the License file at
1314.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1314.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1314.21 * particular file as subject to the "Classpath" exception as provided
1314.22 - * by Sun in the GPL Version 2 section of the License file that
1314.23 + * by Oracle in the GPL Version 2 section of the License file that
1314.24 * accompanied this code. If applicable, add the following below the
1314.25 * License Header, with the fields enclosed by brackets [] replaced by
1314.26 * your own identifying information:
1315.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1315.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1315.3 @@ -1,7 +1,10 @@
1315.4 /*
1315.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1315.6 *
1315.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1315.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1315.9 + *
1315.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1315.11 + * Other names may be trademarks of their respective owners.
1315.12 *
1315.13 * The contents of this file are subject to the terms of either the GNU
1315.14 * General Public License Version 2 only ("GPL") or the Common
1315.15 @@ -13,9 +16,9 @@
1315.16 * specific language governing permissions and limitations under the
1315.17 * License. When distributing the software, include this License Header
1315.18 * Notice in each file and include the License file at
1315.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1315.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1315.21 * particular file as subject to the "Classpath" exception as provided
1315.22 - * by Sun in the GPL Version 2 section of the License file that
1315.23 + * by Oracle in the GPL Version 2 section of the License file that
1315.24 * accompanied this code. If applicable, add the following below the
1315.25 * License Header, with the fields enclosed by brackets [] replaced by
1315.26 * your own identifying information:
1316.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1316.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1316.3 @@ -1,7 +1,10 @@
1316.4 /*
1316.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1316.6 *
1316.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1316.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1316.9 + *
1316.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1316.11 + * Other names may be trademarks of their respective owners.
1316.12 *
1316.13 * The contents of this file are subject to the terms of either the GNU
1316.14 * General Public License Version 2 only ("GPL") or the Common
1316.15 @@ -13,9 +16,9 @@
1316.16 * specific language governing permissions and limitations under the
1316.17 * License. When distributing the software, include this License Header
1316.18 * Notice in each file and include the License file at
1316.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1316.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1316.21 * particular file as subject to the "Classpath" exception as provided
1316.22 - * by Sun in the GPL Version 2 section of the License file that
1316.23 + * by Oracle in the GPL Version 2 section of the License file that
1316.24 * accompanied this code. If applicable, add the following below the
1316.25 * License Header, with the fields enclosed by brackets [] replaced by
1316.26 * your own identifying information:
1317.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1317.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/component/html/HtmlPanelGroupDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1317.3 @@ -1,7 +1,10 @@
1317.4 /*
1317.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1317.6 *
1317.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1317.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1317.9 + *
1317.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1317.11 + * Other names may be trademarks of their respective owners.
1317.12 *
1317.13 * The contents of this file are subject to the terms of either the GNU
1317.14 * General Public License Version 2 only ("GPL") or the Common
1317.15 @@ -13,9 +16,9 @@
1317.16 * specific language governing permissions and limitations under the
1317.17 * License. When distributing the software, include this License Header
1317.18 * Notice in each file and include the License file at
1317.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1317.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1317.21 * particular file as subject to the "Classpath" exception as provided
1317.22 - * by Sun in the GPL Version 2 section of the License file that
1317.23 + * by Oracle in the GPL Version 2 section of the License file that
1317.24 * accompanied this code. If applicable, add the following below the
1317.25 * License Header, with the fields enclosed by brackets [] replaced by
1317.26 * your own identifying information:
1318.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BigDecimalConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1318.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BigDecimalConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1318.3 @@ -1,7 +1,10 @@
1318.4 /*
1318.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1318.6 *
1318.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1318.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1318.9 + *
1318.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1318.11 + * Other names may be trademarks of their respective owners.
1318.12 *
1318.13 * The contents of this file are subject to the terms of either the GNU
1318.14 * General Public License Version 2 only ("GPL") or the Common
1318.15 @@ -13,9 +16,9 @@
1318.16 * specific language governing permissions and limitations under the
1318.17 * License. When distributing the software, include this License Header
1318.18 * Notice in each file and include the License file at
1318.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1318.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1318.21 * particular file as subject to the "Classpath" exception as provided
1318.22 - * by Sun in the GPL Version 2 section of the License file that
1318.23 + * by Oracle in the GPL Version 2 section of the License file that
1318.24 * accompanied this code. If applicable, add the following below the
1318.25 * License Header, with the fields enclosed by brackets [] replaced by
1318.26 * your own identifying information:
1319.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BigIntegerConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1319.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BigIntegerConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1319.3 @@ -1,7 +1,10 @@
1319.4 /*
1319.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1319.6 *
1319.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1319.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1319.9 + *
1319.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1319.11 + * Other names may be trademarks of their respective owners.
1319.12 *
1319.13 * The contents of this file are subject to the terms of either the GNU
1319.14 * General Public License Version 2 only ("GPL") or the Common
1319.15 @@ -13,9 +16,9 @@
1319.16 * specific language governing permissions and limitations under the
1319.17 * License. When distributing the software, include this License Header
1319.18 * Notice in each file and include the License file at
1319.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1319.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1319.21 * particular file as subject to the "Classpath" exception as provided
1319.22 - * by Sun in the GPL Version 2 section of the License file that
1319.23 + * by Oracle in the GPL Version 2 section of the License file that
1319.24 * accompanied this code. If applicable, add the following below the
1319.25 * License Header, with the fields enclosed by brackets [] replaced by
1319.26 * your own identifying information:
1320.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BooleanConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1320.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/BooleanConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1320.3 @@ -1,7 +1,10 @@
1320.4 /*
1320.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1320.6 *
1320.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1320.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1320.9 + *
1320.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1320.11 + * Other names may be trademarks of their respective owners.
1320.12 *
1320.13 * The contents of this file are subject to the terms of either the GNU
1320.14 * General Public License Version 2 only ("GPL") or the Common
1320.15 @@ -13,9 +16,9 @@
1320.16 * specific language governing permissions and limitations under the
1320.17 * License. When distributing the software, include this License Header
1320.18 * Notice in each file and include the License file at
1320.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1320.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1320.21 * particular file as subject to the "Classpath" exception as provided
1320.22 - * by Sun in the GPL Version 2 section of the License file that
1320.23 + * by Oracle in the GPL Version 2 section of the License file that
1320.24 * accompanied this code. If applicable, add the following below the
1320.25 * License Header, with the fields enclosed by brackets [] replaced by
1320.26 * your own identifying information:
1321.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1321.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1321.3 @@ -1,6 +1,9 @@
1321.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1321.5 #
1321.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1321.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1321.8 +#
1321.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1321.10 +# Other names may be trademarks of their respective owners.
1321.11 #
1321.12 # The contents of this file are subject to the terms of either the GNU
1321.13 # General Public License Version 2 only ("GPL") or the Common
1321.14 @@ -12,9 +15,9 @@
1321.15 # specific language governing permissions and limitations under the
1321.16 # License. When distributing the software, include this License Header
1321.17 # Notice in each file and include the License file at
1321.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1321.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1321.20 # particular file as subject to the "Classpath" exception as provided
1321.21 -# by Sun in the GPL Version 2 section of the License file that
1321.22 +# by Oracle in the GPL Version 2 section of the License file that
1321.23 # accompanied this code. If applicable, add the following below the
1321.24 # License Header, with the fields enclosed by brackets [] replaced by
1321.25 # your own identifying information:
1322.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ByteConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1322.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ByteConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1322.3 @@ -1,7 +1,10 @@
1322.4 /*
1322.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1322.6 *
1322.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1322.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1322.9 + *
1322.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1322.11 + * Other names may be trademarks of their respective owners.
1322.12 *
1322.13 * The contents of this file are subject to the terms of either the GNU
1322.14 * General Public License Version 2 only ("GPL") or the Common
1322.15 @@ -13,9 +16,9 @@
1322.16 * specific language governing permissions and limitations under the
1322.17 * License. When distributing the software, include this License Header
1322.18 * Notice in each file and include the License file at
1322.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1322.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1322.21 * particular file as subject to the "Classpath" exception as provided
1322.22 - * by Sun in the GPL Version 2 section of the License file that
1322.23 + * by Oracle in the GPL Version 2 section of the License file that
1322.24 * accompanied this code. If applicable, add the following below the
1322.25 * License Header, with the fields enclosed by brackets [] replaced by
1322.26 * your own identifying information:
1323.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CalendarConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1323.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CalendarConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1323.3 @@ -1,7 +1,10 @@
1323.4 /*
1323.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1323.6 *
1323.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1323.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1323.9 + *
1323.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1323.11 + * Other names may be trademarks of their respective owners.
1323.12 *
1323.13 * The contents of this file are subject to the terms of either the GNU
1323.14 * General Public License Version 2 only ("GPL") or the Common
1323.15 @@ -13,9 +16,9 @@
1323.16 * specific language governing permissions and limitations under the
1323.17 * License. When distributing the software, include this License Header
1323.18 * Notice in each file and include the License file at
1323.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1323.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1323.21 * particular file as subject to the "Classpath" exception as provided
1323.22 - * by Sun in the GPL Version 2 section of the License file that
1323.23 + * by Oracle in the GPL Version 2 section of the License file that
1323.24 * accompanied this code. If applicable, add the following below the
1323.25 * License Header, with the fields enclosed by brackets [] replaced by
1323.26 * your own identifying information:
1324.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CalendarConverterDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1324.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CalendarConverterDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1324.3 @@ -1,7 +1,10 @@
1324.4 /*
1324.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1324.6 *
1324.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1324.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1324.9 + *
1324.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1324.11 + * Other names may be trademarks of their respective owners.
1324.12 *
1324.13 * The contents of this file are subject to the terms of either the GNU
1324.14 * General Public License Version 2 only ("GPL") or the Common
1324.15 @@ -13,9 +16,9 @@
1324.16 * specific language governing permissions and limitations under the
1324.17 * License. When distributing the software, include this License Header
1324.18 * Notice in each file and include the License file at
1324.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1324.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1324.21 * particular file as subject to the "Classpath" exception as provided
1324.22 - * by Sun in the GPL Version 2 section of the License file that
1324.23 + * by Oracle in the GPL Version 2 section of the License file that
1324.24 * accompanied this code. If applicable, add the following below the
1324.25 * License Header, with the fields enclosed by brackets [] replaced by
1324.26 * your own identifying information:
1325.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CharacterConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1325.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/CharacterConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1325.3 @@ -1,7 +1,10 @@
1325.4 /*
1325.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1325.6 *
1325.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1325.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1325.9 + *
1325.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1325.11 + * Other names may be trademarks of their respective owners.
1325.12 *
1325.13 * The contents of this file are subject to the terms of either the GNU
1325.14 * General Public License Version 2 only ("GPL") or the Common
1325.15 @@ -13,9 +16,9 @@
1325.16 * specific language governing permissions and limitations under the
1325.17 * License. When distributing the software, include this License Header
1325.18 * Notice in each file and include the License file at
1325.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1325.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1325.21 * particular file as subject to the "Classpath" exception as provided
1325.22 - * by Sun in the GPL Version 2 section of the License file that
1325.23 + * by Oracle in the GPL Version 2 section of the License file that
1325.24 * accompanied this code. If applicable, add the following below the
1325.25 * License Header, with the fields enclosed by brackets [] replaced by
1325.26 * your own identifying information:
1326.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1326.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1326.3 @@ -1,7 +1,10 @@
1326.4 /*
1326.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1326.6 *
1326.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1326.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1326.9 + *
1326.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1326.11 + * Other names may be trademarks of their respective owners.
1326.12 *
1326.13 * The contents of this file are subject to the terms of either the GNU
1326.14 * General Public License Version 2 only ("GPL") or the Common
1326.15 @@ -13,9 +16,9 @@
1326.16 * specific language governing permissions and limitations under the
1326.17 * License. When distributing the software, include this License Header
1326.18 * Notice in each file and include the License file at
1326.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1326.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1326.21 * particular file as subject to the "Classpath" exception as provided
1326.22 - * by Sun in the GPL Version 2 section of the License file that
1326.23 + * by Oracle in the GPL Version 2 section of the License file that
1326.24 * accompanied this code. If applicable, add the following below the
1326.25 * License Header, with the fields enclosed by brackets [] replaced by
1326.26 * your own identifying information:
1327.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeConverterDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1327.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeConverterDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1327.3 @@ -1,7 +1,10 @@
1327.4 /*
1327.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1327.6 *
1327.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1327.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1327.9 + *
1327.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1327.11 + * Other names may be trademarks of their respective owners.
1327.12 *
1327.13 * The contents of this file are subject to the terms of either the GNU
1327.14 * General Public License Version 2 only ("GPL") or the Common
1327.15 @@ -13,9 +16,9 @@
1327.16 * specific language governing permissions and limitations under the
1327.17 * License. When distributing the software, include this License Header
1327.18 * Notice in each file and include the License file at
1327.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1327.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1327.21 * particular file as subject to the "Classpath" exception as provided
1327.22 - * by Sun in the GPL Version 2 section of the License file that
1327.23 + * by Oracle in the GPL Version 2 section of the License file that
1327.24 * accompanied this code. If applicable, add the following below the
1327.25 * License Header, with the fields enclosed by brackets [] replaced by
1327.26 * your own identifying information:
1328.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimePatternPanel.java Fri Jul 16 11:47:36 2010 -0400
1328.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimePatternPanel.java Fri Jul 16 14:21:50 2010 -0400
1328.3 @@ -1,7 +1,10 @@
1328.4 /*
1328.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1328.6 *
1328.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1328.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1328.9 + *
1328.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1328.11 + * Other names may be trademarks of their respective owners.
1328.12 *
1328.13 * The contents of this file are subject to the terms of either the GNU
1328.14 * General Public License Version 2 only ("GPL") or the Common
1328.15 @@ -13,9 +16,9 @@
1328.16 * specific language governing permissions and limitations under the
1328.17 * License. When distributing the software, include this License Header
1328.18 * Notice in each file and include the License file at
1328.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1328.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1328.21 * particular file as subject to the "Classpath" exception as provided
1328.22 - * by Sun in the GPL Version 2 section of the License file that
1328.23 + * by Oracle in the GPL Version 2 section of the License file that
1328.24 * accompanied this code. If applicable, add the following below the
1328.25 * License Header, with the fields enclosed by brackets [] replaced by
1328.26 * your own identifying information:
1329.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimePatternPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1329.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimePatternPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1329.3 @@ -1,7 +1,10 @@
1329.4 /*
1329.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1329.6 *
1329.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1329.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1329.9 + *
1329.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1329.11 + * Other names may be trademarks of their respective owners.
1329.12 *
1329.13 * The contents of this file are subject to the terms of either the GNU
1329.14 * General Public License Version 2 only ("GPL") or the Common
1329.15 @@ -13,9 +16,9 @@
1329.16 * specific language governing permissions and limitations under the
1329.17 * License. When distributing the software, include this License Header
1329.18 * Notice in each file and include the License file at
1329.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1329.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1329.21 * particular file as subject to the "Classpath" exception as provided
1329.22 - * by Sun in the GPL Version 2 section of the License file that
1329.23 + * by Oracle in the GPL Version 2 section of the License file that
1329.24 * accompanied this code. If applicable, add the following below the
1329.25 * License Header, with the fields enclosed by brackets [] replaced by
1329.26 * your own identifying information:
1330.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeStylesDomain.java Fri Jul 16 11:47:36 2010 -0400
1330.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeStylesDomain.java Fri Jul 16 14:21:50 2010 -0400
1330.3 @@ -1,7 +1,10 @@
1330.4 /*
1330.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1330.6 *
1330.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1330.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1330.9 + *
1330.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1330.11 + * Other names may be trademarks of their respective owners.
1330.12 *
1330.13 * The contents of this file are subject to the terms of either the GNU
1330.14 * General Public License Version 2 only ("GPL") or the Common
1330.15 @@ -13,9 +16,9 @@
1330.16 * specific language governing permissions and limitations under the
1330.17 * License. When distributing the software, include this License Header
1330.18 * Notice in each file and include the License file at
1330.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1330.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1330.21 * particular file as subject to the "Classpath" exception as provided
1330.22 - * by Sun in the GPL Version 2 section of the License file that
1330.23 + * by Oracle in the GPL Version 2 section of the License file that
1330.24 * accompanied this code. If applicable, add the following below the
1330.25 * License Header, with the fields enclosed by brackets [] replaced by
1330.26 * your own identifying information:
1331.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeTypesDomain.java Fri Jul 16 11:47:36 2010 -0400
1331.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DateTimeTypesDomain.java Fri Jul 16 14:21:50 2010 -0400
1331.3 @@ -1,7 +1,10 @@
1331.4 /*
1331.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1331.6 *
1331.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1331.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1331.9 + *
1331.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1331.11 + * Other names may be trademarks of their respective owners.
1331.12 *
1331.13 * The contents of this file are subject to the terms of either the GNU
1331.14 * General Public License Version 2 only ("GPL") or the Common
1331.15 @@ -13,9 +16,9 @@
1331.16 * specific language governing permissions and limitations under the
1331.17 * License. When distributing the software, include this License Header
1331.18 * Notice in each file and include the License file at
1331.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1331.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1331.21 * particular file as subject to the "Classpath" exception as provided
1331.22 - * by Sun in the GPL Version 2 section of the License file that
1331.23 + * by Oracle in the GPL Version 2 section of the License file that
1331.24 * accompanied this code. If applicable, add the following below the
1331.25 * License Header, with the fields enclosed by brackets [] replaced by
1331.26 * your own identifying information:
1332.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DoubleConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1332.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/DoubleConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1332.3 @@ -1,7 +1,10 @@
1332.4 /*
1332.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1332.6 *
1332.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1332.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1332.9 + *
1332.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1332.11 + * Other names may be trademarks of their respective owners.
1332.12 *
1332.13 * The contents of this file are subject to the terms of either the GNU
1332.14 * General Public License Version 2 only ("GPL") or the Common
1332.15 @@ -13,9 +16,9 @@
1332.16 * specific language governing permissions and limitations under the
1332.17 * License. When distributing the software, include this License Header
1332.18 * Notice in each file and include the License file at
1332.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1332.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1332.21 * particular file as subject to the "Classpath" exception as provided
1332.22 - * by Sun in the GPL Version 2 section of the License file that
1332.23 + * by Oracle in the GPL Version 2 section of the License file that
1332.24 * accompanied this code. If applicable, add the following below the
1332.25 * License Header, with the fields enclosed by brackets [] replaced by
1332.26 * your own identifying information:
1333.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/FloatConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1333.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/FloatConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1333.3 @@ -1,7 +1,10 @@
1333.4 /*
1333.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1333.6 *
1333.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1333.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1333.9 + *
1333.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1333.11 + * Other names may be trademarks of their respective owners.
1333.12 *
1333.13 * The contents of this file are subject to the terms of either the GNU
1333.14 * General Public License Version 2 only ("GPL") or the Common
1333.15 @@ -13,9 +16,9 @@
1333.16 * specific language governing permissions and limitations under the
1333.17 * License. When distributing the software, include this License Header
1333.18 * Notice in each file and include the License file at
1333.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1333.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1333.21 * particular file as subject to the "Classpath" exception as provided
1333.22 - * by Sun in the GPL Version 2 section of the License file that
1333.23 + * by Oracle in the GPL Version 2 section of the License file that
1333.24 * accompanied this code. If applicable, add the following below the
1333.25 * License Header, with the fields enclosed by brackets [] replaced by
1333.26 * your own identifying information:
1334.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ISO4217CurrencyCode.java Fri Jul 16 11:47:36 2010 -0400
1334.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ISO4217CurrencyCode.java Fri Jul 16 14:21:50 2010 -0400
1334.3 @@ -1,7 +1,10 @@
1334.4 /*
1334.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1334.6 *
1334.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1334.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1334.9 + *
1334.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1334.11 + * Other names may be trademarks of their respective owners.
1334.12 *
1334.13 * The contents of this file are subject to the terms of either the GNU
1334.14 * General Public License Version 2 only ("GPL") or the Common
1334.15 @@ -13,9 +16,9 @@
1334.16 * specific language governing permissions and limitations under the
1334.17 * License. When distributing the software, include this License Header
1334.18 * Notice in each file and include the License file at
1334.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1334.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1334.21 * particular file as subject to the "Classpath" exception as provided
1334.22 - * by Sun in the GPL Version 2 section of the License file that
1334.23 + * by Oracle in the GPL Version 2 section of the License file that
1334.24 * accompanied this code. If applicable, add the following below the
1334.25 * License Header, with the fields enclosed by brackets [] replaced by
1334.26 * your own identifying information:
1335.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/IntegerConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1335.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/IntegerConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1335.3 @@ -1,7 +1,10 @@
1335.4 /*
1335.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1335.6 *
1335.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1335.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1335.9 + *
1335.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1335.11 + * Other names may be trademarks of their respective owners.
1335.12 *
1335.13 * The contents of this file are subject to the terms of either the GNU
1335.14 * General Public License Version 2 only ("GPL") or the Common
1335.15 @@ -13,9 +16,9 @@
1335.16 * specific language governing permissions and limitations under the
1335.17 * License. When distributing the software, include this License Header
1335.18 * Notice in each file and include the License file at
1335.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1335.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1335.21 * particular file as subject to the "Classpath" exception as provided
1335.22 - * by Sun in the GPL Version 2 section of the License file that
1335.23 + * by Oracle in the GPL Version 2 section of the License file that
1335.24 * accompanied this code. If applicable, add the following below the
1335.25 * License Header, with the fields enclosed by brackets [] replaced by
1335.26 * your own identifying information:
1336.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/LongConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1336.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/LongConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1336.3 @@ -1,7 +1,10 @@
1336.4 /*
1336.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1336.6 *
1336.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1336.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1336.9 + *
1336.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1336.11 + * Other names may be trademarks of their respective owners.
1336.12 *
1336.13 * The contents of this file are subject to the terms of either the GNU
1336.14 * General Public License Version 2 only ("GPL") or the Common
1336.15 @@ -13,9 +16,9 @@
1336.16 * specific language governing permissions and limitations under the
1336.17 * License. When distributing the software, include this License Header
1336.18 * Notice in each file and include the License file at
1336.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1336.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1336.21 * particular file as subject to the "Classpath" exception as provided
1336.22 - * by Sun in the GPL Version 2 section of the License file that
1336.23 + * by Oracle in the GPL Version 2 section of the License file that
1336.24 * accompanied this code. If applicable, add the following below the
1336.25 * License Header, with the fields enclosed by brackets [] replaced by
1336.26 * your own identifying information:
1337.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1337.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1337.3 @@ -1,7 +1,10 @@
1337.4 /*
1337.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1337.6 *
1337.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1337.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1337.9 + *
1337.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1337.11 + * Other names may be trademarks of their respective owners.
1337.12 *
1337.13 * The contents of this file are subject to the terms of either the GNU
1337.14 * General Public License Version 2 only ("GPL") or the Common
1337.15 @@ -13,9 +16,9 @@
1337.16 * specific language governing permissions and limitations under the
1337.17 * License. When distributing the software, include this License Header
1337.18 * Notice in each file and include the License file at
1337.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1337.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1337.21 * particular file as subject to the "Classpath" exception as provided
1337.22 - * by Sun in the GPL Version 2 section of the License file that
1337.23 + * by Oracle in the GPL Version 2 section of the License file that
1337.24 * accompanied this code. If applicable, add the following below the
1337.25 * License Header, with the fields enclosed by brackets [] replaced by
1337.26 * your own identifying information:
1338.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizer.java Fri Jul 16 11:47:36 2010 -0400
1338.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizer.java Fri Jul 16 14:21:50 2010 -0400
1338.3 @@ -1,7 +1,10 @@
1338.4 /*
1338.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1338.6 *
1338.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1338.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1338.9 + *
1338.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1338.11 + * Other names may be trademarks of their respective owners.
1338.12 *
1338.13 * The contents of this file are subject to the terms of either the GNU
1338.14 * General Public License Version 2 only ("GPL") or the Common
1338.15 @@ -13,9 +16,9 @@
1338.16 * specific language governing permissions and limitations under the
1338.17 * License. When distributing the software, include this License Header
1338.18 * Notice in each file and include the License file at
1338.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1338.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1338.21 * particular file as subject to the "Classpath" exception as provided
1338.22 - * by Sun in the GPL Version 2 section of the License file that
1338.23 + * by Oracle in the GPL Version 2 section of the License file that
1338.24 * accompanied this code. If applicable, add the following below the
1338.25 * License Header, with the fields enclosed by brackets [] replaced by
1338.26 * your own identifying information:
1339.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1339.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1339.3 @@ -1,7 +1,10 @@
1339.4 /*
1339.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1339.6 *
1339.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1339.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1339.9 + *
1339.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1339.11 + * Other names may be trademarks of their respective owners.
1339.12 *
1339.13 * The contents of this file are subject to the terms of either the GNU
1339.14 * General Public License Version 2 only ("GPL") or the Common
1339.15 @@ -13,9 +16,9 @@
1339.16 * specific language governing permissions and limitations under the
1339.17 * License. When distributing the software, include this License Header
1339.18 * Notice in each file and include the License file at
1339.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1339.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1339.21 * particular file as subject to the "Classpath" exception as provided
1339.22 - * by Sun in the GPL Version 2 section of the License file that
1339.23 + * by Oracle in the GPL Version 2 section of the License file that
1339.24 * accompanied this code. If applicable, add the following below the
1339.25 * License Header, with the fields enclosed by brackets [] replaced by
1339.26 * your own identifying information:
1340.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizerPanel.java Fri Jul 16 11:47:36 2010 -0400
1340.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterCustomizerPanel.java Fri Jul 16 14:21:50 2010 -0400
1340.3 @@ -1,7 +1,10 @@
1340.4 /*
1340.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1340.6 *
1340.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1340.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1340.9 + *
1340.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1340.11 + * Other names may be trademarks of their respective owners.
1340.12 *
1340.13 * The contents of this file are subject to the terms of either the GNU
1340.14 * General Public License Version 2 only ("GPL") or the Common
1340.15 @@ -13,9 +16,9 @@
1340.16 * specific language governing permissions and limitations under the
1340.17 * License. When distributing the software, include this License Header
1340.18 * Notice in each file and include the License file at
1340.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1340.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1340.21 * particular file as subject to the "Classpath" exception as provided
1340.22 - * by Sun in the GPL Version 2 section of the License file that
1340.23 + * by Oracle in the GPL Version 2 section of the License file that
1340.24 * accompanied this code. If applicable, add the following below the
1340.25 * License Header, with the fields enclosed by brackets [] replaced by
1340.26 * your own identifying information:
1341.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1341.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1341.3 @@ -1,7 +1,10 @@
1341.4 /*
1341.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1341.6 *
1341.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1341.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1341.9 + *
1341.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1341.11 + * Other names may be trademarks of their respective owners.
1341.12 *
1341.13 * The contents of this file are subject to the terms of either the GNU
1341.14 * General Public License Version 2 only ("GPL") or the Common
1341.15 @@ -13,9 +16,9 @@
1341.16 * specific language governing permissions and limitations under the
1341.17 * License. When distributing the software, include this License Header
1341.18 * Notice in each file and include the License file at
1341.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1341.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1341.21 * particular file as subject to the "Classpath" exception as provided
1341.22 - * by Sun in the GPL Version 2 section of the License file that
1341.23 + * by Oracle in the GPL Version 2 section of the License file that
1341.24 * accompanied this code. If applicable, add the following below the
1341.25 * License Header, with the fields enclosed by brackets [] replaced by
1341.26 * your own identifying information:
1342.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterTypePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1342.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberConverterTypePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1342.3 @@ -1,7 +1,10 @@
1342.4 /*
1342.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1342.6 *
1342.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1342.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1342.9 + *
1342.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1342.11 + * Other names may be trademarks of their respective owners.
1342.12 *
1342.13 * The contents of this file are subject to the terms of either the GNU
1342.14 * General Public License Version 2 only ("GPL") or the Common
1342.15 @@ -13,9 +16,9 @@
1342.16 * specific language governing permissions and limitations under the
1342.17 * License. When distributing the software, include this License Header
1342.18 * Notice in each file and include the License file at
1342.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1342.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1342.21 * particular file as subject to the "Classpath" exception as provided
1342.22 - * by Sun in the GPL Version 2 section of the License file that
1342.23 + * by Oracle in the GPL Version 2 section of the License file that
1342.24 * accompanied this code. If applicable, add the following below the
1342.25 * License Header, with the fields enclosed by brackets [] replaced by
1342.26 * your own identifying information:
1343.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberPatternPanel.java Fri Jul 16 11:47:36 2010 -0400
1343.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberPatternPanel.java Fri Jul 16 14:21:50 2010 -0400
1343.3 @@ -1,7 +1,10 @@
1343.4 /*
1343.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1343.6 *
1343.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1343.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1343.9 + *
1343.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1343.11 + * Other names may be trademarks of their respective owners.
1343.12 *
1343.13 * The contents of this file are subject to the terms of either the GNU
1343.14 * General Public License Version 2 only ("GPL") or the Common
1343.15 @@ -13,9 +16,9 @@
1343.16 * specific language governing permissions and limitations under the
1343.17 * License. When distributing the software, include this License Header
1343.18 * Notice in each file and include the License file at
1343.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1343.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1343.21 * particular file as subject to the "Classpath" exception as provided
1343.22 - * by Sun in the GPL Version 2 section of the License file that
1343.23 + * by Oracle in the GPL Version 2 section of the License file that
1343.24 * accompanied this code. If applicable, add the following below the
1343.25 * License Header, with the fields enclosed by brackets [] replaced by
1343.26 * your own identifying information:
1344.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberPatternPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1344.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/NumberPatternPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1344.3 @@ -1,7 +1,10 @@
1344.4 /*
1344.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1344.6 *
1344.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1344.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1344.9 + *
1344.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1344.11 + * Other names may be trademarks of their respective owners.
1344.12 *
1344.13 * The contents of this file are subject to the terms of either the GNU
1344.14 * General Public License Version 2 only ("GPL") or the Common
1344.15 @@ -13,9 +16,9 @@
1344.16 * specific language governing permissions and limitations under the
1344.17 * License. When distributing the software, include this License Header
1344.18 * Notice in each file and include the License file at
1344.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1344.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1344.21 * particular file as subject to the "Classpath" exception as provided
1344.22 - * by Sun in the GPL Version 2 section of the License file that
1344.23 + * by Oracle in the GPL Version 2 section of the License file that
1344.24 * accompanied this code. If applicable, add the following below the
1344.25 * License Header, with the fields enclosed by brackets [] replaced by
1344.26 * your own identifying information:
1345.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ShortConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1345.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/ShortConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1345.3 @@ -1,7 +1,10 @@
1345.4 /*
1345.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1345.6 *
1345.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1345.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1345.9 + *
1345.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1345.11 + * Other names may be trademarks of their respective owners.
1345.12 *
1345.13 * The contents of this file are subject to the terms of either the GNU
1345.14 * General Public License Version 2 only ("GPL") or the Common
1345.15 @@ -13,9 +16,9 @@
1345.16 * specific language governing permissions and limitations under the
1345.17 * License. When distributing the software, include this License Header
1345.18 * Notice in each file and include the License file at
1345.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1345.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1345.21 * particular file as subject to the "Classpath" exception as provided
1345.22 - * by Sun in the GPL Version 2 section of the License file that
1345.23 + * by Oracle in the GPL Version 2 section of the License file that
1345.24 * accompanied this code. If applicable, add the following below the
1345.25 * License Header, with the fields enclosed by brackets [] replaced by
1345.26 * your own identifying information:
1346.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlDateConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1346.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlDateConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1346.3 @@ -1,7 +1,10 @@
1346.4 /*
1346.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1346.6 *
1346.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1346.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1346.9 + *
1346.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1346.11 + * Other names may be trademarks of their respective owners.
1346.12 *
1346.13 * The contents of this file are subject to the terms of either the GNU
1346.14 * General Public License Version 2 only ("GPL") or the Common
1346.15 @@ -13,9 +16,9 @@
1346.16 * specific language governing permissions and limitations under the
1346.17 * License. When distributing the software, include this License Header
1346.18 * Notice in each file and include the License file at
1346.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1346.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1346.21 * particular file as subject to the "Classpath" exception as provided
1346.22 - * by Sun in the GPL Version 2 section of the License file that
1346.23 + * by Oracle in the GPL Version 2 section of the License file that
1346.24 * accompanied this code. If applicable, add the following below the
1346.25 * License Header, with the fields enclosed by brackets [] replaced by
1346.26 * your own identifying information:
1347.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlTimeConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1347.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlTimeConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1347.3 @@ -1,7 +1,10 @@
1347.4 /*
1347.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1347.6 *
1347.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1347.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1347.9 + *
1347.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1347.11 + * Other names may be trademarks of their respective owners.
1347.12 *
1347.13 * The contents of this file are subject to the terms of either the GNU
1347.14 * General Public License Version 2 only ("GPL") or the Common
1347.15 @@ -13,9 +16,9 @@
1347.16 * specific language governing permissions and limitations under the
1347.17 * License. When distributing the software, include this License Header
1347.18 * Notice in each file and include the License file at
1347.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1347.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1347.21 * particular file as subject to the "Classpath" exception as provided
1347.22 - * by Sun in the GPL Version 2 section of the License file that
1347.23 + * by Oracle in the GPL Version 2 section of the License file that
1347.24 * accompanied this code. If applicable, add the following below the
1347.25 * License Header, with the fields enclosed by brackets [] replaced by
1347.26 * your own identifying information:
1348.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlTimestampConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1348.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/converter/SqlTimestampConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1348.3 @@ -1,7 +1,10 @@
1348.4 /*
1348.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1348.6 *
1348.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1348.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1348.9 + *
1348.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1348.11 + * Other names may be trademarks of their respective owners.
1348.12 *
1348.13 * The contents of this file are subject to the terms of either the GNU
1348.14 * General Public License Version 2 only ("GPL") or the Common
1348.15 @@ -13,9 +16,9 @@
1348.16 * specific language governing permissions and limitations under the
1348.17 * License. When distributing the software, include this License Header
1348.18 * Notice in each file and include the License file at
1348.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1348.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1348.21 * particular file as subject to the "Classpath" exception as provided
1348.22 - * by Sun in the GPL Version 2 section of the License file that
1348.23 + * by Oracle in the GPL Version 2 section of the License file that
1348.24 * accompanied this code. If applicable, add the following below the
1348.25 * License Header, with the fields enclosed by brackets [] replaced by
1348.26 * your own identifying information:
1349.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/BoundRowSetColumnPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1349.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/BoundRowSetColumnPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1349.3 @@ -1,7 +1,10 @@
1349.4 /*
1349.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1349.6 *
1349.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1349.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1349.9 + *
1349.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1349.11 + * Other names may be trademarks of their respective owners.
1349.12 *
1349.13 * The contents of this file are subject to the terms of either the GNU
1349.14 * General Public License Version 2 only ("GPL") or the Common
1349.15 @@ -13,9 +16,9 @@
1349.16 * specific language governing permissions and limitations under the
1349.17 * License. When distributing the software, include this License Header
1349.18 * Notice in each file and include the License file at
1349.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1349.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1349.21 * particular file as subject to the "Classpath" exception as provided
1349.22 - * by Sun in the GPL Version 2 section of the License file that
1349.23 + * by Oracle in the GPL Version 2 section of the License file that
1349.24 * accompanied this code. If applicable, add the following below the
1349.25 * License Header, with the fields enclosed by brackets [] replaced by
1349.26 * your own identifying information:
1350.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/CachedRowSetDataModelBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1350.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/CachedRowSetDataModelBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1350.3 @@ -1,7 +1,10 @@
1350.4 /*
1350.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1350.6 *
1350.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1350.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1350.9 + *
1350.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1350.11 + * Other names may be trademarks of their respective owners.
1350.12 *
1350.13 * The contents of this file are subject to the terms of either the GNU
1350.14 * General Public License Version 2 only ("GPL") or the Common
1350.15 @@ -13,9 +16,9 @@
1350.16 * specific language governing permissions and limitations under the
1350.17 * License. When distributing the software, include this License Header
1350.18 * Notice in each file and include the License file at
1350.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1350.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1350.21 * particular file as subject to the "Classpath" exception as provided
1350.22 - * by Sun in the GPL Version 2 section of the License file that
1350.23 + * by Oracle in the GPL Version 2 section of the License file that
1350.24 * accompanied this code. If applicable, add the following below the
1350.25 * License Header, with the fields enclosed by brackets [] replaced by
1350.26 * your own identifying information:
1351.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ConcurrencyPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1351.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ConcurrencyPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1351.3 @@ -1,7 +1,10 @@
1351.4 /*
1351.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1351.6 *
1351.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1351.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1351.9 + *
1351.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1351.11 + * Other names may be trademarks of their respective owners.
1351.12 *
1351.13 * The contents of this file are subject to the terms of either the GNU
1351.14 * General Public License Version 2 only ("GPL") or the Common
1351.15 @@ -13,9 +16,9 @@
1351.16 * specific language governing permissions and limitations under the
1351.17 * License. When distributing the software, include this License Header
1351.18 * Notice in each file and include the License file at
1351.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1351.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1351.21 * particular file as subject to the "Classpath" exception as provided
1351.22 - * by Sun in the GPL Version 2 section of the License file that
1351.23 + * by Oracle in the GPL Version 2 section of the License file that
1351.24 * accompanied this code. If applicable, add the following below the
1351.25 * License Header, with the fields enclosed by brackets [] replaced by
1351.26 * your own identifying information:
1352.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DataSourceNamePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1352.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DataSourceNamePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1352.3 @@ -1,7 +1,10 @@
1352.4 /*
1352.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1352.6 *
1352.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1352.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1352.9 + *
1352.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1352.11 + * Other names may be trademarks of their respective owners.
1352.12 *
1352.13 * The contents of this file are subject to the terms of either the GNU
1352.14 * General Public License Version 2 only ("GPL") or the Common
1352.15 @@ -13,9 +16,9 @@
1352.16 * specific language governing permissions and limitations under the
1352.17 * License. When distributing the software, include this License Header
1352.18 * Notice in each file and include the License file at
1352.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1352.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1352.21 * particular file as subject to the "Classpath" exception as provided
1352.22 - * by Sun in the GPL Version 2 section of the License file that
1352.23 + * by Oracle in the GPL Version 2 section of the License file that
1352.24 * accompanied this code. If applicable, add the following below the
1352.25 * License Header, with the fields enclosed by brackets [] replaced by
1352.26 * your own identifying information:
1353.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DefaultSelectItemsArrayBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1353.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DefaultSelectItemsArrayBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1353.3 @@ -1,7 +1,10 @@
1353.4 /*
1353.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1353.6 *
1353.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1353.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1353.9 + *
1353.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1353.11 + * Other names may be trademarks of their respective owners.
1353.12 *
1353.13 * The contents of this file are subject to the terms of either the GNU
1353.14 * General Public License Version 2 only ("GPL") or the Common
1353.15 @@ -13,9 +16,9 @@
1353.16 * specific language governing permissions and limitations under the
1353.17 * License. When distributing the software, include this License Header
1353.18 * Notice in each file and include the License file at
1353.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1353.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1353.21 * particular file as subject to the "Classpath" exception as provided
1353.22 - * by Sun in the GPL Version 2 section of the License file that
1353.23 + * by Oracle in the GPL Version 2 section of the License file that
1353.24 * accompanied this code. If applicable, add the following below the
1353.25 * License Header, with the fields enclosed by brackets [] replaced by
1353.26 * your own identifying information:
1354.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DefaultTableDataModelBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1354.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/DefaultTableDataModelBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1354.3 @@ -1,7 +1,10 @@
1354.4 /*
1354.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1354.6 *
1354.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1354.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1354.9 + *
1354.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1354.11 + * Other names may be trademarks of their respective owners.
1354.12 *
1354.13 * The contents of this file are subject to the terms of either the GNU
1354.14 * General Public License Version 2 only ("GPL") or the Common
1354.15 @@ -13,9 +16,9 @@
1354.16 * specific language governing permissions and limitations under the
1354.17 * License. When distributing the software, include this License Header
1354.18 * Notice in each file and include the License file at
1354.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1354.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1354.21 * particular file as subject to the "Classpath" exception as provided
1354.22 - * by Sun in the GPL Version 2 section of the License file that
1354.23 + * by Oracle in the GPL Version 2 section of the License file that
1354.24 * accompanied this code. If applicable, add the following below the
1354.25 * License Header, with the fields enclosed by brackets [] replaced by
1354.26 * your own identifying information:
1355.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/HoldabilityPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1355.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/HoldabilityPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1355.3 @@ -1,7 +1,10 @@
1355.4 /*
1355.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1355.6 *
1355.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1355.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1355.9 + *
1355.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1355.11 + * Other names may be trademarks of their respective owners.
1355.12 *
1355.13 * The contents of this file are subject to the terms of either the GNU
1355.14 * General Public License Version 2 only ("GPL") or the Common
1355.15 @@ -13,9 +16,9 @@
1355.16 * specific language governing permissions and limitations under the
1355.17 * License. When distributing the software, include this License Header
1355.18 * Notice in each file and include the License file at
1355.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1355.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1355.21 * particular file as subject to the "Classpath" exception as provided
1355.22 - * by Sun in the GPL Version 2 section of the License file that
1355.23 + * by Oracle in the GPL Version 2 section of the License file that
1355.24 * accompanied this code. If applicable, add the following below the
1355.25 * License Header, with the fields enclosed by brackets [] replaced by
1355.26 * your own identifying information:
1356.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ItemsRowSetColumnPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1356.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ItemsRowSetColumnPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1356.3 @@ -1,7 +1,10 @@
1356.4 /*
1356.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1356.6 *
1356.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1356.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1356.9 + *
1356.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1356.11 + * Other names may be trademarks of their respective owners.
1356.12 *
1356.13 * The contents of this file are subject to the terms of either the GNU
1356.14 * General Public License Version 2 only ("GPL") or the Common
1356.15 @@ -13,9 +16,9 @@
1356.16 * specific language governing permissions and limitations under the
1356.17 * License. When distributing the software, include this License Header
1356.18 * Notice in each file and include the License file at
1356.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1356.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1356.21 * particular file as subject to the "Classpath" exception as provided
1356.22 - * by Sun in the GPL Version 2 section of the License file that
1356.23 + * by Oracle in the GPL Version 2 section of the License file that
1356.24 * accompanied this code. If applicable, add the following below the
1356.25 * License Header, with the fields enclosed by brackets [] replaced by
1356.26 * your own identifying information:
1357.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ResultSetDataModelBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1357.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/ResultSetDataModelBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1357.3 @@ -1,7 +1,10 @@
1357.4 /*
1357.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1357.6 *
1357.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1357.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1357.9 + *
1357.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1357.11 + * Other names may be trademarks of their respective owners.
1357.12 *
1357.13 * The contents of this file are subject to the terms of either the GNU
1357.14 * General Public License Version 2 only ("GPL") or the Common
1357.15 @@ -13,9 +16,9 @@
1357.16 * specific language governing permissions and limitations under the
1357.17 * License. When distributing the software, include this License Header
1357.18 * Notice in each file and include the License file at
1357.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1357.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1357.21 * particular file as subject to the "Classpath" exception as provided
1357.22 - * by Sun in the GPL Version 2 section of the License file that
1357.23 + * by Oracle in the GPL Version 2 section of the License file that
1357.24 * accompanied this code. If applicable, add the following below the
1357.25 * License Header, with the fields enclosed by brackets [] replaced by
1357.26 * your own identifying information:
1358.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/RowSetDataModelBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1358.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/RowSetDataModelBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1358.3 @@ -1,7 +1,10 @@
1358.4 /*
1358.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1358.6 *
1358.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1358.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1358.9 + *
1358.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1358.11 + * Other names may be trademarks of their respective owners.
1358.12 *
1358.13 * The contents of this file are subject to the terms of either the GNU
1358.14 * General Public License Version 2 only ("GPL") or the Common
1358.15 @@ -13,9 +16,9 @@
1358.16 * specific language governing permissions and limitations under the
1358.17 * License. When distributing the software, include this License Header
1358.18 * Notice in each file and include the License file at
1358.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1358.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1358.21 * particular file as subject to the "Classpath" exception as provided
1358.22 - * by Sun in the GPL Version 2 section of the License file that
1358.23 + * by Oracle in the GPL Version 2 section of the License file that
1358.24 * accompanied this code. If applicable, add the following below the
1358.25 * License Header, with the fields enclosed by brackets [] replaced by
1358.26 * your own identifying information:
1359.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/RowSetPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1359.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/RowSetPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1359.3 @@ -1,7 +1,10 @@
1359.4 /*
1359.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1359.6 *
1359.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1359.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1359.9 + *
1359.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1359.11 + * Other names may be trademarks of their respective owners.
1359.12 *
1359.13 * The contents of this file are subject to the terms of either the GNU
1359.14 * General Public License Version 2 only ("GPL") or the Common
1359.15 @@ -13,9 +16,9 @@
1359.16 * specific language governing permissions and limitations under the
1359.17 * License. When distributing the software, include this License Header
1359.18 * Notice in each file and include the License file at
1359.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1359.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1359.21 * particular file as subject to the "Classpath" exception as provided
1359.22 - * by Sun in the GPL Version 2 section of the License file that
1359.23 + * by Oracle in the GPL Version 2 section of the License file that
1359.24 * accompanied this code. If applicable, add the following below the
1359.25 * License Header, with the fields enclosed by brackets [] replaced by
1359.26 * your own identifying information:
1360.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/TransactionIsolationPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1360.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/TransactionIsolationPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1360.3 @@ -1,7 +1,10 @@
1360.4 /*
1360.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1360.6 *
1360.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1360.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1360.9 + *
1360.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1360.11 + * Other names may be trademarks of their respective owners.
1360.12 *
1360.13 * The contents of this file are subject to the terms of either the GNU
1360.14 * General Public License Version 2 only ("GPL") or the Common
1360.15 @@ -13,9 +16,9 @@
1360.16 * specific language governing permissions and limitations under the
1360.17 * License. When distributing the software, include this License Header
1360.18 * Notice in each file and include the License file at
1360.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1360.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1360.21 * particular file as subject to the "Classpath" exception as provided
1360.22 - * by Sun in the GPL Version 2 section of the License file that
1360.23 + * by Oracle in the GPL Version 2 section of the License file that
1360.24 * accompanied this code. If applicable, add the following below the
1360.25 * License Header, with the fields enclosed by brackets [] replaced by
1360.26 * your own identifying information:
1361.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/TypePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1361.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/data/TypePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1361.3 @@ -1,7 +1,10 @@
1361.4 /*
1361.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1361.6 *
1361.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1361.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1361.9 + *
1361.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1361.11 + * Other names may be trademarks of their respective owners.
1361.12 *
1361.13 * The contents of this file are subject to the terms of either the GNU
1361.14 * General Public License Version 2 only ("GPL") or the Common
1361.15 @@ -13,9 +16,9 @@
1361.16 * specific language governing permissions and limitations under the
1361.17 * License. When distributing the software, include this License Header
1361.18 * Notice in each file and include the License file at
1361.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1361.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1361.21 * particular file as subject to the "Classpath" exception as provided
1361.22 - * by Sun in the GPL Version 2 section of the License file that
1361.23 + * by Oracle in the GPL Version 2 section of the License file that
1361.24 * accompanied this code. If applicable, add the following below the
1361.25 * License Header, with the fields enclosed by brackets [] replaced by
1361.26 * your own identifying information:
1362.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/lifecycle/CreatorLifeCycleBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1362.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/lifecycle/CreatorLifeCycleBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1362.3 @@ -1,7 +1,10 @@
1362.4 /*
1362.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1362.6 *
1362.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1362.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1362.9 + *
1362.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1362.11 + * Other names may be trademarks of their respective owners.
1362.12 *
1362.13 * The contents of this file are subject to the terms of either the GNU
1362.14 * General Public License Version 2 only ("GPL") or the Common
1362.15 @@ -13,9 +16,9 @@
1362.16 * specific language governing permissions and limitations under the
1362.17 * License. When distributing the software, include this License Header
1362.18 * Notice in each file and include the License file at
1362.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1362.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1362.21 * particular file as subject to the "Classpath" exception as provided
1362.22 - * by Sun in the GPL Version 2 section of the License file that
1362.23 + * by Oracle in the GPL Version 2 section of the License file that
1362.24 * accompanied this code. If applicable, add the following below the
1362.25 * License Header, with the fields enclosed by brackets [] replaced by
1362.26 * your own identifying information:
1363.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/AbstractDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
1363.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/AbstractDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
1363.3 @@ -1,7 +1,10 @@
1363.4 /*
1363.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1363.6 *
1363.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1363.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1363.9 + *
1363.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1363.11 + * Other names may be trademarks of their respective owners.
1363.12 *
1363.13 * The contents of this file are subject to the terms of either the GNU
1363.14 * General Public License Version 2 only ("GPL") or the Common
1363.15 @@ -13,9 +16,9 @@
1363.16 * specific language governing permissions and limitations under the
1363.17 * License. When distributing the software, include this License Header
1363.18 * Notice in each file and include the License file at
1363.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1363.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1363.21 * particular file as subject to the "Classpath" exception as provided
1363.22 - * by Sun in the GPL Version 2 section of the License file that
1363.23 + * by Oracle in the GPL Version 2 section of the License file that
1363.24 * accompanied this code. If applicable, add the following below the
1363.25 * License Header, with the fields enclosed by brackets [] replaced by
1363.26 * your own identifying information:
1364.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1364.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1364.3 @@ -1,7 +1,10 @@
1364.4 # -----------------------------------------------------------------------------
1364.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1364.6 #
1364.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1364.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1364.9 +#
1364.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1364.11 +# Other names may be trademarks of their respective owners.
1364.12 #
1364.13 # The contents of this file are subject to the terms of either the GNU
1364.14 # General Public License Version 2 only ("GPL") or the Common
1364.15 @@ -13,9 +16,9 @@
1364.16 # specific language governing permissions and limitations under the
1364.17 # License. When distributing the software, include this License Header
1364.18 # Notice in each file and include the License file at
1364.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1364.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1364.21 # particular file as subject to the "Classpath" exception as provided
1364.22 -# by Sun in the GPL Version 2 section of the License file that
1364.23 +# by Oracle in the GPL Version 2 section of the License file that
1364.24 # accompanied this code. If applicable, add the following below the
1364.25 # License Header, with the fields enclosed by brackets [] replaced by
1364.26 # your own identifying information:
1365.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/MessageDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
1365.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/MessageDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
1365.3 @@ -1,7 +1,10 @@
1365.4 /*
1365.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1365.6 *
1365.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1365.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1365.9 + *
1365.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1365.11 + * Other names may be trademarks of their respective owners.
1365.12 *
1365.13 * The contents of this file are subject to the terms of either the GNU
1365.14 * General Public License Version 2 only ("GPL") or the Common
1365.15 @@ -13,9 +16,9 @@
1365.16 * specific language governing permissions and limitations under the
1365.17 * License. When distributing the software, include this License Header
1365.18 * Notice in each file and include the License file at
1365.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1365.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1365.21 * particular file as subject to the "Classpath" exception as provided
1365.22 - * by Sun in the GPL Version 2 section of the License file that
1365.23 + * by Oracle in the GPL Version 2 section of the License file that
1365.24 * accompanied this code. If applicable, add the following below the
1365.25 * License Header, with the fields enclosed by brackets [] replaced by
1365.26 * your own identifying information:
1366.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/MessagesDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
1366.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/MessagesDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
1366.3 @@ -1,7 +1,10 @@
1366.4 /*
1366.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1366.6 *
1366.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1366.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1366.9 + *
1366.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1366.11 + * Other names may be trademarks of their respective owners.
1366.12 *
1366.13 * The contents of this file are subject to the terms of either the GNU
1366.14 * General Public License Version 2 only ("GPL") or the Common
1366.15 @@ -13,9 +16,9 @@
1366.16 * specific language governing permissions and limitations under the
1366.17 * License. When distributing the software, include this License Header
1366.18 * Notice in each file and include the License file at
1366.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1366.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1366.21 * particular file as subject to the "Classpath" exception as provided
1366.22 - * by Sun in the GPL Version 2 section of the License file that
1366.23 + * by Oracle in the GPL Version 2 section of the License file that
1366.24 * accompanied this code. If applicable, add the following below the
1366.25 * License Header, with the fields enclosed by brackets [] replaced by
1366.26 * your own identifying information:
1367.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/TextDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
1367.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/renderer/TextDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
1367.3 @@ -1,7 +1,10 @@
1367.4 /*
1367.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1367.6 *
1367.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1367.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1367.9 + *
1367.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1367.11 + * Other names may be trademarks of their respective owners.
1367.12 *
1367.13 * The contents of this file are subject to the terms of either the GNU
1367.14 * General Public License Version 2 only ("GPL") or the Common
1367.15 @@ -13,9 +16,9 @@
1367.16 * specific language governing permissions and limitations under the
1367.17 * License. When distributing the software, include this License Header
1367.18 * Notice in each file and include the License file at
1367.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1367.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1367.21 * particular file as subject to the "Classpath" exception as provided
1367.22 - * by Sun in the GPL Version 2 section of the License file that
1367.23 + * by Oracle in the GPL Version 2 section of the License file that
1367.24 * accompanied this code. If applicable, add the following below the
1367.25 * License Header, with the fields enclosed by brackets [] replaced by
1367.26 * your own identifying information:
1368.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1368.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1368.3 @@ -1,6 +1,9 @@
1368.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1368.5 #
1368.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1368.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1368.8 +#
1368.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1368.10 +# Other names may be trademarks of their respective owners.
1368.11 #
1368.12 # The contents of this file are subject to the terms of either the GNU
1368.13 # General Public License Version 2 only ("GPL") or the Common
1368.14 @@ -12,9 +15,9 @@
1368.15 # specific language governing permissions and limitations under the
1368.16 # License. When distributing the software, include this License Header
1368.17 # Notice in each file and include the License file at
1368.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1368.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1368.20 # particular file as subject to the "Classpath" exception as provided
1368.21 -# by Sun in the GPL Version 2 section of the License file that
1368.22 +# by Oracle in the GPL Version 2 section of the License file that
1368.23 # accompanied this code. If applicable, add the following below the
1368.24 # License Header, with the fields enclosed by brackets [] replaced by
1368.25 # your own identifying information:
1369.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingCustomizer.java Fri Jul 16 11:47:36 2010 -0400
1369.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingCustomizer.java Fri Jul 16 14:21:50 2010 -0400
1369.3 @@ -1,7 +1,10 @@
1369.4 /*
1369.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1369.6 *
1369.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1369.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1369.9 + *
1369.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1369.11 + * Other names may be trademarks of their respective owners.
1369.12 *
1369.13 * The contents of this file are subject to the terms of either the GNU
1369.14 * General Public License Version 2 only ("GPL") or the Common
1369.15 @@ -13,9 +16,9 @@
1369.16 * specific language governing permissions and limitations under the
1369.17 * License. When distributing the software, include this License Header
1369.18 * Notice in each file and include the License file at
1369.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1369.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1369.21 * particular file as subject to the "Classpath" exception as provided
1369.22 - * by Sun in the GPL Version 2 section of the License file that
1369.23 + * by Oracle in the GPL Version 2 section of the License file that
1369.24 * accompanied this code. If applicable, add the following below the
1369.25 * License Header, with the fields enclosed by brackets [] replaced by
1369.26 * your own identifying information:
1370.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1370.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1370.3 @@ -1,7 +1,10 @@
1370.4 /*
1370.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1370.6 *
1370.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1370.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1370.9 + *
1370.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1370.11 + * Other names may be trademarks of their respective owners.
1370.12 *
1370.13 * The contents of this file are subject to the terms of either the GNU
1370.14 * General Public License Version 2 only ("GPL") or the Common
1370.15 @@ -13,9 +16,9 @@
1370.16 * specific language governing permissions and limitations under the
1370.17 * License. When distributing the software, include this License Header
1370.18 * Notice in each file and include the License file at
1370.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1370.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1370.21 * particular file as subject to the "Classpath" exception as provided
1370.22 - * by Sun in the GPL Version 2 section of the License file that
1370.23 + * by Oracle in the GPL Version 2 section of the License file that
1370.24 * accompanied this code. If applicable, add the following below the
1370.25 * License Header, with the fields enclosed by brackets [] replaced by
1370.26 * your own identifying information:
1371.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingPanel.java Fri Jul 16 11:47:36 2010 -0400
1371.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ColumnDataBindingPanel.java Fri Jul 16 14:21:50 2010 -0400
1371.3 @@ -1,7 +1,10 @@
1371.4 /*
1371.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1371.6 *
1371.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1371.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1371.9 + *
1371.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1371.11 + * Other names may be trademarks of their respective owners.
1371.12 *
1371.13 * The contents of this file are subject to the terms of either the GNU
1371.14 * General Public License Version 2 only ("GPL") or the Common
1371.15 @@ -13,9 +16,9 @@
1371.16 * specific language governing permissions and limitations under the
1371.17 * License. When distributing the software, include this License Header
1371.18 * Notice in each file and include the License file at
1371.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1371.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1371.21 * particular file as subject to the "Classpath" exception as provided
1371.22 - * by Sun in the GPL Version 2 section of the License file that
1371.23 + * by Oracle in the GPL Version 2 section of the License file that
1371.24 * accompanied this code. If applicable, add the following below the
1371.25 * License Header, with the fields enclosed by brackets [] replaced by
1371.26 * your own identifying information:
1372.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingCustomizer.java Fri Jul 16 11:47:36 2010 -0400
1372.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingCustomizer.java Fri Jul 16 14:21:50 2010 -0400
1372.3 @@ -1,7 +1,10 @@
1372.4 /*
1372.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1372.6 *
1372.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1372.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1372.9 + *
1372.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1372.11 + * Other names may be trademarks of their respective owners.
1372.12 *
1372.13 * The contents of this file are subject to the terms of either the GNU
1372.14 * General Public License Version 2 only ("GPL") or the Common
1372.15 @@ -13,9 +16,9 @@
1372.16 * specific language governing permissions and limitations under the
1372.17 * License. When distributing the software, include this License Header
1372.18 * Notice in each file and include the License file at
1372.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1372.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1372.21 * particular file as subject to the "Classpath" exception as provided
1372.22 - * by Sun in the GPL Version 2 section of the License file that
1372.23 + * by Oracle in the GPL Version 2 section of the License file that
1372.24 * accompanied this code. If applicable, add the following below the
1372.25 * License Header, with the fields enclosed by brackets [] replaced by
1372.26 * your own identifying information:
1373.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1373.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1373.3 @@ -1,7 +1,10 @@
1373.4 /*
1373.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1373.6 *
1373.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1373.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1373.9 + *
1373.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1373.11 + * Other names may be trademarks of their respective owners.
1373.12 *
1373.13 * The contents of this file are subject to the terms of either the GNU
1373.14 * General Public License Version 2 only ("GPL") or the Common
1373.15 @@ -13,9 +16,9 @@
1373.16 * specific language governing permissions and limitations under the
1373.17 * License. When distributing the software, include this License Header
1373.18 * Notice in each file and include the License file at
1373.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1373.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1373.21 * particular file as subject to the "Classpath" exception as provided
1373.22 - * by Sun in the GPL Version 2 section of the License file that
1373.23 + * by Oracle in the GPL Version 2 section of the License file that
1373.24 * accompanied this code. If applicable, add the following below the
1373.25 * License Header, with the fields enclosed by brackets [] replaced by
1373.26 * your own identifying information:
1374.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingPanel.java Fri Jul 16 11:47:36 2010 -0400
1374.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/DataModelBindingPanel.java Fri Jul 16 14:21:50 2010 -0400
1374.3 @@ -1,7 +1,10 @@
1374.4 /*
1374.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1374.6 *
1374.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1374.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1374.9 + *
1374.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1374.11 + * Other names may be trademarks of their respective owners.
1374.12 *
1374.13 * The contents of this file are subject to the terms of either the GNU
1374.14 * General Public License Version 2 only ("GPL") or the Common
1374.15 @@ -13,9 +16,9 @@
1374.16 * specific language governing permissions and limitations under the
1374.17 * License. When distributing the software, include this License Header
1374.18 * Notice in each file and include the License file at
1374.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1374.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1374.21 * particular file as subject to the "Classpath" exception as provided
1374.22 - * by Sun in the GPL Version 2 section of the License file that
1374.23 + * by Oracle in the GPL Version 2 section of the License file that
1374.24 * accompanied this code. If applicable, add the following below the
1374.25 * License Header, with the fields enclosed by brackets [] replaced by
1374.26 * your own identifying information:
1375.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ObjectBindingPanel2.java Fri Jul 16 11:47:36 2010 -0400
1375.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ObjectBindingPanel2.java Fri Jul 16 14:21:50 2010 -0400
1375.3 @@ -1,7 +1,10 @@
1375.4 /*
1375.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1375.6 *
1375.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1375.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1375.9 + *
1375.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1375.11 + * Other names may be trademarks of their respective owners.
1375.12 *
1375.13 * The contents of this file are subject to the terms of either the GNU
1375.14 * General Public License Version 2 only ("GPL") or the Common
1375.15 @@ -13,9 +16,9 @@
1375.16 * specific language governing permissions and limitations under the
1375.17 * License. When distributing the software, include this License Header
1375.18 * Notice in each file and include the License file at
1375.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1375.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1375.21 * particular file as subject to the "Classpath" exception as provided
1375.22 - * by Sun in the GPL Version 2 section of the License file that
1375.23 + * by Oracle in the GPL Version 2 section of the License file that
1375.24 * accompanied this code. If applicable, add the following below the
1375.25 * License Header, with the fields enclosed by brackets [] replaced by
1375.26 * your own identifying information:
1376.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/RowDataBindingCustomizer.java Fri Jul 16 11:47:36 2010 -0400
1376.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/RowDataBindingCustomizer.java Fri Jul 16 14:21:50 2010 -0400
1376.3 @@ -1,7 +1,10 @@
1376.4 /*
1376.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1376.6 *
1376.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1376.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1376.9 + *
1376.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1376.11 + * Other names may be trademarks of their respective owners.
1376.12 *
1376.13 * The contents of this file are subject to the terms of either the GNU
1376.14 * General Public License Version 2 only ("GPL") or the Common
1376.15 @@ -13,9 +16,9 @@
1376.16 * specific language governing permissions and limitations under the
1376.17 * License. When distributing the software, include this License Header
1376.18 * Notice in each file and include the License file at
1376.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1376.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1376.21 * particular file as subject to the "Classpath" exception as provided
1376.22 - * by Sun in the GPL Version 2 section of the License file that
1376.23 + * by Oracle in the GPL Version 2 section of the License file that
1376.24 * accompanied this code. If applicable, add the following below the
1376.25 * License Header, with the fields enclosed by brackets [] replaced by
1376.26 * your own identifying information:
1377.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/RowDataBindingCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1377.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/RowDataBindingCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1377.3 @@ -1,7 +1,10 @@
1377.4 /*
1377.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1377.6 *
1377.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1377.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1377.9 + *
1377.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1377.11 + * Other names may be trademarks of their respective owners.
1377.12 *
1377.13 * The contents of this file are subject to the terms of either the GNU
1377.14 * General Public License Version 2 only ("GPL") or the Common
1377.15 @@ -13,9 +16,9 @@
1377.16 * specific language governing permissions and limitations under the
1377.17 * License. When distributing the software, include this License Header
1377.18 * Notice in each file and include the License file at
1377.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1377.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1377.21 * particular file as subject to the "Classpath" exception as provided
1377.22 - * by Sun in the GPL Version 2 section of the License file that
1377.23 + * by Oracle in the GPL Version 2 section of the License file that
1377.24 * accompanied this code. If applicable, add the following below the
1377.25 * License Header, with the fields enclosed by brackets [] replaced by
1377.26 * your own identifying information:
1378.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/RowDataBindingPanel.java Fri Jul 16 11:47:36 2010 -0400
1378.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/RowDataBindingPanel.java Fri Jul 16 14:21:50 2010 -0400
1378.3 @@ -1,7 +1,10 @@
1378.4 /*
1378.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1378.6 *
1378.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1378.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1378.9 + *
1378.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1378.11 + * Other names may be trademarks of their respective owners.
1378.12 *
1378.13 * The contents of this file are subject to the terms of either the GNU
1378.14 * General Public License Version 2 only ("GPL") or the Common
1378.15 @@ -13,9 +16,9 @@
1378.16 * specific language governing permissions and limitations under the
1378.17 * License. When distributing the software, include this License Header
1378.18 * Notice in each file and include the License file at
1378.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1378.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1378.21 * particular file as subject to the "Classpath" exception as provided
1378.22 - * by Sun in the GPL Version 2 section of the License file that
1378.23 + * by Oracle in the GPL Version 2 section of the License file that
1378.24 * accompanied this code. If applicable, add the following below the
1378.25 * License Header, with the fields enclosed by brackets [] replaced by
1378.26 * your own identifying information:
1379.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/URLCustomizer.java Fri Jul 16 11:47:36 2010 -0400
1379.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/URLCustomizer.java Fri Jul 16 14:21:50 2010 -0400
1379.3 @@ -1,7 +1,10 @@
1379.4 /*
1379.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1379.6 *
1379.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1379.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1379.9 + *
1379.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1379.11 + * Other names may be trademarks of their respective owners.
1379.12 *
1379.13 * The contents of this file are subject to the terms of either the GNU
1379.14 * General Public License Version 2 only ("GPL") or the Common
1379.15 @@ -13,9 +16,9 @@
1379.16 * specific language governing permissions and limitations under the
1379.17 * License. When distributing the software, include this License Header
1379.18 * Notice in each file and include the License file at
1379.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1379.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1379.21 * particular file as subject to the "Classpath" exception as provided
1379.22 - * by Sun in the GPL Version 2 section of the License file that
1379.23 + * by Oracle in the GPL Version 2 section of the License file that
1379.24 * accompanied this code. If applicable, add the following below the
1379.25 * License Header, with the fields enclosed by brackets [] replaced by
1379.26 * your own identifying information:
1380.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/URLCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1380.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/URLCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1380.3 @@ -1,7 +1,10 @@
1380.4 /*
1380.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1380.6 *
1380.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1380.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1380.9 + *
1380.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1380.11 + * Other names may be trademarks of their respective owners.
1380.12 *
1380.13 * The contents of this file are subject to the terms of either the GNU
1380.14 * General Public License Version 2 only ("GPL") or the Common
1380.15 @@ -13,9 +16,9 @@
1380.16 * specific language governing permissions and limitations under the
1380.17 * License. When distributing the software, include this License Header
1380.18 * Notice in each file and include the License file at
1380.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1380.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1380.21 * particular file as subject to the "Classpath" exception as provided
1380.22 - * by Sun in the GPL Version 2 section of the License file that
1380.23 + * by Oracle in the GPL Version 2 section of the License file that
1380.24 * accompanied this code. If applicable, add the following below the
1380.25 * License Header, with the fields enclosed by brackets [] replaced by
1380.26 * your own identifying information:
1381.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ValueBindingOnlyPanel.java Fri Jul 16 11:47:36 2010 -0400
1381.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ValueBindingOnlyPanel.java Fri Jul 16 14:21:50 2010 -0400
1381.3 @@ -1,7 +1,10 @@
1381.4 /*
1381.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1381.6 *
1381.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1381.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1381.9 + *
1381.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1381.11 + * Other names may be trademarks of their respective owners.
1381.12 *
1381.13 * The contents of this file are subject to the terms of either the GNU
1381.14 * General Public License Version 2 only ("GPL") or the Common
1381.15 @@ -13,9 +16,9 @@
1381.16 * specific language governing permissions and limitations under the
1381.17 * License. When distributing the software, include this License Header
1381.18 * Notice in each file and include the License file at
1381.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1381.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1381.21 * particular file as subject to the "Classpath" exception as provided
1381.22 - * by Sun in the GPL Version 2 section of the License file that
1381.23 + * by Oracle in the GPL Version 2 section of the License file that
1381.24 * accompanied this code. If applicable, add the following below the
1381.25 * License Header, with the fields enclosed by brackets [] replaced by
1381.26 * your own identifying information:
1382.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ValueBindingOnlyPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1382.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ValueBindingOnlyPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1382.3 @@ -1,7 +1,10 @@
1382.4 /*
1382.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1382.6 *
1382.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1382.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1382.9 + *
1382.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1382.11 + * Other names may be trademarks of their respective owners.
1382.12 *
1382.13 * The contents of this file are subject to the terms of either the GNU
1382.14 * General Public License Version 2 only ("GPL") or the Common
1382.15 @@ -13,9 +16,9 @@
1382.16 * specific language governing permissions and limitations under the
1382.17 * License. When distributing the software, include this License Header
1382.18 * Notice in each file and include the License file at
1382.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1382.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1382.21 * particular file as subject to the "Classpath" exception as provided
1382.22 - * by Sun in the GPL Version 2 section of the License file that
1382.23 + * by Oracle in the GPL Version 2 section of the License file that
1382.24 * accompanied this code. If applicable, add the following below the
1382.25 * License Header, with the fields enclosed by brackets [] replaced by
1382.26 * your own identifying information:
1383.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ValueBindingPanel.java Fri Jul 16 11:47:36 2010 -0400
1383.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ValueBindingPanel.java Fri Jul 16 14:21:50 2010 -0400
1383.3 @@ -1,7 +1,10 @@
1383.4 /*
1383.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1383.6 *
1383.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1383.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1383.9 + *
1383.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1383.11 + * Other names may be trademarks of their respective owners.
1383.12 *
1383.13 * The contents of this file are subject to the terms of either the GNU
1383.14 * General Public License Version 2 only ("GPL") or the Common
1383.15 @@ -13,9 +16,9 @@
1383.16 * specific language governing permissions and limitations under the
1383.17 * License. When distributing the software, include this License Header
1383.18 * Notice in each file and include the License file at
1383.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1383.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1383.21 * particular file as subject to the "Classpath" exception as provided
1383.22 - * by Sun in the GPL Version 2 section of the License file that
1383.23 + * by Oracle in the GPL Version 2 section of the License file that
1383.24 * accompanied this code. If applicable, add the following below the
1383.25 * License Header, with the fields enclosed by brackets [] replaced by
1383.26 * your own identifying information:
1384.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ValueBindingPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1384.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/ValueBindingPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1384.3 @@ -1,7 +1,10 @@
1384.4 /*
1384.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1384.6 *
1384.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1384.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1384.9 + *
1384.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1384.11 + * Other names may be trademarks of their respective owners.
1384.12 *
1384.13 * The contents of this file are subject to the terms of either the GNU
1384.14 * General Public License Version 2 only ("GPL") or the Common
1384.15 @@ -13,9 +16,9 @@
1384.16 * specific language governing permissions and limitations under the
1384.17 * License. When distributing the software, include this License Header
1384.18 * Notice in each file and include the License file at
1384.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1384.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1384.21 * particular file as subject to the "Classpath" exception as provided
1384.22 - * by Sun in the GPL Version 2 section of the License file that
1384.23 + * by Oracle in the GPL Version 2 section of the License file that
1384.24 * accompanied this code. If applicable, add the following below the
1384.25 * License Header, with the fields enclosed by brackets [] replaced by
1384.26 * your own identifying information:
1385.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1385.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1385.3 @@ -1,6 +1,9 @@
1385.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1385.5 #
1385.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1385.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1385.8 +#
1385.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1385.10 +# Other names may be trademarks of their respective owners.
1385.11 #
1385.12 # The contents of this file are subject to the terms of either the GNU
1385.13 # General Public License Version 2 only ("GPL") or the Common
1385.14 @@ -12,9 +15,9 @@
1385.15 # specific language governing permissions and limitations under the
1385.16 # License. When distributing the software, include this License Header
1385.17 # Notice in each file and include the License file at
1385.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1385.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1385.20 # particular file as subject to the "Classpath" exception as provided
1385.21 -# by Sun in the GPL Version 2 section of the License file that
1385.22 +# by Oracle in the GPL Version 2 section of the License file that
1385.23 # accompanied this code. If applicable, add the following below the
1385.24 # License Header, with the fields enclosed by brackets [] replaced by
1385.25 # your own identifying information:
1386.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableAddColumnAction.java Fri Jul 16 11:47:36 2010 -0400
1386.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableAddColumnAction.java Fri Jul 16 14:21:50 2010 -0400
1386.3 @@ -1,7 +1,10 @@
1386.4 /*
1386.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1386.6 *
1386.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1386.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1386.9 + *
1386.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1386.11 + * Other names may be trademarks of their respective owners.
1386.12 *
1386.13 * The contents of this file are subject to the terms of either the GNU
1386.14 * General Public License Version 2 only ("GPL") or the Common
1386.15 @@ -13,9 +16,9 @@
1386.16 * specific language governing permissions and limitations under the
1386.17 * License. When distributing the software, include this License Header
1386.18 * Notice in each file and include the License file at
1386.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1386.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1386.21 * particular file as subject to the "Classpath" exception as provided
1386.22 - * by Sun in the GPL Version 2 section of the License file that
1386.23 + * by Oracle in the GPL Version 2 section of the License file that
1386.24 * accompanied this code. If applicable, add the following below the
1386.25 * License Header, with the fields enclosed by brackets [] replaced by
1386.26 * your own identifying information:
1387.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizer.java Fri Jul 16 11:47:36 2010 -0400
1387.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizer.java Fri Jul 16 14:21:50 2010 -0400
1387.3 @@ -1,7 +1,10 @@
1387.4 /*
1387.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1387.6 *
1387.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1387.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1387.9 + *
1387.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1387.11 + * Other names may be trademarks of their respective owners.
1387.12 *
1387.13 * The contents of this file are subject to the terms of either the GNU
1387.14 * General Public License Version 2 only ("GPL") or the Common
1387.15 @@ -13,9 +16,9 @@
1387.16 * specific language governing permissions and limitations under the
1387.17 * License. When distributing the software, include this License Header
1387.18 * Notice in each file and include the License file at
1387.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1387.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1387.21 * particular file as subject to the "Classpath" exception as provided
1387.22 - * by Sun in the GPL Version 2 section of the License file that
1387.23 + * by Oracle in the GPL Version 2 section of the License file that
1387.24 * accompanied this code. If applicable, add the following below the
1387.25 * License Header, with the fields enclosed by brackets [] replaced by
1387.26 * your own identifying information:
1388.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1388.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1388.3 @@ -1,7 +1,10 @@
1388.4 /*
1388.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1388.6 *
1388.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1388.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1388.9 + *
1388.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1388.11 + * Other names may be trademarks of their respective owners.
1388.12 *
1388.13 * The contents of this file are subject to the terms of either the GNU
1388.14 * General Public License Version 2 only ("GPL") or the Common
1388.15 @@ -13,9 +16,9 @@
1388.16 * specific language governing permissions and limitations under the
1388.17 * License. When distributing the software, include this License Header
1388.18 * Notice in each file and include the License file at
1388.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1388.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1388.21 * particular file as subject to the "Classpath" exception as provided
1388.22 - * by Sun in the GPL Version 2 section of the License file that
1388.23 + * by Oracle in the GPL Version 2 section of the License file that
1388.24 * accompanied this code. If applicable, add the following below the
1388.25 * License Header, with the fields enclosed by brackets [] replaced by
1388.26 * your own identifying information:
1389.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizerColumnsPanel.java Fri Jul 16 11:47:36 2010 -0400
1389.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizerColumnsPanel.java Fri Jul 16 14:21:50 2010 -0400
1389.3 @@ -1,7 +1,10 @@
1389.4 /*
1389.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1389.6 *
1389.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1389.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1389.9 + *
1389.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1389.11 + * Other names may be trademarks of their respective owners.
1389.12 *
1389.13 * The contents of this file are subject to the terms of either the GNU
1389.14 * General Public License Version 2 only ("GPL") or the Common
1389.15 @@ -13,9 +16,9 @@
1389.16 * specific language governing permissions and limitations under the
1389.17 * License. When distributing the software, include this License Header
1389.18 * Notice in each file and include the License file at
1389.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1389.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1389.21 * particular file as subject to the "Classpath" exception as provided
1389.22 - * by Sun in the GPL Version 2 section of the License file that
1389.23 + * by Oracle in the GPL Version 2 section of the License file that
1389.24 * accompanied this code. If applicable, add the following below the
1389.25 * License Header, with the fields enclosed by brackets [] replaced by
1389.26 * your own identifying information:
1390.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizerMainPanel.java Fri Jul 16 11:47:36 2010 -0400
1390.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizerMainPanel.java Fri Jul 16 14:21:50 2010 -0400
1390.3 @@ -1,7 +1,10 @@
1390.4 /*
1390.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1390.6 *
1390.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1390.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1390.9 + *
1390.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1390.11 + * Other names may be trademarks of their respective owners.
1390.12 *
1390.13 * The contents of this file are subject to the terms of either the GNU
1390.14 * General Public License Version 2 only ("GPL") or the Common
1390.15 @@ -13,9 +16,9 @@
1390.16 * specific language governing permissions and limitations under the
1390.17 * License. When distributing the software, include this License Header
1390.18 * Notice in each file and include the License file at
1390.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1390.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1390.21 * particular file as subject to the "Classpath" exception as provided
1390.22 - * by Sun in the GPL Version 2 section of the License file that
1390.23 + * by Oracle in the GPL Version 2 section of the License file that
1390.24 * accompanied this code. If applicable, add the following below the
1390.25 * License Header, with the fields enclosed by brackets [] replaced by
1390.26 * your own identifying information:
1391.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizerPagingPanel.java Fri Jul 16 11:47:36 2010 -0400
1391.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableCustomizerPagingPanel.java Fri Jul 16 14:21:50 2010 -0400
1391.3 @@ -1,7 +1,10 @@
1391.4 /*
1391.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1391.6 *
1391.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1391.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1391.9 + *
1391.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1391.11 + * Other names may be trademarks of their respective owners.
1391.12 *
1391.13 * The contents of this file are subject to the terms of either the GNU
1391.14 * General Public License Version 2 only ("GPL") or the Common
1391.15 @@ -13,9 +16,9 @@
1391.16 * specific language governing permissions and limitations under the
1391.17 * License. When distributing the software, include this License Header
1391.18 * Notice in each file and include the License file at
1391.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1391.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1391.21 * particular file as subject to the "Classpath" exception as provided
1391.22 - * by Sun in the GPL Version 2 section of the License file that
1391.23 + * by Oracle in the GPL Version 2 section of the License file that
1391.24 * accompanied this code. If applicable, add the following below the
1391.25 * License Header, with the fields enclosed by brackets [] replaced by
1391.26 * your own identifying information:
1392.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableState.java Fri Jul 16 11:47:36 2010 -0400
1392.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/std/table/HtmlDataTableState.java Fri Jul 16 14:21:50 2010 -0400
1392.3 @@ -1,7 +1,10 @@
1392.4 /*
1392.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1392.6 *
1392.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1392.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1392.9 + *
1392.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1392.11 + * Other names may be trademarks of their respective owners.
1392.12 *
1392.13 * The contents of this file are subject to the terms of either the GNU
1392.14 * General Public License Version 2 only ("GPL") or the Common
1392.15 @@ -13,9 +16,9 @@
1392.16 * specific language governing permissions and limitations under the
1392.17 * License. When distributing the software, include this License Header
1392.18 * Notice in each file and include the License file at
1392.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1392.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1392.21 * particular file as subject to the "Classpath" exception as provided
1392.22 - * by Sun in the GPL Version 2 section of the License file that
1392.23 + * by Oracle in the GPL Version 2 section of the License file that
1392.24 * accompanied this code. If applicable, add the following below the
1392.25 * License Header, with the fields enclosed by brackets [] replaced by
1392.26 * your own identifying information:
1393.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/util/ComponentBundle.java Fri Jul 16 11:47:36 2010 -0400
1393.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/util/ComponentBundle.java Fri Jul 16 14:21:50 2010 -0400
1393.3 @@ -1,7 +1,10 @@
1393.4 /*
1393.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1393.6 *
1393.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1393.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1393.9 + *
1393.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1393.11 + * Other names may be trademarks of their respective owners.
1393.12 *
1393.13 * The contents of this file are subject to the terms of either the GNU
1393.14 * General Public License Version 2 only ("GPL") or the Common
1393.15 @@ -13,9 +16,9 @@
1393.16 * specific language governing permissions and limitations under the
1393.17 * License. When distributing the software, include this License Header
1393.18 * Notice in each file and include the License file at
1393.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1393.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1393.21 * particular file as subject to the "Classpath" exception as provided
1393.22 - * by Sun in the GPL Version 2 section of the License file that
1393.23 + * by Oracle in the GPL Version 2 section of the License file that
1393.24 * accompanied this code. If applicable, add the following below the
1393.25 * License Header, with the fields enclosed by brackets [] replaced by
1393.26 * your own identifying information:
1394.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/util/DesignTimeComponentBundle.java Fri Jul 16 11:47:36 2010 -0400
1394.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/util/DesignTimeComponentBundle.java Fri Jul 16 14:21:50 2010 -0400
1394.3 @@ -1,7 +1,10 @@
1394.4 /*
1394.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1394.6 *
1394.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1394.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1394.9 + *
1394.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1394.11 + * Other names may be trademarks of their respective owners.
1394.12 *
1394.13 * The contents of this file are subject to the terms of either the GNU
1394.14 * General Public License Version 2 only ("GPL") or the Common
1394.15 @@ -13,9 +16,9 @@
1394.16 * specific language governing permissions and limitations under the
1394.17 * License. When distributing the software, include this License Header
1394.18 * Notice in each file and include the License file at
1394.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1394.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1394.21 * particular file as subject to the "Classpath" exception as provided
1394.22 - * by Sun in the GPL Version 2 section of the License file that
1394.23 + * by Oracle in the GPL Version 2 section of the License file that
1394.24 * accompanied this code. If applicable, add the following below the
1394.25 * License Header, with the fields enclosed by brackets [] replaced by
1394.26 * your own identifying information:
1395.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/validator/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1395.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/validator/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1395.3 @@ -1,6 +1,9 @@
1395.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1395.5 #
1395.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1395.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1395.8 +#
1395.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1395.10 +# Other names may be trademarks of their respective owners.
1395.11 #
1395.12 # The contents of this file are subject to the terms of either the GNU
1395.13 # General Public License Version 2 only ("GPL") or the Common
1395.14 @@ -12,9 +15,9 @@
1395.15 # specific language governing permissions and limitations under the
1395.16 # License. When distributing the software, include this License Header
1395.17 # Notice in each file and include the License file at
1395.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1395.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1395.20 # particular file as subject to the "Classpath" exception as provided
1395.21 -# by Sun in the GPL Version 2 section of the License file that
1395.22 +# by Oracle in the GPL Version 2 section of the License file that
1395.23 # accompanied this code. If applicable, add the following below the
1395.24 # License Header, with the fields enclosed by brackets [] replaced by
1395.25 # your own identifying information:
1396.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/validator/DoubleRangeValidatorBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1396.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/validator/DoubleRangeValidatorBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1396.3 @@ -1,7 +1,10 @@
1396.4 /*
1396.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1396.6 *
1396.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1396.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1396.9 + *
1396.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1396.11 + * Other names may be trademarks of their respective owners.
1396.12 *
1396.13 * The contents of this file are subject to the terms of either the GNU
1396.14 * General Public License Version 2 only ("GPL") or the Common
1396.15 @@ -13,9 +16,9 @@
1396.16 * specific language governing permissions and limitations under the
1396.17 * License. When distributing the software, include this License Header
1396.18 * Notice in each file and include the License file at
1396.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1396.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1396.21 * particular file as subject to the "Classpath" exception as provided
1396.22 - * by Sun in the GPL Version 2 section of the License file that
1396.23 + * by Oracle in the GPL Version 2 section of the License file that
1396.24 * accompanied this code. If applicable, add the following below the
1396.25 * License Header, with the fields enclosed by brackets [] replaced by
1396.26 * your own identifying information:
1397.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/validator/LengthValidatorBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1397.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/validator/LengthValidatorBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1397.3 @@ -1,7 +1,10 @@
1397.4 /*
1397.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1397.6 *
1397.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1397.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1397.9 + *
1397.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1397.11 + * Other names may be trademarks of their respective owners.
1397.12 *
1397.13 * The contents of this file are subject to the terms of either the GNU
1397.14 * General Public License Version 2 only ("GPL") or the Common
1397.15 @@ -13,9 +16,9 @@
1397.16 * specific language governing permissions and limitations under the
1397.17 * License. When distributing the software, include this License Header
1397.18 * Notice in each file and include the License file at
1397.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1397.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1397.21 * particular file as subject to the "Classpath" exception as provided
1397.22 - * by Sun in the GPL Version 2 section of the License file that
1397.23 + * by Oracle in the GPL Version 2 section of the License file that
1397.24 * accompanied this code. If applicable, add the following below the
1397.25 * License Header, with the fields enclosed by brackets [] replaced by
1397.26 * your own identifying information:
1398.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/validator/LongRangeValidatorBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1398.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/faces/dt/validator/LongRangeValidatorBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1398.3 @@ -1,7 +1,10 @@
1398.4 /*
1398.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1398.6 *
1398.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1398.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1398.9 + *
1398.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1398.11 + * Other names may be trademarks of their respective owners.
1398.12 *
1398.13 * The contents of this file are subject to the terms of either the GNU
1398.14 * General Public License Version 2 only ("GPL") or the Common
1398.15 @@ -13,9 +16,9 @@
1398.16 * specific language governing permissions and limitations under the
1398.17 * License. When distributing the software, include this License Header
1398.18 * Notice in each file and include the License file at
1398.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1398.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1398.21 * particular file as subject to the "Classpath" exception as provided
1398.22 - * by Sun in the GPL Version 2 section of the License file that
1398.23 + * by Oracle in the GPL Version 2 section of the License file that
1398.24 * accompanied this code. If applicable, add the following below the
1398.25 * License Header, with the fields enclosed by brackets [] replaced by
1398.26 * your own identifying information:
1399.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1399.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1399.3 @@ -1,6 +1,9 @@
1399.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1399.5 #
1399.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1399.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1399.8 +#
1399.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1399.10 +# Other names may be trademarks of their respective owners.
1399.11 #
1399.12 # The contents of this file are subject to the terms of either the GNU
1399.13 # General Public License Version 2 only ("GPL") or the Common
1399.14 @@ -12,9 +15,9 @@
1399.15 # specific language governing permissions and limitations under the
1399.16 # License. When distributing the software, include this License Header
1399.17 # Notice in each file and include the License file at
1399.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1399.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1399.20 # particular file as subject to the "Classpath" exception as provided
1399.21 -# by Sun in the GPL Version 2 section of the License file that
1399.22 +# by Oracle in the GPL Version 2 section of the License file that
1399.23 # accompanied this code. If applicable, add the following below the
1399.24 # License Header, with the fields enclosed by brackets [] replaced by
1399.25 # your own identifying information:
1400.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/DesignTimePropertyResolver.java Fri Jul 16 11:47:36 2010 -0400
1400.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/DesignTimePropertyResolver.java Fri Jul 16 14:21:50 2010 -0400
1400.3 @@ -1,7 +1,10 @@
1400.4 /*
1400.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1400.6 *
1400.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1400.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1400.9 + *
1400.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1400.11 + * Other names may be trademarks of their respective owners.
1400.12 *
1400.13 * The contents of this file are subject to the terms of either the GNU
1400.14 * General Public License Version 2 only ("GPL") or the Common
1400.15 @@ -13,9 +16,9 @@
1400.16 * specific language governing permissions and limitations under the
1400.17 * License. When distributing the software, include this License Header
1400.18 * Notice in each file and include the License file at
1400.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1400.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1400.21 * particular file as subject to the "Classpath" exception as provided
1400.22 - * by Sun in the GPL Version 2 section of the License file that
1400.23 + * by Oracle in the GPL Version 2 section of the License file that
1400.24 * accompanied this code. If applicable, add the following below the
1400.25 * License Header, with the fields enclosed by brackets [] replaced by
1400.26 * your own identifying information:
1401.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/DesignTimeVariableResolver.java Fri Jul 16 11:47:36 2010 -0400
1401.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/DesignTimeVariableResolver.java Fri Jul 16 14:21:50 2010 -0400
1401.3 @@ -1,7 +1,10 @@
1401.4 /*
1401.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1401.6 *
1401.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1401.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1401.9 + *
1401.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1401.11 + * Other names may be trademarks of their respective owners.
1401.12 *
1401.13 * The contents of this file are subject to the terms of either the GNU
1401.14 * General Public License Version 2 only ("GPL") or the Common
1401.15 @@ -13,9 +16,9 @@
1401.16 * specific language governing permissions and limitations under the
1401.17 * License. When distributing the software, include this License Header
1401.18 * Notice in each file and include the License file at
1401.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1401.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1401.21 * particular file as subject to the "Classpath" exception as provided
1401.22 - * by Sun in the GPL Version 2 section of the License file that
1401.23 + * by Oracle in the GPL Version 2 section of the License file that
1401.24 * accompanied this code. If applicable, add the following below the
1401.25 * License Header, with the fields enclosed by brackets [] replaced by
1401.26 * your own identifying information:
1402.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/DesigntimeViewHandler.java Fri Jul 16 11:47:36 2010 -0400
1402.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/DesigntimeViewHandler.java Fri Jul 16 14:21:50 2010 -0400
1402.3 @@ -1,7 +1,10 @@
1402.4 /*
1402.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1402.6 *
1402.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1402.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1402.9 + *
1402.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1402.11 + * Other names may be trademarks of their respective owners.
1402.12 *
1402.13 * The contents of this file are subject to the terms of either the GNU
1402.14 * General Public License Version 2 only ("GPL") or the Common
1402.15 @@ -13,9 +16,9 @@
1402.16 * specific language governing permissions and limitations under the
1402.17 * License. When distributing the software, include this License Header
1402.18 * Notice in each file and include the License file at
1402.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1402.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1402.21 * particular file as subject to the "Classpath" exception as provided
1402.22 - * by Sun in the GPL Version 2 section of the License file that
1402.23 + * by Oracle in the GPL Version 2 section of the License file that
1402.24 * accompanied this code. If applicable, add the following below the
1402.25 * License Header, with the fields enclosed by brackets [] replaced by
1402.26 * your own identifying information:
1403.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/Install.java Fri Jul 16 11:47:36 2010 -0400
1403.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/Install.java Fri Jul 16 14:21:50 2010 -0400
1403.3 @@ -1,7 +1,10 @@
1403.4 /*
1403.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1403.6 *
1403.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1403.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1403.9 + *
1403.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1403.11 + * Other names may be trademarks of their respective owners.
1403.12 *
1403.13 * The contents of this file are subject to the terms of either the GNU
1403.14 * General Public License Version 2 only ("GPL") or the Common
1403.15 @@ -13,9 +16,9 @@
1403.16 * specific language governing permissions and limitations under the
1403.17 * License. When distributing the software, include this License Header
1403.18 * Notice in each file and include the License file at
1403.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1403.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1403.21 * particular file as subject to the "Classpath" exception as provided
1403.22 - * by Sun in the GPL Version 2 section of the License file that
1403.23 + * by Oracle in the GPL Version 2 section of the License file that
1403.24 * accompanied this code. If applicable, add the following below the
1403.25 * License Header, with the fields enclosed by brackets [] replaced by
1403.26 * your own identifying information:
1404.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/LoadBundleVariableResolver.java Fri Jul 16 11:47:36 2010 -0400
1404.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/LoadBundleVariableResolver.java Fri Jul 16 14:21:50 2010 -0400
1404.3 @@ -1,7 +1,10 @@
1404.4 /*
1404.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1404.6 *
1404.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1404.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1404.9 + *
1404.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1404.11 + * Other names may be trademarks of their respective owners.
1404.12 *
1404.13 * The contents of this file are subject to the terms of either the GNU
1404.14 * General Public License Version 2 only ("GPL") or the Common
1404.15 @@ -13,9 +16,9 @@
1404.16 * specific language governing permissions and limitations under the
1404.17 * License. When distributing the software, include this License Header
1404.18 * Notice in each file and include the License file at
1404.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1404.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1404.21 * particular file as subject to the "Classpath" exception as provided
1404.22 - * by Sun in the GPL Version 2 section of the License file that
1404.23 + * by Oracle in the GPL Version 2 section of the License file that
1404.24 * accompanied this code. If applicable, add the following below the
1404.25 * License Header, with the fields enclosed by brackets [] replaced by
1404.26 * your own identifying information:
1405.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/layer.xml Fri Jul 16 11:47:36 2010 -0400
1405.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/layer.xml Fri Jul 16 14:21:50 2010 -0400
1405.3 @@ -2,7 +2,10 @@
1405.4 <!--
1405.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1405.6
1405.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1405.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1405.9 +
1405.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1405.11 +Other names may be trademarks of their respective owners.
1405.12
1405.13
1405.14 The contents of this file are subject to the terms of either the GNU
1405.15 @@ -15,9 +18,9 @@
1405.16 specific language governing permissions and limitations under the
1405.17 License. When distributing the software, include this License Header
1405.18 Notice in each file and include the License file at
1405.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1405.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1405.21 particular file as subject to the "Classpath" exception as provided
1405.22 -by Sun in the GPL Version 2 section of the License file that
1405.23 +by Oracle in the GPL Version 2 section of the License file that
1405.24 accompanied this code. If applicable, add the following below the
1405.25 License Header, with the fields enclosed by brackets [] replaced by
1405.26 your own identifying information:
1406.1 --- a/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1406.2 +++ b/visualweb.jsfsupport.designtime/src/org/netbeans/modules/visualweb/jsfsupport/designtime/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1406.3 @@ -1,6 +1,9 @@
1406.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1406.5 #
1406.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1406.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1406.8 +#
1406.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1406.10 +# Other names may be trademarks of their respective owners.
1406.11 #
1406.12 # The contents of this file are subject to the terms of either the GNU
1406.13 # General Public License Version 2 only ("GPL") or the Common
1406.14 @@ -12,9 +15,9 @@
1406.15 # specific language governing permissions and limitations under the
1406.16 # License. When distributing the software, include this License Header
1406.17 # Notice in each file and include the License file at
1406.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1406.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1406.20 # particular file as subject to the "Classpath" exception as provided
1406.21 -# by Sun in the GPL Version 2 section of the License file that
1406.22 +# by Oracle in the GPL Version 2 section of the License file that
1406.23 # accompanied this code. If applicable, add the following below the
1406.24 # License Header, with the fields enclosed by brackets [] replaced by
1406.25 # your own identifying information:
1407.1 --- a/visualweb.jsfsupport.designtime_1_1/build.xml Fri Jul 16 11:47:36 2010 -0400
1407.2 +++ b/visualweb.jsfsupport.designtime_1_1/build.xml Fri Jul 16 14:21:50 2010 -0400
1407.3 @@ -2,7 +2,10 @@
1407.4 <!--
1407.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1407.6
1407.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1407.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1407.9 +
1407.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1407.11 +Other names may be trademarks of their respective owners.
1407.12
1407.13
1407.14 The contents of this file are subject to the terms of either the GNU
1407.15 @@ -15,9 +18,9 @@
1407.16 specific language governing permissions and limitations under the
1407.17 License. When distributing the software, include this License Header
1407.18 Notice in each file and include the License file at
1407.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1407.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1407.21 particular file as subject to the "Classpath" exception as provided
1407.22 -by Sun in the GPL Version 2 section of the License file that
1407.23 +by Oracle in the GPL Version 2 section of the License file that
1407.24 accompanied this code. If applicable, add the following below the
1407.25 License Header, with the fields enclosed by brackets [] replaced by
1407.26 your own identifying information:
1408.1 --- a/visualweb.jsfsupport.designtime_1_1/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1408.2 +++ b/visualweb.jsfsupport.designtime_1_1/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1408.3 @@ -1,6 +1,9 @@
1408.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1408.5 #
1408.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1408.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1408.8 +#
1408.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1408.10 +# Other names may be trademarks of their respective owners.
1408.11 #
1408.12 # The contents of this file are subject to the terms of either the GNU
1408.13 # General Public License Version 2 only ("GPL") or the Common
1408.14 @@ -12,9 +15,9 @@
1408.15 # specific language governing permissions and limitations under the
1408.16 # License. When distributing the software, include this License Header
1408.17 # Notice in each file and include the License file at
1408.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1408.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1408.20 # particular file as subject to the "Classpath" exception as provided
1408.21 -# by Sun in the GPL Version 2 section of the License file that
1408.22 +# by Oracle in the GPL Version 2 section of the License file that
1408.23 # accompanied this code. If applicable, add the following below the
1408.24 # License Header, with the fields enclosed by brackets [] replaced by
1408.25 # your own identifying information:
1408.26 @@ -37,4 +40,4 @@
1408.27 # Version 2 license, then the option applies only if the new code is
1408.28 # made subject to such option by the copyright holder.
1408.29
1408.30 -javac.source=1.5
1408.31 +javac.source=1.6
1409.1 --- a/visualweb.jsfsupport.designtime_1_1/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1409.2 +++ b/visualweb.jsfsupport.designtime_1_1/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1409.3 @@ -2,7 +2,10 @@
1409.4 <!--
1409.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1409.6
1409.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1409.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1409.9 +
1409.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1409.11 +Other names may be trademarks of their respective owners.
1409.12
1409.13
1409.14 The contents of this file are subject to the terms of either the GNU
1409.15 @@ -15,9 +18,9 @@
1409.16 specific language governing permissions and limitations under the
1409.17 License. When distributing the software, include this License Header
1409.18 Notice in each file and include the License file at
1409.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1409.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1409.21 particular file as subject to the "Classpath" exception as provided
1409.22 -by Sun in the GPL Version 2 section of the License file that
1409.23 +by Oracle in the GPL Version 2 section of the License file that
1409.24 accompanied this code. If applicable, add the following below the
1409.25 License Header, with the fields enclosed by brackets [] replaced by
1409.26 your own identifying information:
1409.27 @@ -144,7 +147,15 @@
1409.28 <build-prerequisite/>
1409.29 <compile-dependency/>
1409.30 <run-dependency>
1409.31 - <specification-version>6.8.11</specification-version>
1409.32 + <specification-version>8.0</specification-version>
1409.33 + </run-dependency>
1409.34 + </dependency>
1409.35 + <dependency>
1409.36 + <code-name-base>org.openide.util.lookup</code-name-base>
1409.37 + <build-prerequisite/>
1409.38 + <compile-dependency/>
1409.39 + <run-dependency>
1409.40 + <specification-version>8.0</specification-version>
1409.41 </run-dependency>
1409.42 </dependency>
1409.43 </module-dependencies>
1410.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1410.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1410.3 @@ -1,6 +1,9 @@
1410.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1410.5 #
1410.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1410.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1410.8 +#
1410.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1410.10 +# Other names may be trademarks of their respective owners.
1410.11 #
1410.12 # The contents of this file are subject to the terms of either the GNU
1410.13 # General Public License Version 2 only ("GPL") or the Common
1410.14 @@ -12,9 +15,9 @@
1410.15 # specific language governing permissions and limitations under the
1410.16 # License. When distributing the software, include this License Header
1410.17 # Notice in each file and include the License file at
1410.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1410.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1410.20 # particular file as subject to the "Classpath" exception as provided
1410.21 -# by Sun in the GPL Version 2 section of the License file that
1410.22 +# by Oracle in the GPL Version 2 section of the License file that
1410.23 # accompanied this code. If applicable, add the following below the
1410.24 # License Header, with the fields enclosed by brackets [] replaced by
1410.25 # your own identifying information:
1411.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIColumnBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1411.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIColumnBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1411.3 @@ -1,7 +1,10 @@
1411.4 /*
1411.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1411.6 *
1411.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1411.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1411.9 + *
1411.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1411.11 + * Other names may be trademarks of their respective owners.
1411.12 *
1411.13 * The contents of this file are subject to the terms of either the GNU
1411.14 * General Public License Version 2 only ("GPL") or the Common
1411.15 @@ -13,9 +16,9 @@
1411.16 * specific language governing permissions and limitations under the
1411.17 * License. When distributing the software, include this License Header
1411.18 * Notice in each file and include the License file at
1411.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1411.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1411.21 * particular file as subject to the "Classpath" exception as provided
1411.22 - * by Sun in the GPL Version 2 section of the License file that
1411.23 + * by Oracle in the GPL Version 2 section of the License file that
1411.24 * accompanied this code. If applicable, add the following below the
1411.25 * License Header, with the fields enclosed by brackets [] replaced by
1411.26 * your own identifying information:
1412.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIColumnBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1412.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIColumnBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1412.3 @@ -1,7 +1,10 @@
1412.4 /*
1412.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1412.6 *
1412.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1412.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1412.9 + *
1412.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1412.11 + * Other names may be trademarks of their respective owners.
1412.12 *
1412.13 * The contents of this file are subject to the terms of either the GNU
1412.14 * General Public License Version 2 only ("GPL") or the Common
1412.15 @@ -13,9 +16,9 @@
1412.16 * specific language governing permissions and limitations under the
1412.17 * License. When distributing the software, include this License Header
1412.18 * Notice in each file and include the License file at
1412.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1412.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1412.21 * particular file as subject to the "Classpath" exception as provided
1412.22 - * by Sun in the GPL Version 2 section of the License file that
1412.23 + * by Oracle in the GPL Version 2 section of the License file that
1412.24 * accompanied this code. If applicable, add the following below the
1412.25 * License Header, with the fields enclosed by brackets [] replaced by
1412.26 * your own identifying information:
1413.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UICommandBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1413.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UICommandBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1413.3 @@ -1,7 +1,10 @@
1413.4 /*
1413.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1413.6 *
1413.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1413.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1413.9 + *
1413.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1413.11 + * Other names may be trademarks of their respective owners.
1413.12 *
1413.13 * The contents of this file are subject to the terms of either the GNU
1413.14 * General Public License Version 2 only ("GPL") or the Common
1413.15 @@ -13,9 +16,9 @@
1413.16 * specific language governing permissions and limitations under the
1413.17 * License. When distributing the software, include this License Header
1413.18 * Notice in each file and include the License file at
1413.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1413.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1413.21 * particular file as subject to the "Classpath" exception as provided
1413.22 - * by Sun in the GPL Version 2 section of the License file that
1413.23 + * by Oracle in the GPL Version 2 section of the License file that
1413.24 * accompanied this code. If applicable, add the following below the
1413.25 * License Header, with the fields enclosed by brackets [] replaced by
1413.26 * your own identifying information:
1414.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIComponentBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1414.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIComponentBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1414.3 @@ -1,7 +1,10 @@
1414.4 /*
1414.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1414.6 *
1414.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1414.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1414.9 + *
1414.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1414.11 + * Other names may be trademarks of their respective owners.
1414.12 *
1414.13 * The contents of this file are subject to the terms of either the GNU
1414.14 * General Public License Version 2 only ("GPL") or the Common
1414.15 @@ -13,9 +16,9 @@
1414.16 * specific language governing permissions and limitations under the
1414.17 * License. When distributing the software, include this License Header
1414.18 * Notice in each file and include the License file at
1414.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1414.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1414.21 * particular file as subject to the "Classpath" exception as provided
1414.22 - * by Sun in the GPL Version 2 section of the License file that
1414.23 + * by Oracle in the GPL Version 2 section of the License file that
1414.24 * accompanied this code. If applicable, add the following below the
1414.25 * License Header, with the fields enclosed by brackets [] replaced by
1414.26 * your own identifying information:
1415.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIDataBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1415.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIDataBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1415.3 @@ -1,7 +1,10 @@
1415.4 /*
1415.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1415.6 *
1415.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1415.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1415.9 + *
1415.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1415.11 + * Other names may be trademarks of their respective owners.
1415.12 *
1415.13 * The contents of this file are subject to the terms of either the GNU
1415.14 * General Public License Version 2 only ("GPL") or the Common
1415.15 @@ -13,9 +16,9 @@
1415.16 * specific language governing permissions and limitations under the
1415.17 * License. When distributing the software, include this License Header
1415.18 * Notice in each file and include the License file at
1415.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1415.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1415.21 * particular file as subject to the "Classpath" exception as provided
1415.22 - * by Sun in the GPL Version 2 section of the License file that
1415.23 + * by Oracle in the GPL Version 2 section of the License file that
1415.24 * accompanied this code. If applicable, add the following below the
1415.25 * License Header, with the fields enclosed by brackets [] replaced by
1415.26 * your own identifying information:
1416.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIFormBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1416.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIFormBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1416.3 @@ -1,7 +1,10 @@
1416.4 /*
1416.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1416.6 *
1416.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1416.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1416.9 + *
1416.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1416.11 + * Other names may be trademarks of their respective owners.
1416.12 *
1416.13 * The contents of this file are subject to the terms of either the GNU
1416.14 * General Public License Version 2 only ("GPL") or the Common
1416.15 @@ -13,9 +16,9 @@
1416.16 * specific language governing permissions and limitations under the
1416.17 * License. When distributing the software, include this License Header
1416.18 * Notice in each file and include the License file at
1416.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1416.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1416.21 * particular file as subject to the "Classpath" exception as provided
1416.22 - * by Sun in the GPL Version 2 section of the License file that
1416.23 + * by Oracle in the GPL Version 2 section of the License file that
1416.24 * accompanied this code. If applicable, add the following below the
1416.25 * License Header, with the fields enclosed by brackets [] replaced by
1416.26 * your own identifying information:
1417.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIGraphicBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1417.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIGraphicBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1417.3 @@ -1,7 +1,10 @@
1417.4 /*
1417.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1417.6 *
1417.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1417.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1417.9 + *
1417.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1417.11 + * Other names may be trademarks of their respective owners.
1417.12 *
1417.13 * The contents of this file are subject to the terms of either the GNU
1417.14 * General Public License Version 2 only ("GPL") or the Common
1417.15 @@ -13,9 +16,9 @@
1417.16 * specific language governing permissions and limitations under the
1417.17 * License. When distributing the software, include this License Header
1417.18 * Notice in each file and include the License file at
1417.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1417.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1417.21 * particular file as subject to the "Classpath" exception as provided
1417.22 - * by Sun in the GPL Version 2 section of the License file that
1417.23 + * by Oracle in the GPL Version 2 section of the License file that
1417.24 * accompanied this code. If applicable, add the following below the
1417.25 * License Header, with the fields enclosed by brackets [] replaced by
1417.26 * your own identifying information:
1418.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIInputBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1418.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIInputBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1418.3 @@ -1,7 +1,10 @@
1418.4 /*
1418.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1418.6 *
1418.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1418.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1418.9 + *
1418.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1418.11 + * Other names may be trademarks of their respective owners.
1418.12 *
1418.13 * The contents of this file are subject to the terms of either the GNU
1418.14 * General Public License Version 2 only ("GPL") or the Common
1418.15 @@ -13,9 +16,9 @@
1418.16 * specific language governing permissions and limitations under the
1418.17 * License. When distributing the software, include this License Header
1418.18 * Notice in each file and include the License file at
1418.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1418.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1418.21 * particular file as subject to the "Classpath" exception as provided
1418.22 - * by Sun in the GPL Version 2 section of the License file that
1418.23 + * by Oracle in the GPL Version 2 section of the License file that
1418.24 * accompanied this code. If applicable, add the following below the
1418.25 * License Header, with the fields enclosed by brackets [] replaced by
1418.26 * your own identifying information:
1419.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIMessageBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1419.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIMessageBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1419.3 @@ -1,7 +1,10 @@
1419.4 /*
1419.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1419.6 *
1419.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1419.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1419.9 + *
1419.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1419.11 + * Other names may be trademarks of their respective owners.
1419.12 *
1419.13 * The contents of this file are subject to the terms of either the GNU
1419.14 * General Public License Version 2 only ("GPL") or the Common
1419.15 @@ -13,9 +16,9 @@
1419.16 * specific language governing permissions and limitations under the
1419.17 * License. When distributing the software, include this License Header
1419.18 * Notice in each file and include the License file at
1419.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1419.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1419.21 * particular file as subject to the "Classpath" exception as provided
1419.22 - * by Sun in the GPL Version 2 section of the License file that
1419.23 + * by Oracle in the GPL Version 2 section of the License file that
1419.24 * accompanied this code. If applicable, add the following below the
1419.25 * License Header, with the fields enclosed by brackets [] replaced by
1419.26 * your own identifying information:
1420.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIMessagesBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1420.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIMessagesBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1420.3 @@ -1,7 +1,10 @@
1420.4 /*
1420.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1420.6 *
1420.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1420.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1420.9 + *
1420.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1420.11 + * Other names may be trademarks of their respective owners.
1420.12 *
1420.13 * The contents of this file are subject to the terms of either the GNU
1420.14 * General Public License Version 2 only ("GPL") or the Common
1420.15 @@ -13,9 +16,9 @@
1420.16 * specific language governing permissions and limitations under the
1420.17 * License. When distributing the software, include this License Header
1420.18 * Notice in each file and include the License file at
1420.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1420.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1420.21 * particular file as subject to the "Classpath" exception as provided
1420.22 - * by Sun in the GPL Version 2 section of the License file that
1420.23 + * by Oracle in the GPL Version 2 section of the License file that
1420.24 * accompanied this code. If applicable, add the following below the
1420.25 * License Header, with the fields enclosed by brackets [] replaced by
1420.26 * your own identifying information:
1421.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UINamingContainerBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1421.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UINamingContainerBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1421.3 @@ -1,7 +1,10 @@
1421.4 /*
1421.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1421.6 *
1421.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1421.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1421.9 + *
1421.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1421.11 + * Other names may be trademarks of their respective owners.
1421.12 *
1421.13 * The contents of this file are subject to the terms of either the GNU
1421.14 * General Public License Version 2 only ("GPL") or the Common
1421.15 @@ -13,9 +16,9 @@
1421.16 * specific language governing permissions and limitations under the
1421.17 * License. When distributing the software, include this License Header
1421.18 * Notice in each file and include the License file at
1421.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1421.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1421.21 * particular file as subject to the "Classpath" exception as provided
1421.22 - * by Sun in the GPL Version 2 section of the License file that
1421.23 + * by Oracle in the GPL Version 2 section of the License file that
1421.24 * accompanied this code. If applicable, add the following below the
1421.25 * License Header, with the fields enclosed by brackets [] replaced by
1421.26 * your own identifying information:
1422.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIOutputBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1422.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIOutputBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1422.3 @@ -1,7 +1,10 @@
1422.4 /*
1422.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1422.6 *
1422.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1422.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1422.9 + *
1422.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1422.11 + * Other names may be trademarks of their respective owners.
1422.12 *
1422.13 * The contents of this file are subject to the terms of either the GNU
1422.14 * General Public License Version 2 only ("GPL") or the Common
1422.15 @@ -13,9 +16,9 @@
1422.16 * specific language governing permissions and limitations under the
1422.17 * License. When distributing the software, include this License Header
1422.18 * Notice in each file and include the License file at
1422.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1422.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1422.21 * particular file as subject to the "Classpath" exception as provided
1422.22 - * by Sun in the GPL Version 2 section of the License file that
1422.23 + * by Oracle in the GPL Version 2 section of the License file that
1422.24 * accompanied this code. If applicable, add the following below the
1422.25 * License Header, with the fields enclosed by brackets [] replaced by
1422.26 * your own identifying information:
1423.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIPanelBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1423.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIPanelBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1423.3 @@ -1,7 +1,10 @@
1423.4 /*
1423.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1423.6 *
1423.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1423.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1423.9 + *
1423.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1423.11 + * Other names may be trademarks of their respective owners.
1423.12 *
1423.13 * The contents of this file are subject to the terms of either the GNU
1423.14 * General Public License Version 2 only ("GPL") or the Common
1423.15 @@ -13,9 +16,9 @@
1423.16 * specific language governing permissions and limitations under the
1423.17 * License. When distributing the software, include this License Header
1423.18 * Notice in each file and include the License file at
1423.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1423.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1423.21 * particular file as subject to the "Classpath" exception as provided
1423.22 - * by Sun in the GPL Version 2 section of the License file that
1423.23 + * by Oracle in the GPL Version 2 section of the License file that
1423.24 * accompanied this code. If applicable, add the following below the
1423.25 * License Header, with the fields enclosed by brackets [] replaced by
1423.26 * your own identifying information:
1424.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIParameterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1424.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIParameterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1424.3 @@ -1,7 +1,10 @@
1424.4 /*
1424.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1424.6 *
1424.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1424.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1424.9 + *
1424.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1424.11 + * Other names may be trademarks of their respective owners.
1424.12 *
1424.13 * The contents of this file are subject to the terms of either the GNU
1424.14 * General Public License Version 2 only ("GPL") or the Common
1424.15 @@ -13,9 +16,9 @@
1424.16 * specific language governing permissions and limitations under the
1424.17 * License. When distributing the software, include this License Header
1424.18 * Notice in each file and include the License file at
1424.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1424.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1424.21 * particular file as subject to the "Classpath" exception as provided
1424.22 - * by Sun in the GPL Version 2 section of the License file that
1424.23 + * by Oracle in the GPL Version 2 section of the License file that
1424.24 * accompanied this code. If applicable, add the following below the
1424.25 * License Header, with the fields enclosed by brackets [] replaced by
1424.26 * your own identifying information:
1425.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIParameterBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1425.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UIParameterBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1425.3 @@ -1,7 +1,10 @@
1425.4 /*
1425.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1425.6 *
1425.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1425.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1425.9 + *
1425.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1425.11 + * Other names may be trademarks of their respective owners.
1425.12 *
1425.13 * The contents of this file are subject to the terms of either the GNU
1425.14 * General Public License Version 2 only ("GPL") or the Common
1425.15 @@ -13,9 +16,9 @@
1425.16 * specific language governing permissions and limitations under the
1425.17 * License. When distributing the software, include this License Header
1425.18 * Notice in each file and include the License file at
1425.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1425.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1425.21 * particular file as subject to the "Classpath" exception as provided
1425.22 - * by Sun in the GPL Version 2 section of the License file that
1425.23 + * by Oracle in the GPL Version 2 section of the License file that
1425.24 * accompanied this code. If applicable, add the following below the
1425.25 * License Header, with the fields enclosed by brackets [] replaced by
1425.26 * your own identifying information:
1426.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectBooleanBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1426.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectBooleanBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1426.3 @@ -1,7 +1,10 @@
1426.4 /*
1426.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1426.6 *
1426.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1426.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1426.9 + *
1426.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1426.11 + * Other names may be trademarks of their respective owners.
1426.12 *
1426.13 * The contents of this file are subject to the terms of either the GNU
1426.14 * General Public License Version 2 only ("GPL") or the Common
1426.15 @@ -13,9 +16,9 @@
1426.16 * specific language governing permissions and limitations under the
1426.17 * License. When distributing the software, include this License Header
1426.18 * Notice in each file and include the License file at
1426.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1426.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1426.21 * particular file as subject to the "Classpath" exception as provided
1426.22 - * by Sun in the GPL Version 2 section of the License file that
1426.23 + * by Oracle in the GPL Version 2 section of the License file that
1426.24 * accompanied this code. If applicable, add the following below the
1426.25 * License Header, with the fields enclosed by brackets [] replaced by
1426.26 * your own identifying information:
1427.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1427.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1427.3 @@ -1,7 +1,10 @@
1427.4 /*
1427.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1427.6 *
1427.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1427.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1427.9 + *
1427.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1427.11 + * Other names may be trademarks of their respective owners.
1427.12 *
1427.13 * The contents of this file are subject to the terms of either the GNU
1427.14 * General Public License Version 2 only ("GPL") or the Common
1427.15 @@ -13,9 +16,9 @@
1427.16 * specific language governing permissions and limitations under the
1427.17 * License. When distributing the software, include this License Header
1427.18 * Notice in each file and include the License file at
1427.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1427.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1427.21 * particular file as subject to the "Classpath" exception as provided
1427.22 - * by Sun in the GPL Version 2 section of the License file that
1427.23 + * by Oracle in the GPL Version 2 section of the License file that
1427.24 * accompanied this code. If applicable, add the following below the
1427.25 * License Header, with the fields enclosed by brackets [] replaced by
1427.26 * your own identifying information:
1428.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1428.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1428.3 @@ -1,7 +1,10 @@
1428.4 /*
1428.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1428.6 *
1428.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1428.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1428.9 + *
1428.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1428.11 + * Other names may be trademarks of their respective owners.
1428.12 *
1428.13 * The contents of this file are subject to the terms of either the GNU
1428.14 * General Public License Version 2 only ("GPL") or the Common
1428.15 @@ -13,9 +16,9 @@
1428.16 * specific language governing permissions and limitations under the
1428.17 * License. When distributing the software, include this License Header
1428.18 * Notice in each file and include the License file at
1428.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1428.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1428.21 * particular file as subject to the "Classpath" exception as provided
1428.22 - * by Sun in the GPL Version 2 section of the License file that
1428.23 + * by Oracle in the GPL Version 2 section of the License file that
1428.24 * accompanied this code. If applicable, add the following below the
1428.25 * License Header, with the fields enclosed by brackets [] replaced by
1428.26 * your own identifying information:
1429.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1429.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1429.3 @@ -1,7 +1,10 @@
1429.4 /*
1429.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1429.6 *
1429.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1429.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1429.9 + *
1429.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1429.11 + * Other names may be trademarks of their respective owners.
1429.12 *
1429.13 * The contents of this file are subject to the terms of either the GNU
1429.14 * General Public License Version 2 only ("GPL") or the Common
1429.15 @@ -13,9 +16,9 @@
1429.16 * specific language governing permissions and limitations under the
1429.17 * License. When distributing the software, include this License Header
1429.18 * Notice in each file and include the License file at
1429.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1429.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1429.21 * particular file as subject to the "Classpath" exception as provided
1429.22 - * by Sun in the GPL Version 2 section of the License file that
1429.23 + * by Oracle in the GPL Version 2 section of the License file that
1429.24 * accompanied this code. If applicable, add the following below the
1429.25 * License Header, with the fields enclosed by brackets [] replaced by
1429.26 * your own identifying information:
1430.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemsBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1430.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemsBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1430.3 @@ -1,7 +1,10 @@
1430.4 /*
1430.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1430.6 *
1430.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1430.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1430.9 + *
1430.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1430.11 + * Other names may be trademarks of their respective owners.
1430.12 *
1430.13 * The contents of this file are subject to the terms of either the GNU
1430.14 * General Public License Version 2 only ("GPL") or the Common
1430.15 @@ -13,9 +16,9 @@
1430.16 * specific language governing permissions and limitations under the
1430.17 * License. When distributing the software, include this License Header
1430.18 * Notice in each file and include the License file at
1430.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1430.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1430.21 * particular file as subject to the "Classpath" exception as provided
1430.22 - * by Sun in the GPL Version 2 section of the License file that
1430.23 + * by Oracle in the GPL Version 2 section of the License file that
1430.24 * accompanied this code. If applicable, add the following below the
1430.25 * License Header, with the fields enclosed by brackets [] replaced by
1430.26 * your own identifying information:
1431.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemsBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1431.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemsBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1431.3 @@ -1,7 +1,10 @@
1431.4 /*
1431.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1431.6 *
1431.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1431.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1431.9 + *
1431.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1431.11 + * Other names may be trademarks of their respective owners.
1431.12 *
1431.13 * The contents of this file are subject to the terms of either the GNU
1431.14 * General Public License Version 2 only ("GPL") or the Common
1431.15 @@ -13,9 +16,9 @@
1431.16 * specific language governing permissions and limitations under the
1431.17 * License. When distributing the software, include this License Header
1431.18 * Notice in each file and include the License file at
1431.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1431.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1431.21 * particular file as subject to the "Classpath" exception as provided
1431.22 - * by Sun in the GPL Version 2 section of the License file that
1431.23 + * by Oracle in the GPL Version 2 section of the License file that
1431.24 * accompanied this code. If applicable, add the following below the
1431.25 * License Header, with the fields enclosed by brackets [] replaced by
1431.26 * your own identifying information:
1432.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemsDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1432.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectItemsDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1432.3 @@ -1,7 +1,10 @@
1432.4 /*
1432.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1432.6 *
1432.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1432.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1432.9 + *
1432.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1432.11 + * Other names may be trademarks of their respective owners.
1432.12 *
1432.13 * The contents of this file are subject to the terms of either the GNU
1432.14 * General Public License Version 2 only ("GPL") or the Common
1432.15 @@ -13,9 +16,9 @@
1432.16 * specific language governing permissions and limitations under the
1432.17 * License. When distributing the software, include this License Header
1432.18 * Notice in each file and include the License file at
1432.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1432.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1432.21 * particular file as subject to the "Classpath" exception as provided
1432.22 - * by Sun in the GPL Version 2 section of the License file that
1432.23 + * by Oracle in the GPL Version 2 section of the License file that
1432.24 * accompanied this code. If applicable, add the following below the
1432.25 * License Header, with the fields enclosed by brackets [] replaced by
1432.26 * your own identifying information:
1433.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectManyBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1433.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectManyBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1433.3 @@ -1,7 +1,10 @@
1433.4 /*
1433.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1433.6 *
1433.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1433.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1433.9 + *
1433.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1433.11 + * Other names may be trademarks of their respective owners.
1433.12 *
1433.13 * The contents of this file are subject to the terms of either the GNU
1433.14 * General Public License Version 2 only ("GPL") or the Common
1433.15 @@ -13,9 +16,9 @@
1433.16 * specific language governing permissions and limitations under the
1433.17 * License. When distributing the software, include this License Header
1433.18 * Notice in each file and include the License file at
1433.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1433.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1433.21 * particular file as subject to the "Classpath" exception as provided
1433.22 - * by Sun in the GPL Version 2 section of the License file that
1433.23 + * by Oracle in the GPL Version 2 section of the License file that
1433.24 * accompanied this code. If applicable, add the following below the
1433.25 * License Header, with the fields enclosed by brackets [] replaced by
1433.26 * your own identifying information:
1434.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectOneBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1434.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/UISelectOneBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1434.3 @@ -1,7 +1,10 @@
1434.4 /*
1434.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1434.6 *
1434.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1434.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1434.9 + *
1434.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1434.11 + * Other names may be trademarks of their respective owners.
1434.12 *
1434.13 * The contents of this file are subject to the terms of either the GNU
1434.14 * General Public License Version 2 only ("GPL") or the Common
1434.15 @@ -13,9 +16,9 @@
1434.16 * specific language governing permissions and limitations under the
1434.17 * License. When distributing the software, include this License Header
1434.18 * Notice in each file and include the License file at
1434.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1434.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1434.21 * particular file as subject to the "Classpath" exception as provided
1434.22 - * by Sun in the GPL Version 2 section of the License file that
1434.23 + * by Oracle in the GPL Version 2 section of the License file that
1434.24 * accompanied this code. If applicable, add the following below the
1434.25 * License Header, with the fields enclosed by brackets [] replaced by
1434.26 * your own identifying information:
1435.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/Bundle-JSF.properties Fri Jul 16 11:47:36 2010 -0400
1435.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/Bundle-JSF.properties Fri Jul 16 14:21:50 2010 -0400
1435.3 @@ -1,6 +1,9 @@
1435.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1435.5 #
1435.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1435.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1435.8 +#
1435.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1435.10 +# Other names may be trademarks of their respective owners.
1435.11 #
1435.12 # The contents of this file are subject to the terms of either the GNU
1435.13 # General Public License Version 2 only ("GPL") or the Common
1435.14 @@ -12,9 +15,9 @@
1435.15 # specific language governing permissions and limitations under the
1435.16 # License. When distributing the software, include this License Header
1435.17 # Notice in each file and include the License file at
1435.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1435.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1435.20 # particular file as subject to the "Classpath" exception as provided
1435.21 -# by Sun in the GPL Version 2 section of the License file that
1435.22 +# by Oracle in the GPL Version 2 section of the License file that
1435.23 # accompanied this code. If applicable, add the following below the
1435.24 # License Header, with the fields enclosed by brackets [] replaced by
1435.25 # your own identifying information:
1436.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1436.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1436.3 @@ -1,6 +1,9 @@
1436.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1436.5 #
1436.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1436.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1436.8 +#
1436.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1436.10 +# Other names may be trademarks of their respective owners.
1436.11 #
1436.12 # The contents of this file are subject to the terms of either the GNU
1436.13 # General Public License Version 2 only ("GPL") or the Common
1436.14 @@ -12,9 +15,9 @@
1436.15 # specific language governing permissions and limitations under the
1436.16 # License. When distributing the software, include this License Header
1436.17 # Notice in each file and include the License file at
1436.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1436.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1436.20 # particular file as subject to the "Classpath" exception as provided
1436.21 -# by Sun in the GPL Version 2 section of the License file that
1436.22 +# by Oracle in the GPL Version 2 section of the License file that
1436.23 # accompanied this code. If applicable, add the following below the
1436.24 # License Header, with the fields enclosed by brackets [] replaced by
1436.25 # your own identifying information:
1437.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCheckboxLayoutStylesDomain.java Fri Jul 16 11:47:36 2010 -0400
1437.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCheckboxLayoutStylesDomain.java Fri Jul 16 14:21:50 2010 -0400
1437.3 @@ -1,7 +1,10 @@
1437.4 /*
1437.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1437.6 *
1437.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1437.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1437.9 + *
1437.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1437.11 + * Other names may be trademarks of their respective owners.
1437.12 *
1437.13 * The contents of this file are subject to the terms of either the GNU
1437.14 * General Public License Version 2 only ("GPL") or the Common
1437.15 @@ -13,9 +16,9 @@
1437.16 * specific language governing permissions and limitations under the
1437.17 * License. When distributing the software, include this License Header
1437.18 * Notice in each file and include the License file at
1437.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1437.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1437.21 * particular file as subject to the "Classpath" exception as provided
1437.22 - * by Sun in the GPL Version 2 section of the License file that
1437.23 + * by Oracle in the GPL Version 2 section of the License file that
1437.24 * accompanied this code. If applicable, add the following below the
1437.25 * License Header, with the fields enclosed by brackets [] replaced by
1437.26 * your own identifying information:
1438.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandButtonBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1438.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandButtonBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1438.3 @@ -1,7 +1,10 @@
1438.4 /*
1438.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1438.6 *
1438.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1438.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1438.9 + *
1438.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1438.11 + * Other names may be trademarks of their respective owners.
1438.12 *
1438.13 * The contents of this file are subject to the terms of either the GNU
1438.14 * General Public License Version 2 only ("GPL") or the Common
1438.15 @@ -13,9 +16,9 @@
1438.16 * specific language governing permissions and limitations under the
1438.17 * License. When distributing the software, include this License Header
1438.18 * Notice in each file and include the License file at
1438.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1438.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1438.21 * particular file as subject to the "Classpath" exception as provided
1438.22 - * by Sun in the GPL Version 2 section of the License file that
1438.23 + * by Oracle in the GPL Version 2 section of the License file that
1438.24 * accompanied this code. If applicable, add the following below the
1438.25 * License Header, with the fields enclosed by brackets [] replaced by
1438.26 * your own identifying information:
1439.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandButtonDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1439.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandButtonDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1439.3 @@ -1,7 +1,10 @@
1439.4 /*
1439.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1439.6 *
1439.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1439.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1439.9 + *
1439.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1439.11 + * Other names may be trademarks of their respective owners.
1439.12 *
1439.13 * The contents of this file are subject to the terms of either the GNU
1439.14 * General Public License Version 2 only ("GPL") or the Common
1439.15 @@ -13,9 +16,9 @@
1439.16 * specific language governing permissions and limitations under the
1439.17 * License. When distributing the software, include this License Header
1439.18 * Notice in each file and include the License file at
1439.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1439.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1439.21 * particular file as subject to the "Classpath" exception as provided
1439.22 - * by Sun in the GPL Version 2 section of the License file that
1439.23 + * by Oracle in the GPL Version 2 section of the License file that
1439.24 * accompanied this code. If applicable, add the following below the
1439.25 * License Header, with the fields enclosed by brackets [] replaced by
1439.26 * your own identifying information:
1440.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandButtonTypesDomain.java Fri Jul 16 11:47:36 2010 -0400
1440.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandButtonTypesDomain.java Fri Jul 16 14:21:50 2010 -0400
1440.3 @@ -1,7 +1,10 @@
1440.4 /*
1440.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1440.6 *
1440.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1440.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1440.9 + *
1440.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1440.11 + * Other names may be trademarks of their respective owners.
1440.12 *
1440.13 * The contents of this file are subject to the terms of either the GNU
1440.14 * General Public License Version 2 only ("GPL") or the Common
1440.15 @@ -13,9 +16,9 @@
1440.16 * specific language governing permissions and limitations under the
1440.17 * License. When distributing the software, include this License Header
1440.18 * Notice in each file and include the License file at
1440.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1440.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1440.21 * particular file as subject to the "Classpath" exception as provided
1440.22 - * by Sun in the GPL Version 2 section of the License file that
1440.23 + * by Oracle in the GPL Version 2 section of the License file that
1440.24 * accompanied this code. If applicable, add the following below the
1440.25 * License Header, with the fields enclosed by brackets [] replaced by
1440.26 * your own identifying information:
1441.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandLinkBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1441.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandLinkBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1441.3 @@ -1,7 +1,10 @@
1441.4 /*
1441.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1441.6 *
1441.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1441.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1441.9 + *
1441.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1441.11 + * Other names may be trademarks of their respective owners.
1441.12 *
1441.13 * The contents of this file are subject to the terms of either the GNU
1441.14 * General Public License Version 2 only ("GPL") or the Common
1441.15 @@ -13,9 +16,9 @@
1441.16 * specific language governing permissions and limitations under the
1441.17 * License. When distributing the software, include this License Header
1441.18 * Notice in each file and include the License file at
1441.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1441.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1441.21 * particular file as subject to the "Classpath" exception as provided
1441.22 - * by Sun in the GPL Version 2 section of the License file that
1441.23 + * by Oracle in the GPL Version 2 section of the License file that
1441.24 * accompanied this code. If applicable, add the following below the
1441.25 * License Header, with the fields enclosed by brackets [] replaced by
1441.26 * your own identifying information:
1442.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandLinkDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1442.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlCommandLinkDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1442.3 @@ -1,7 +1,10 @@
1442.4 /*
1442.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1442.6 *
1442.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1442.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1442.9 + *
1442.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1442.11 + * Other names may be trademarks of their respective owners.
1442.12 *
1442.13 * The contents of this file are subject to the terms of either the GNU
1442.14 * General Public License Version 2 only ("GPL") or the Common
1442.15 @@ -13,9 +16,9 @@
1442.16 * specific language governing permissions and limitations under the
1442.17 * License. When distributing the software, include this License Header
1442.18 * Notice in each file and include the License file at
1442.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1442.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1442.21 * particular file as subject to the "Classpath" exception as provided
1442.22 - * by Sun in the GPL Version 2 section of the License file that
1442.23 + * by Oracle in the GPL Version 2 section of the License file that
1442.24 * accompanied this code. If applicable, add the following below the
1442.25 * License Header, with the fields enclosed by brackets [] replaced by
1442.26 * your own identifying information:
1443.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableAddColumnAction.java Fri Jul 16 11:47:36 2010 -0400
1443.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableAddColumnAction.java Fri Jul 16 14:21:50 2010 -0400
1443.3 @@ -1,7 +1,10 @@
1443.4 /*
1443.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1443.6 *
1443.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1443.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1443.9 + *
1443.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1443.11 + * Other names may be trademarks of their respective owners.
1443.12 *
1443.13 * The contents of this file are subject to the terms of either the GNU
1443.14 * General Public License Version 2 only ("GPL") or the Common
1443.15 @@ -13,9 +16,9 @@
1443.16 * specific language governing permissions and limitations under the
1443.17 * License. When distributing the software, include this License Header
1443.18 * Notice in each file and include the License file at
1443.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1443.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1443.21 * particular file as subject to the "Classpath" exception as provided
1443.22 - * by Sun in the GPL Version 2 section of the License file that
1443.23 + * by Oracle in the GPL Version 2 section of the License file that
1443.24 * accompanied this code. If applicable, add the following below the
1443.25 * License Header, with the fields enclosed by brackets [] replaced by
1443.26 * your own identifying information:
1444.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1444.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1444.3 @@ -1,7 +1,10 @@
1444.4 /*
1444.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1444.6 *
1444.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1444.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1444.9 + *
1444.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1444.11 + * Other names may be trademarks of their respective owners.
1444.12 *
1444.13 * The contents of this file are subject to the terms of either the GNU
1444.14 * General Public License Version 2 only ("GPL") or the Common
1444.15 @@ -13,9 +16,9 @@
1444.16 * specific language governing permissions and limitations under the
1444.17 * License. When distributing the software, include this License Header
1444.18 * Notice in each file and include the License file at
1444.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1444.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1444.21 * particular file as subject to the "Classpath" exception as provided
1444.22 - * by Sun in the GPL Version 2 section of the License file that
1444.23 + * by Oracle in the GPL Version 2 section of the License file that
1444.24 * accompanied this code. If applicable, add the following below the
1444.25 * License Header, with the fields enclosed by brackets [] replaced by
1444.26 * your own identifying information:
1445.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizer.java Fri Jul 16 11:47:36 2010 -0400
1445.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizer.java Fri Jul 16 14:21:50 2010 -0400
1445.3 @@ -1,7 +1,10 @@
1445.4 /*
1445.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1445.6 *
1445.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1445.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1445.9 + *
1445.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1445.11 + * Other names may be trademarks of their respective owners.
1445.12 *
1445.13 * The contents of this file are subject to the terms of either the GNU
1445.14 * General Public License Version 2 only ("GPL") or the Common
1445.15 @@ -13,9 +16,9 @@
1445.16 * specific language governing permissions and limitations under the
1445.17 * License. When distributing the software, include this License Header
1445.18 * Notice in each file and include the License file at
1445.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1445.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1445.21 * particular file as subject to the "Classpath" exception as provided
1445.22 - * by Sun in the GPL Version 2 section of the License file that
1445.23 + * by Oracle in the GPL Version 2 section of the License file that
1445.24 * accompanied this code. If applicable, add the following below the
1445.25 * License Header, with the fields enclosed by brackets [] replaced by
1445.26 * your own identifying information:
1446.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1446.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1446.3 @@ -1,7 +1,10 @@
1446.4 /*
1446.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1446.6 *
1446.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1446.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1446.9 + *
1446.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1446.11 + * Other names may be trademarks of their respective owners.
1446.12 *
1446.13 * The contents of this file are subject to the terms of either the GNU
1446.14 * General Public License Version 2 only ("GPL") or the Common
1446.15 @@ -13,9 +16,9 @@
1446.16 * specific language governing permissions and limitations under the
1446.17 * License. When distributing the software, include this License Header
1446.18 * Notice in each file and include the License file at
1446.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1446.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1446.21 * particular file as subject to the "Classpath" exception as provided
1446.22 - * by Sun in the GPL Version 2 section of the License file that
1446.23 + * by Oracle in the GPL Version 2 section of the License file that
1446.24 * accompanied this code. If applicable, add the following below the
1446.25 * License Header, with the fields enclosed by brackets [] replaced by
1446.26 * your own identifying information:
1447.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizerColumnsPanel.java Fri Jul 16 11:47:36 2010 -0400
1447.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizerColumnsPanel.java Fri Jul 16 14:21:50 2010 -0400
1447.3 @@ -1,7 +1,10 @@
1447.4 /*
1447.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1447.6 *
1447.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1447.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1447.9 + *
1447.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1447.11 + * Other names may be trademarks of their respective owners.
1447.12 *
1447.13 * The contents of this file are subject to the terms of either the GNU
1447.14 * General Public License Version 2 only ("GPL") or the Common
1447.15 @@ -13,9 +16,9 @@
1447.16 * specific language governing permissions and limitations under the
1447.17 * License. When distributing the software, include this License Header
1447.18 * Notice in each file and include the License file at
1447.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1447.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1447.21 * particular file as subject to the "Classpath" exception as provided
1447.22 - * by Sun in the GPL Version 2 section of the License file that
1447.23 + * by Oracle in the GPL Version 2 section of the License file that
1447.24 * accompanied this code. If applicable, add the following below the
1447.25 * License Header, with the fields enclosed by brackets [] replaced by
1447.26 * your own identifying information:
1448.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizerMainPanel.java Fri Jul 16 11:47:36 2010 -0400
1448.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizerMainPanel.java Fri Jul 16 14:21:50 2010 -0400
1448.3 @@ -1,7 +1,10 @@
1448.4 /*
1448.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1448.6 *
1448.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1448.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1448.9 + *
1448.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1448.11 + * Other names may be trademarks of their respective owners.
1448.12 *
1448.13 * The contents of this file are subject to the terms of either the GNU
1448.14 * General Public License Version 2 only ("GPL") or the Common
1448.15 @@ -13,9 +16,9 @@
1448.16 * specific language governing permissions and limitations under the
1448.17 * License. When distributing the software, include this License Header
1448.18 * Notice in each file and include the License file at
1448.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1448.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1448.21 * particular file as subject to the "Classpath" exception as provided
1448.22 - * by Sun in the GPL Version 2 section of the License file that
1448.23 + * by Oracle in the GPL Version 2 section of the License file that
1448.24 * accompanied this code. If applicable, add the following below the
1448.25 * License Header, with the fields enclosed by brackets [] replaced by
1448.26 * your own identifying information:
1449.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizerPagingPanel.java Fri Jul 16 11:47:36 2010 -0400
1449.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableCustomizerPagingPanel.java Fri Jul 16 14:21:50 2010 -0400
1449.3 @@ -1,7 +1,10 @@
1449.4 /*
1449.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1449.6 *
1449.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1449.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1449.9 + *
1449.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1449.11 + * Other names may be trademarks of their respective owners.
1449.12 *
1449.13 * The contents of this file are subject to the terms of either the GNU
1449.14 * General Public License Version 2 only ("GPL") or the Common
1449.15 @@ -13,9 +16,9 @@
1449.16 * specific language governing permissions and limitations under the
1449.17 * License. When distributing the software, include this License Header
1449.18 * Notice in each file and include the License file at
1449.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1449.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1449.21 * particular file as subject to the "Classpath" exception as provided
1449.22 - * by Sun in the GPL Version 2 section of the License file that
1449.23 + * by Oracle in the GPL Version 2 section of the License file that
1449.24 * accompanied this code. If applicable, add the following below the
1449.25 * License Header, with the fields enclosed by brackets [] replaced by
1449.26 * your own identifying information:
1450.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1450.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1450.3 @@ -1,7 +1,10 @@
1450.4 /*
1450.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1450.6 *
1450.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1450.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1450.9 + *
1450.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1450.11 + * Other names may be trademarks of their respective owners.
1450.12 *
1450.13 * The contents of this file are subject to the terms of either the GNU
1450.14 * General Public License Version 2 only ("GPL") or the Common
1450.15 @@ -13,9 +16,9 @@
1450.16 * specific language governing permissions and limitations under the
1450.17 * License. When distributing the software, include this License Header
1450.18 * Notice in each file and include the License file at
1450.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1450.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1450.21 * particular file as subject to the "Classpath" exception as provided
1450.22 - * by Sun in the GPL Version 2 section of the License file that
1450.23 + * by Oracle in the GPL Version 2 section of the License file that
1450.24 * accompanied this code. If applicable, add the following below the
1450.25 * License Header, with the fields enclosed by brackets [] replaced by
1450.26 * your own identifying information:
1451.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableState.java Fri Jul 16 11:47:36 2010 -0400
1451.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlDataTableState.java Fri Jul 16 14:21:50 2010 -0400
1451.3 @@ -1,7 +1,10 @@
1451.4 /*
1451.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1451.6 *
1451.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1451.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1451.9 + *
1451.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1451.11 + * Other names may be trademarks of their respective owners.
1451.12 *
1451.13 * The contents of this file are subject to the terms of either the GNU
1451.14 * General Public License Version 2 only ("GPL") or the Common
1451.15 @@ -13,9 +16,9 @@
1451.16 * specific language governing permissions and limitations under the
1451.17 * License. When distributing the software, include this License Header
1451.18 * Notice in each file and include the License file at
1451.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1451.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1451.21 * particular file as subject to the "Classpath" exception as provided
1451.22 - * by Sun in the GPL Version 2 section of the License file that
1451.23 + * by Oracle in the GPL Version 2 section of the License file that
1451.24 * accompanied this code. If applicable, add the following below the
1451.25 * License Header, with the fields enclosed by brackets [] replaced by
1451.26 * your own identifying information:
1452.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlGraphicImageBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1452.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlGraphicImageBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1452.3 @@ -1,7 +1,10 @@
1452.4 /*
1452.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1452.6 *
1452.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1452.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1452.9 + *
1452.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1452.11 + * Other names may be trademarks of their respective owners.
1452.12 *
1452.13 * The contents of this file are subject to the terms of either the GNU
1452.14 * General Public License Version 2 only ("GPL") or the Common
1452.15 @@ -13,9 +16,9 @@
1452.16 * specific language governing permissions and limitations under the
1452.17 * License. When distributing the software, include this License Header
1452.18 * Notice in each file and include the License file at
1452.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1452.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1452.21 * particular file as subject to the "Classpath" exception as provided
1452.22 - * by Sun in the GPL Version 2 section of the License file that
1452.23 + * by Oracle in the GPL Version 2 section of the License file that
1452.24 * accompanied this code. If applicable, add the following below the
1452.25 * License Header, with the fields enclosed by brackets [] replaced by
1452.26 * your own identifying information:
1453.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlGraphicImageDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1453.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlGraphicImageDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1453.3 @@ -1,7 +1,10 @@
1453.4 /*
1453.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1453.6 *
1453.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1453.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1453.9 + *
1453.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1453.11 + * Other names may be trademarks of their respective owners.
1453.12 *
1453.13 * The contents of this file are subject to the terms of either the GNU
1453.14 * General Public License Version 2 only ("GPL") or the Common
1453.15 @@ -13,9 +16,9 @@
1453.16 * specific language governing permissions and limitations under the
1453.17 * License. When distributing the software, include this License Header
1453.18 * Notice in each file and include the License file at
1453.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1453.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1453.21 * particular file as subject to the "Classpath" exception as provided
1453.22 - * by Sun in the GPL Version 2 section of the License file that
1453.23 + * by Oracle in the GPL Version 2 section of the License file that
1453.24 * accompanied this code. If applicable, add the following below the
1453.25 * License Header, with the fields enclosed by brackets [] replaced by
1453.26 * your own identifying information:
1454.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputHiddenBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1454.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputHiddenBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1454.3 @@ -1,7 +1,10 @@
1454.4 /*
1454.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1454.6 *
1454.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1454.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1454.9 + *
1454.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1454.11 + * Other names may be trademarks of their respective owners.
1454.12 *
1454.13 * The contents of this file are subject to the terms of either the GNU
1454.14 * General Public License Version 2 only ("GPL") or the Common
1454.15 @@ -13,9 +16,9 @@
1454.16 * specific language governing permissions and limitations under the
1454.17 * License. When distributing the software, include this License Header
1454.18 * Notice in each file and include the License file at
1454.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1454.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1454.21 * particular file as subject to the "Classpath" exception as provided
1454.22 - * by Sun in the GPL Version 2 section of the License file that
1454.23 + * by Oracle in the GPL Version 2 section of the License file that
1454.24 * accompanied this code. If applicable, add the following below the
1454.25 * License Header, with the fields enclosed by brackets [] replaced by
1454.26 * your own identifying information:
1455.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputHiddenDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1455.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputHiddenDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1455.3 @@ -1,7 +1,10 @@
1455.4 /*
1455.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1455.6 *
1455.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1455.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1455.9 + *
1455.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1455.11 + * Other names may be trademarks of their respective owners.
1455.12 *
1455.13 * The contents of this file are subject to the terms of either the GNU
1455.14 * General Public License Version 2 only ("GPL") or the Common
1455.15 @@ -13,9 +16,9 @@
1455.16 * specific language governing permissions and limitations under the
1455.17 * License. When distributing the software, include this License Header
1455.18 * Notice in each file and include the License file at
1455.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1455.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1455.21 * particular file as subject to the "Classpath" exception as provided
1455.22 - * by Sun in the GPL Version 2 section of the License file that
1455.23 + * by Oracle in the GPL Version 2 section of the License file that
1455.24 * accompanied this code. If applicable, add the following below the
1455.25 * License Header, with the fields enclosed by brackets [] replaced by
1455.26 * your own identifying information:
1456.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputSecretBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1456.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputSecretBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1456.3 @@ -1,7 +1,10 @@
1456.4 /*
1456.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1456.6 *
1456.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1456.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1456.9 + *
1456.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1456.11 + * Other names may be trademarks of their respective owners.
1456.12 *
1456.13 * The contents of this file are subject to the terms of either the GNU
1456.14 * General Public License Version 2 only ("GPL") or the Common
1456.15 @@ -13,9 +16,9 @@
1456.16 * specific language governing permissions and limitations under the
1456.17 * License. When distributing the software, include this License Header
1456.18 * Notice in each file and include the License file at
1456.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1456.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1456.21 * particular file as subject to the "Classpath" exception as provided
1456.22 - * by Sun in the GPL Version 2 section of the License file that
1456.23 + * by Oracle in the GPL Version 2 section of the License file that
1456.24 * accompanied this code. If applicable, add the following below the
1456.25 * License Header, with the fields enclosed by brackets [] replaced by
1456.26 * your own identifying information:
1457.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputSecretDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1457.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputSecretDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1457.3 @@ -1,7 +1,10 @@
1457.4 /*
1457.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1457.6 *
1457.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1457.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1457.9 + *
1457.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1457.11 + * Other names may be trademarks of their respective owners.
1457.12 *
1457.13 * The contents of this file are subject to the terms of either the GNU
1457.14 * General Public License Version 2 only ("GPL") or the Common
1457.15 @@ -13,9 +16,9 @@
1457.16 * specific language governing permissions and limitations under the
1457.17 * License. When distributing the software, include this License Header
1457.18 * Notice in each file and include the License file at
1457.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1457.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1457.21 * particular file as subject to the "Classpath" exception as provided
1457.22 - * by Sun in the GPL Version 2 section of the License file that
1457.23 + * by Oracle in the GPL Version 2 section of the License file that
1457.24 * accompanied this code. If applicable, add the following below the
1457.25 * License Header, with the fields enclosed by brackets [] replaced by
1457.26 * your own identifying information:
1458.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputTextBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1458.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputTextBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1458.3 @@ -1,7 +1,10 @@
1458.4 /*
1458.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1458.6 *
1458.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1458.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1458.9 + *
1458.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1458.11 + * Other names may be trademarks of their respective owners.
1458.12 *
1458.13 * The contents of this file are subject to the terms of either the GNU
1458.14 * General Public License Version 2 only ("GPL") or the Common
1458.15 @@ -13,9 +16,9 @@
1458.16 * specific language governing permissions and limitations under the
1458.17 * License. When distributing the software, include this License Header
1458.18 * Notice in each file and include the License file at
1458.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1458.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1458.21 * particular file as subject to the "Classpath" exception as provided
1458.22 - * by Sun in the GPL Version 2 section of the License file that
1458.23 + * by Oracle in the GPL Version 2 section of the License file that
1458.24 * accompanied this code. If applicable, add the following below the
1458.25 * License Header, with the fields enclosed by brackets [] replaced by
1458.26 * your own identifying information:
1459.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputTextDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1459.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputTextDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1459.3 @@ -1,7 +1,10 @@
1459.4 /*
1459.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1459.6 *
1459.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1459.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1459.9 + *
1459.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1459.11 + * Other names may be trademarks of their respective owners.
1459.12 *
1459.13 * The contents of this file are subject to the terms of either the GNU
1459.14 * General Public License Version 2 only ("GPL") or the Common
1459.15 @@ -13,9 +16,9 @@
1459.16 * specific language governing permissions and limitations under the
1459.17 * License. When distributing the software, include this License Header
1459.18 * Notice in each file and include the License file at
1459.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1459.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1459.21 * particular file as subject to the "Classpath" exception as provided
1459.22 - * by Sun in the GPL Version 2 section of the License file that
1459.23 + * by Oracle in the GPL Version 2 section of the License file that
1459.24 * accompanied this code. If applicable, add the following below the
1459.25 * License Header, with the fields enclosed by brackets [] replaced by
1459.26 * your own identifying information:
1460.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputTextareaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1460.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputTextareaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1460.3 @@ -1,7 +1,10 @@
1460.4 /*
1460.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1460.6 *
1460.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1460.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1460.9 + *
1460.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1460.11 + * Other names may be trademarks of their respective owners.
1460.12 *
1460.13 * The contents of this file are subject to the terms of either the GNU
1460.14 * General Public License Version 2 only ("GPL") or the Common
1460.15 @@ -13,9 +16,9 @@
1460.16 * specific language governing permissions and limitations under the
1460.17 * License. When distributing the software, include this License Header
1460.18 * Notice in each file and include the License file at
1460.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1460.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1460.21 * particular file as subject to the "Classpath" exception as provided
1460.22 - * by Sun in the GPL Version 2 section of the License file that
1460.23 + * by Oracle in the GPL Version 2 section of the License file that
1460.24 * accompanied this code. If applicable, add the following below the
1460.25 * License Header, with the fields enclosed by brackets [] replaced by
1460.26 * your own identifying information:
1461.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputTextareaDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1461.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlInputTextareaDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1461.3 @@ -1,7 +1,10 @@
1461.4 /*
1461.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1461.6 *
1461.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1461.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1461.9 + *
1461.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1461.11 + * Other names may be trademarks of their respective owners.
1461.12 *
1461.13 * The contents of this file are subject to the terms of either the GNU
1461.14 * General Public License Version 2 only ("GPL") or the Common
1461.15 @@ -13,9 +16,9 @@
1461.16 * specific language governing permissions and limitations under the
1461.17 * License. When distributing the software, include this License Header
1461.18 * Notice in each file and include the License file at
1461.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1461.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1461.21 * particular file as subject to the "Classpath" exception as provided
1461.22 - * by Sun in the GPL Version 2 section of the License file that
1461.23 + * by Oracle in the GPL Version 2 section of the License file that
1461.24 * accompanied this code. If applicable, add the following below the
1461.25 * License Header, with the fields enclosed by brackets [] replaced by
1461.26 * your own identifying information:
1462.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessageBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1462.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessageBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1462.3 @@ -1,7 +1,10 @@
1462.4 /*
1462.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1462.6 *
1462.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1462.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1462.9 + *
1462.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1462.11 + * Other names may be trademarks of their respective owners.
1462.12 *
1462.13 * The contents of this file are subject to the terms of either the GNU
1462.14 * General Public License Version 2 only ("GPL") or the Common
1462.15 @@ -13,9 +16,9 @@
1462.16 * specific language governing permissions and limitations under the
1462.17 * License. When distributing the software, include this License Header
1462.18 * Notice in each file and include the License file at
1462.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1462.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1462.21 * particular file as subject to the "Classpath" exception as provided
1462.22 - * by Sun in the GPL Version 2 section of the License file that
1462.23 + * by Oracle in the GPL Version 2 section of the License file that
1462.24 * accompanied this code. If applicable, add the following below the
1462.25 * License Header, with the fields enclosed by brackets [] replaced by
1462.26 * your own identifying information:
1463.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessageDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1463.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessageDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1463.3 @@ -1,7 +1,10 @@
1463.4 /*
1463.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1463.6 *
1463.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1463.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1463.9 + *
1463.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1463.11 + * Other names may be trademarks of their respective owners.
1463.12 *
1463.13 * The contents of this file are subject to the terms of either the GNU
1463.14 * General Public License Version 2 only ("GPL") or the Common
1463.15 @@ -13,9 +16,9 @@
1463.16 * specific language governing permissions and limitations under the
1463.17 * License. When distributing the software, include this License Header
1463.18 * Notice in each file and include the License file at
1463.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1463.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1463.21 * particular file as subject to the "Classpath" exception as provided
1463.22 - * by Sun in the GPL Version 2 section of the License file that
1463.23 + * by Oracle in the GPL Version 2 section of the License file that
1463.24 * accompanied this code. If applicable, add the following below the
1463.25 * License Header, with the fields enclosed by brackets [] replaced by
1463.26 * your own identifying information:
1464.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessagesBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1464.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessagesBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1464.3 @@ -1,7 +1,10 @@
1464.4 /*
1464.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1464.6 *
1464.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1464.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1464.9 + *
1464.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1464.11 + * Other names may be trademarks of their respective owners.
1464.12 *
1464.13 * The contents of this file are subject to the terms of either the GNU
1464.14 * General Public License Version 2 only ("GPL") or the Common
1464.15 @@ -13,9 +16,9 @@
1464.16 * specific language governing permissions and limitations under the
1464.17 * License. When distributing the software, include this License Header
1464.18 * Notice in each file and include the License file at
1464.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1464.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1464.21 * particular file as subject to the "Classpath" exception as provided
1464.22 - * by Sun in the GPL Version 2 section of the License file that
1464.23 + * by Oracle in the GPL Version 2 section of the License file that
1464.24 * accompanied this code. If applicable, add the following below the
1464.25 * License Header, with the fields enclosed by brackets [] replaced by
1464.26 * your own identifying information:
1465.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessagesDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1465.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessagesDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1465.3 @@ -1,7 +1,10 @@
1465.4 /*
1465.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1465.6 *
1465.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1465.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1465.9 + *
1465.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1465.11 + * Other names may be trademarks of their respective owners.
1465.12 *
1465.13 * The contents of this file are subject to the terms of either the GNU
1465.14 * General Public License Version 2 only ("GPL") or the Common
1465.15 @@ -13,9 +16,9 @@
1465.16 * specific language governing permissions and limitations under the
1465.17 * License. When distributing the software, include this License Header
1465.18 * Notice in each file and include the License file at
1465.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1465.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1465.21 * particular file as subject to the "Classpath" exception as provided
1465.22 - * by Sun in the GPL Version 2 section of the License file that
1465.23 + * by Oracle in the GPL Version 2 section of the License file that
1465.24 * accompanied this code. If applicable, add the following below the
1465.25 * License Header, with the fields enclosed by brackets [] replaced by
1465.26 * your own identifying information:
1466.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessagesLayoutStylesDomain.java Fri Jul 16 11:47:36 2010 -0400
1466.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlMessagesLayoutStylesDomain.java Fri Jul 16 14:21:50 2010 -0400
1466.3 @@ -1,7 +1,10 @@
1466.4 /*
1466.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1466.6 *
1466.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1466.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1466.9 + *
1466.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1466.11 + * Other names may be trademarks of their respective owners.
1466.12 *
1466.13 * The contents of this file are subject to the terms of either the GNU
1466.14 * General Public License Version 2 only ("GPL") or the Common
1466.15 @@ -13,9 +16,9 @@
1466.16 * specific language governing permissions and limitations under the
1466.17 * License. When distributing the software, include this License Header
1466.18 * Notice in each file and include the License file at
1466.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1466.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1466.21 * particular file as subject to the "Classpath" exception as provided
1466.22 - * by Sun in the GPL Version 2 section of the License file that
1466.23 + * by Oracle in the GPL Version 2 section of the License file that
1466.24 * accompanied this code. If applicable, add the following below the
1466.25 * License Header, with the fields enclosed by brackets [] replaced by
1466.26 * your own identifying information:
1467.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputFormatBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1467.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputFormatBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1467.3 @@ -1,7 +1,10 @@
1467.4 /*
1467.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1467.6 *
1467.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1467.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1467.9 + *
1467.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1467.11 + * Other names may be trademarks of their respective owners.
1467.12 *
1467.13 * The contents of this file are subject to the terms of either the GNU
1467.14 * General Public License Version 2 only ("GPL") or the Common
1467.15 @@ -13,9 +16,9 @@
1467.16 * specific language governing permissions and limitations under the
1467.17 * License. When distributing the software, include this License Header
1467.18 * Notice in each file and include the License file at
1467.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1467.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1467.21 * particular file as subject to the "Classpath" exception as provided
1467.22 - * by Sun in the GPL Version 2 section of the License file that
1467.23 + * by Oracle in the GPL Version 2 section of the License file that
1467.24 * accompanied this code. If applicable, add the following below the
1467.25 * License Header, with the fields enclosed by brackets [] replaced by
1467.26 * your own identifying information:
1468.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputFormatDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1468.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputFormatDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1468.3 @@ -1,7 +1,10 @@
1468.4 /*
1468.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1468.6 *
1468.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1468.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1468.9 + *
1468.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1468.11 + * Other names may be trademarks of their respective owners.
1468.12 *
1468.13 * The contents of this file are subject to the terms of either the GNU
1468.14 * General Public License Version 2 only ("GPL") or the Common
1468.15 @@ -13,9 +16,9 @@
1468.16 * specific language governing permissions and limitations under the
1468.17 * License. When distributing the software, include this License Header
1468.18 * Notice in each file and include the License file at
1468.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1468.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1468.21 * particular file as subject to the "Classpath" exception as provided
1468.22 - * by Sun in the GPL Version 2 section of the License file that
1468.23 + * by Oracle in the GPL Version 2 section of the License file that
1468.24 * accompanied this code. If applicable, add the following below the
1468.25 * License Header, with the fields enclosed by brackets [] replaced by
1468.26 * your own identifying information:
1469.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputLabelBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1469.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputLabelBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1469.3 @@ -1,7 +1,10 @@
1469.4 /*
1469.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1469.6 *
1469.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1469.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1469.9 + *
1469.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1469.11 + * Other names may be trademarks of their respective owners.
1469.12 *
1469.13 * The contents of this file are subject to the terms of either the GNU
1469.14 * General Public License Version 2 only ("GPL") or the Common
1469.15 @@ -13,9 +16,9 @@
1469.16 * specific language governing permissions and limitations under the
1469.17 * License. When distributing the software, include this License Header
1469.18 * Notice in each file and include the License file at
1469.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1469.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1469.21 * particular file as subject to the "Classpath" exception as provided
1469.22 - * by Sun in the GPL Version 2 section of the License file that
1469.23 + * by Oracle in the GPL Version 2 section of the License file that
1469.24 * accompanied this code. If applicable, add the following below the
1469.25 * License Header, with the fields enclosed by brackets [] replaced by
1469.26 * your own identifying information:
1470.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputLabelDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1470.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputLabelDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1470.3 @@ -1,7 +1,10 @@
1470.4 /*
1470.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1470.6 *
1470.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1470.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1470.9 + *
1470.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1470.11 + * Other names may be trademarks of their respective owners.
1470.12 *
1470.13 * The contents of this file are subject to the terms of either the GNU
1470.14 * General Public License Version 2 only ("GPL") or the Common
1470.15 @@ -13,9 +16,9 @@
1470.16 * specific language governing permissions and limitations under the
1470.17 * License. When distributing the software, include this License Header
1470.18 * Notice in each file and include the License file at
1470.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1470.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1470.21 * particular file as subject to the "Classpath" exception as provided
1470.22 - * by Sun in the GPL Version 2 section of the License file that
1470.23 + * by Oracle in the GPL Version 2 section of the License file that
1470.24 * accompanied this code. If applicable, add the following below the
1470.25 * License Header, with the fields enclosed by brackets [] replaced by
1470.26 * your own identifying information:
1471.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputLinkBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1471.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputLinkBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1471.3 @@ -1,7 +1,10 @@
1471.4 /*
1471.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1471.6 *
1471.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1471.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1471.9 + *
1471.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1471.11 + * Other names may be trademarks of their respective owners.
1471.12 *
1471.13 * The contents of this file are subject to the terms of either the GNU
1471.14 * General Public License Version 2 only ("GPL") or the Common
1471.15 @@ -13,9 +16,9 @@
1471.16 * specific language governing permissions and limitations under the
1471.17 * License. When distributing the software, include this License Header
1471.18 * Notice in each file and include the License file at
1471.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1471.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1471.21 * particular file as subject to the "Classpath" exception as provided
1471.22 - * by Sun in the GPL Version 2 section of the License file that
1471.23 + * by Oracle in the GPL Version 2 section of the License file that
1471.24 * accompanied this code. If applicable, add the following below the
1471.25 * License Header, with the fields enclosed by brackets [] replaced by
1471.26 * your own identifying information:
1472.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputLinkDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1472.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputLinkDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1472.3 @@ -1,7 +1,10 @@
1472.4 /*
1472.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1472.6 *
1472.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1472.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1472.9 + *
1472.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1472.11 + * Other names may be trademarks of their respective owners.
1472.12 *
1472.13 * The contents of this file are subject to the terms of either the GNU
1472.14 * General Public License Version 2 only ("GPL") or the Common
1472.15 @@ -13,9 +16,9 @@
1472.16 * specific language governing permissions and limitations under the
1472.17 * License. When distributing the software, include this License Header
1472.18 * Notice in each file and include the License file at
1472.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1472.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1472.21 * particular file as subject to the "Classpath" exception as provided
1472.22 - * by Sun in the GPL Version 2 section of the License file that
1472.23 + * by Oracle in the GPL Version 2 section of the License file that
1472.24 * accompanied this code. If applicable, add the following below the
1472.25 * License Header, with the fields enclosed by brackets [] replaced by
1472.26 * your own identifying information:
1473.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputTextBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1473.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputTextBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1473.3 @@ -1,7 +1,10 @@
1473.4 /*
1473.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1473.6 *
1473.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1473.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1473.9 + *
1473.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1473.11 + * Other names may be trademarks of their respective owners.
1473.12 *
1473.13 * The contents of this file are subject to the terms of either the GNU
1473.14 * General Public License Version 2 only ("GPL") or the Common
1473.15 @@ -13,9 +16,9 @@
1473.16 * specific language governing permissions and limitations under the
1473.17 * License. When distributing the software, include this License Header
1473.18 * Notice in each file and include the License file at
1473.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1473.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1473.21 * particular file as subject to the "Classpath" exception as provided
1473.22 - * by Sun in the GPL Version 2 section of the License file that
1473.23 + * by Oracle in the GPL Version 2 section of the License file that
1473.24 * accompanied this code. If applicable, add the following below the
1473.25 * License Header, with the fields enclosed by brackets [] replaced by
1473.26 * your own identifying information:
1474.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputTextDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1474.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlOutputTextDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1474.3 @@ -1,7 +1,10 @@
1474.4 /*
1474.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1474.6 *
1474.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1474.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1474.9 + *
1474.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1474.11 + * Other names may be trademarks of their respective owners.
1474.12 *
1474.13 * The contents of this file are subject to the terms of either the GNU
1474.14 * General Public License Version 2 only ("GPL") or the Common
1474.15 @@ -13,9 +16,9 @@
1474.16 * specific language governing permissions and limitations under the
1474.17 * License. When distributing the software, include this License Header
1474.18 * Notice in each file and include the License file at
1474.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1474.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1474.21 * particular file as subject to the "Classpath" exception as provided
1474.22 - * by Sun in the GPL Version 2 section of the License file that
1474.23 + * by Oracle in the GPL Version 2 section of the License file that
1474.24 * accompanied this code. If applicable, add the following below the
1474.25 * License Header, with the fields enclosed by brackets [] replaced by
1474.26 * your own identifying information:
1475.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectBooleanCheckboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1475.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectBooleanCheckboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1475.3 @@ -1,7 +1,10 @@
1475.4 /*
1475.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1475.6 *
1475.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1475.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1475.9 + *
1475.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1475.11 + * Other names may be trademarks of their respective owners.
1475.12 *
1475.13 * The contents of this file are subject to the terms of either the GNU
1475.14 * General Public License Version 2 only ("GPL") or the Common
1475.15 @@ -13,9 +16,9 @@
1475.16 * specific language governing permissions and limitations under the
1475.17 * License. When distributing the software, include this License Header
1475.18 * Notice in each file and include the License file at
1475.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1475.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1475.21 * particular file as subject to the "Classpath" exception as provided
1475.22 - * by Sun in the GPL Version 2 section of the License file that
1475.23 + * by Oracle in the GPL Version 2 section of the License file that
1475.24 * accompanied this code. If applicable, add the following below the
1475.25 * License Header, with the fields enclosed by brackets [] replaced by
1475.26 * your own identifying information:
1476.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectBooleanCheckboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1476.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectBooleanCheckboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1476.3 @@ -1,7 +1,10 @@
1476.4 /*
1476.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1476.6 *
1476.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1476.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1476.9 + *
1476.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1476.11 + * Other names may be trademarks of their respective owners.
1476.12 *
1476.13 * The contents of this file are subject to the terms of either the GNU
1476.14 * General Public License Version 2 only ("GPL") or the Common
1476.15 @@ -13,9 +16,9 @@
1476.16 * specific language governing permissions and limitations under the
1476.17 * License. When distributing the software, include this License Header
1476.18 * Notice in each file and include the License file at
1476.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1476.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1476.21 * particular file as subject to the "Classpath" exception as provided
1476.22 - * by Sun in the GPL Version 2 section of the License file that
1476.23 + * by Oracle in the GPL Version 2 section of the License file that
1476.24 * accompanied this code. If applicable, add the following below the
1476.25 * License Header, with the fields enclosed by brackets [] replaced by
1476.26 * your own identifying information:
1477.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectDesignInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1477.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectDesignInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1477.3 @@ -1,7 +1,10 @@
1477.4 /*
1477.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1477.6 *
1477.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1477.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1477.9 + *
1477.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1477.11 + * Other names may be trademarks of their respective owners.
1477.12 *
1477.13 * The contents of this file are subject to the terms of either the GNU
1477.14 * General Public License Version 2 only ("GPL") or the Common
1477.15 @@ -13,9 +16,9 @@
1477.16 * specific language governing permissions and limitations under the
1477.17 * License. When distributing the software, include this License Header
1477.18 * Notice in each file and include the License file at
1477.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1477.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1477.21 * particular file as subject to the "Classpath" exception as provided
1477.22 - * by Sun in the GPL Version 2 section of the License file that
1477.23 + * by Oracle in the GPL Version 2 section of the License file that
1477.24 * accompanied this code. If applicable, add the following below the
1477.25 * License Header, with the fields enclosed by brackets [] replaced by
1477.26 * your own identifying information:
1478.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyCheckboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1478.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyCheckboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1478.3 @@ -1,7 +1,10 @@
1478.4 /*
1478.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1478.6 *
1478.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1478.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1478.9 + *
1478.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1478.11 + * Other names may be trademarks of their respective owners.
1478.12 *
1478.13 * The contents of this file are subject to the terms of either the GNU
1478.14 * General Public License Version 2 only ("GPL") or the Common
1478.15 @@ -13,9 +16,9 @@
1478.16 * specific language governing permissions and limitations under the
1478.17 * License. When distributing the software, include this License Header
1478.18 * Notice in each file and include the License file at
1478.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1478.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1478.21 * particular file as subject to the "Classpath" exception as provided
1478.22 - * by Sun in the GPL Version 2 section of the License file that
1478.23 + * by Oracle in the GPL Version 2 section of the License file that
1478.24 * accompanied this code. If applicable, add the following below the
1478.25 * License Header, with the fields enclosed by brackets [] replaced by
1478.26 * your own identifying information:
1479.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyCheckboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1479.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyCheckboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1479.3 @@ -1,7 +1,10 @@
1479.4 /*
1479.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1479.6 *
1479.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1479.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1479.9 + *
1479.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1479.11 + * Other names may be trademarks of their respective owners.
1479.12 *
1479.13 * The contents of this file are subject to the terms of either the GNU
1479.14 * General Public License Version 2 only ("GPL") or the Common
1479.15 @@ -13,9 +16,9 @@
1479.16 * specific language governing permissions and limitations under the
1479.17 * License. When distributing the software, include this License Header
1479.18 * Notice in each file and include the License file at
1479.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1479.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1479.21 * particular file as subject to the "Classpath" exception as provided
1479.22 - * by Sun in the GPL Version 2 section of the License file that
1479.23 + * by Oracle in the GPL Version 2 section of the License file that
1479.24 * accompanied this code. If applicable, add the following below the
1479.25 * License Header, with the fields enclosed by brackets [] replaced by
1479.26 * your own identifying information:
1480.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyListboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1480.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyListboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1480.3 @@ -1,7 +1,10 @@
1480.4 /*
1480.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1480.6 *
1480.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1480.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1480.9 + *
1480.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1480.11 + * Other names may be trademarks of their respective owners.
1480.12 *
1480.13 * The contents of this file are subject to the terms of either the GNU
1480.14 * General Public License Version 2 only ("GPL") or the Common
1480.15 @@ -13,9 +16,9 @@
1480.16 * specific language governing permissions and limitations under the
1480.17 * License. When distributing the software, include this License Header
1480.18 * Notice in each file and include the License file at
1480.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1480.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1480.21 * particular file as subject to the "Classpath" exception as provided
1480.22 - * by Sun in the GPL Version 2 section of the License file that
1480.23 + * by Oracle in the GPL Version 2 section of the License file that
1480.24 * accompanied this code. If applicable, add the following below the
1480.25 * License Header, with the fields enclosed by brackets [] replaced by
1480.26 * your own identifying information:
1481.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyListboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1481.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyListboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1481.3 @@ -1,7 +1,10 @@
1481.4 /*
1481.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1481.6 *
1481.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1481.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1481.9 + *
1481.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1481.11 + * Other names may be trademarks of their respective owners.
1481.12 *
1481.13 * The contents of this file are subject to the terms of either the GNU
1481.14 * General Public License Version 2 only ("GPL") or the Common
1481.15 @@ -13,9 +16,9 @@
1481.16 * specific language governing permissions and limitations under the
1481.17 * License. When distributing the software, include this License Header
1481.18 * Notice in each file and include the License file at
1481.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1481.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1481.21 * particular file as subject to the "Classpath" exception as provided
1481.22 - * by Sun in the GPL Version 2 section of the License file that
1481.23 + * by Oracle in the GPL Version 2 section of the License file that
1481.24 * accompanied this code. If applicable, add the following below the
1481.25 * License Header, with the fields enclosed by brackets [] replaced by
1481.26 * your own identifying information:
1482.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyMenuBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1482.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyMenuBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1482.3 @@ -1,7 +1,10 @@
1482.4 /*
1482.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1482.6 *
1482.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1482.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1482.9 + *
1482.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1482.11 + * Other names may be trademarks of their respective owners.
1482.12 *
1482.13 * The contents of this file are subject to the terms of either the GNU
1482.14 * General Public License Version 2 only ("GPL") or the Common
1482.15 @@ -13,9 +16,9 @@
1482.16 * specific language governing permissions and limitations under the
1482.17 * License. When distributing the software, include this License Header
1482.18 * Notice in each file and include the License file at
1482.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1482.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1482.21 * particular file as subject to the "Classpath" exception as provided
1482.22 - * by Sun in the GPL Version 2 section of the License file that
1482.23 + * by Oracle in the GPL Version 2 section of the License file that
1482.24 * accompanied this code. If applicable, add the following below the
1482.25 * License Header, with the fields enclosed by brackets [] replaced by
1482.26 * your own identifying information:
1483.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyMenuDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1483.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectManyMenuDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1483.3 @@ -1,7 +1,10 @@
1483.4 /*
1483.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1483.6 *
1483.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1483.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1483.9 + *
1483.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1483.11 + * Other names may be trademarks of their respective owners.
1483.12 *
1483.13 * The contents of this file are subject to the terms of either the GNU
1483.14 * General Public License Version 2 only ("GPL") or the Common
1483.15 @@ -13,9 +16,9 @@
1483.16 * specific language governing permissions and limitations under the
1483.17 * License. When distributing the software, include this License Header
1483.18 * Notice in each file and include the License file at
1483.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1483.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1483.21 * particular file as subject to the "Classpath" exception as provided
1483.22 - * by Sun in the GPL Version 2 section of the License file that
1483.23 + * by Oracle in the GPL Version 2 section of the License file that
1483.24 * accompanied this code. If applicable, add the following below the
1483.25 * License Header, with the fields enclosed by brackets [] replaced by
1483.26 * your own identifying information:
1484.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneListboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1484.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneListboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1484.3 @@ -1,7 +1,10 @@
1484.4 /*
1484.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1484.6 *
1484.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1484.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1484.9 + *
1484.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1484.11 + * Other names may be trademarks of their respective owners.
1484.12 *
1484.13 * The contents of this file are subject to the terms of either the GNU
1484.14 * General Public License Version 2 only ("GPL") or the Common
1484.15 @@ -13,9 +16,9 @@
1484.16 * specific language governing permissions and limitations under the
1484.17 * License. When distributing the software, include this License Header
1484.18 * Notice in each file and include the License file at
1484.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1484.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1484.21 * particular file as subject to the "Classpath" exception as provided
1484.22 - * by Sun in the GPL Version 2 section of the License file that
1484.23 + * by Oracle in the GPL Version 2 section of the License file that
1484.24 * accompanied this code. If applicable, add the following below the
1484.25 * License Header, with the fields enclosed by brackets [] replaced by
1484.26 * your own identifying information:
1485.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneListboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1485.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneListboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1485.3 @@ -1,7 +1,10 @@
1485.4 /*
1485.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1485.6 *
1485.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1485.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1485.9 + *
1485.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1485.11 + * Other names may be trademarks of their respective owners.
1485.12 *
1485.13 * The contents of this file are subject to the terms of either the GNU
1485.14 * General Public License Version 2 only ("GPL") or the Common
1485.15 @@ -13,9 +16,9 @@
1485.16 * specific language governing permissions and limitations under the
1485.17 * License. When distributing the software, include this License Header
1485.18 * Notice in each file and include the License file at
1485.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1485.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1485.21 * particular file as subject to the "Classpath" exception as provided
1485.22 - * by Sun in the GPL Version 2 section of the License file that
1485.23 + * by Oracle in the GPL Version 2 section of the License file that
1485.24 * accompanied this code. If applicable, add the following below the
1485.25 * License Header, with the fields enclosed by brackets [] replaced by
1485.26 * your own identifying information:
1486.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneMenuBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1486.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneMenuBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1486.3 @@ -1,7 +1,10 @@
1486.4 /*
1486.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1486.6 *
1486.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1486.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1486.9 + *
1486.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1486.11 + * Other names may be trademarks of their respective owners.
1486.12 *
1486.13 * The contents of this file are subject to the terms of either the GNU
1486.14 * General Public License Version 2 only ("GPL") or the Common
1486.15 @@ -13,9 +16,9 @@
1486.16 * specific language governing permissions and limitations under the
1486.17 * License. When distributing the software, include this License Header
1486.18 * Notice in each file and include the License file at
1486.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1486.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1486.21 * particular file as subject to the "Classpath" exception as provided
1486.22 - * by Sun in the GPL Version 2 section of the License file that
1486.23 + * by Oracle in the GPL Version 2 section of the License file that
1486.24 * accompanied this code. If applicable, add the following below the
1486.25 * License Header, with the fields enclosed by brackets [] replaced by
1486.26 * your own identifying information:
1487.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneMenuDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1487.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneMenuDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1487.3 @@ -1,7 +1,10 @@
1487.4 /*
1487.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1487.6 *
1487.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1487.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1487.9 + *
1487.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1487.11 + * Other names may be trademarks of their respective owners.
1487.12 *
1487.13 * The contents of this file are subject to the terms of either the GNU
1487.14 * General Public License Version 2 only ("GPL") or the Common
1487.15 @@ -13,9 +16,9 @@
1487.16 * specific language governing permissions and limitations under the
1487.17 * License. When distributing the software, include this License Header
1487.18 * Notice in each file and include the License file at
1487.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1487.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1487.21 * particular file as subject to the "Classpath" exception as provided
1487.22 - * by Sun in the GPL Version 2 section of the License file that
1487.23 + * by Oracle in the GPL Version 2 section of the License file that
1487.24 * accompanied this code. If applicable, add the following below the
1487.25 * License Header, with the fields enclosed by brackets [] replaced by
1487.26 * your own identifying information:
1488.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneRadioBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1488.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneRadioBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1488.3 @@ -1,7 +1,10 @@
1488.4 /*
1488.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1488.6 *
1488.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1488.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1488.9 + *
1488.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1488.11 + * Other names may be trademarks of their respective owners.
1488.12 *
1488.13 * The contents of this file are subject to the terms of either the GNU
1488.14 * General Public License Version 2 only ("GPL") or the Common
1488.15 @@ -13,9 +16,9 @@
1488.16 * specific language governing permissions and limitations under the
1488.17 * License. When distributing the software, include this License Header
1488.18 * Notice in each file and include the License file at
1488.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1488.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1488.21 * particular file as subject to the "Classpath" exception as provided
1488.22 - * by Sun in the GPL Version 2 section of the License file that
1488.23 + * by Oracle in the GPL Version 2 section of the License file that
1488.24 * accompanied this code. If applicable, add the following below the
1488.25 * License Header, with the fields enclosed by brackets [] replaced by
1488.26 * your own identifying information:
1489.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneRadioDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1489.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/HtmlSelectOneRadioDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1489.3 @@ -1,7 +1,10 @@
1489.4 /*
1489.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1489.6 *
1489.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1489.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1489.9 + *
1489.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1489.11 + * Other names may be trademarks of their respective owners.
1489.12 *
1489.13 * The contents of this file are subject to the terms of either the GNU
1489.14 * General Public License Version 2 only ("GPL") or the Common
1489.15 @@ -13,9 +16,9 @@
1489.16 * specific language governing permissions and limitations under the
1489.17 * License. When distributing the software, include this License Header
1489.18 * Notice in each file and include the License file at
1489.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1489.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1489.21 * particular file as subject to the "Classpath" exception as provided
1489.22 - * by Sun in the GPL Version 2 section of the License file that
1489.23 + * by Oracle in the GPL Version 2 section of the License file that
1489.24 * accompanied this code. If applicable, add the following below the
1489.25 * License Header, with the fields enclosed by brackets [] replaced by
1489.26 * your own identifying information:
1490.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/Properties.java Fri Jul 16 11:47:36 2010 -0400
1490.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/component/html/Properties.java Fri Jul 16 14:21:50 2010 -0400
1490.3 @@ -1,7 +1,10 @@
1490.4 /*
1490.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1490.6 *
1490.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1490.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1490.9 + *
1490.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1490.11 + * Other names may be trademarks of their respective owners.
1490.12 *
1490.13 * The contents of this file are subject to the terms of either the GNU
1490.14 * General Public License Version 2 only ("GPL") or the Common
1490.15 @@ -13,9 +16,9 @@
1490.16 * specific language governing permissions and limitations under the
1490.17 * License. When distributing the software, include this License Header
1490.18 * Notice in each file and include the License file at
1490.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1490.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1490.21 * particular file as subject to the "Classpath" exception as provided
1490.22 - * by Sun in the GPL Version 2 section of the License file that
1490.23 + * by Oracle in the GPL Version 2 section of the License file that
1490.24 * accompanied this code. If applicable, add the following below the
1490.25 * License Header, with the fields enclosed by brackets [] replaced by
1490.26 * your own identifying information:
1491.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/propertyeditors/JSF1_1ConverterPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1491.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/propertyeditors/JSF1_1ConverterPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1491.3 @@ -1,7 +1,10 @@
1491.4 /*
1491.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1491.6 *
1491.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1491.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1491.9 + *
1491.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1491.11 + * Other names may be trademarks of their respective owners.
1491.12 *
1491.13 * The contents of this file are subject to the terms of either the GNU
1491.14 * General Public License Version 2 only ("GPL") or the Common
1491.15 @@ -13,9 +16,9 @@
1491.16 * specific language governing permissions and limitations under the
1491.17 * License. When distributing the software, include this License Header
1491.18 * Notice in each file and include the License file at
1491.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1491.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1491.21 * particular file as subject to the "Classpath" exception as provided
1491.22 - * by Sun in the GPL Version 2 section of the License file that
1491.23 + * by Oracle in the GPL Version 2 section of the License file that
1491.24 * accompanied this code. If applicable, add the following below the
1491.25 * License Header, with the fields enclosed by brackets [] replaced by
1491.26 * your own identifying information:
1492.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/propertyeditors/JSF1_1ValidatorPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1492.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/faces/dt_1_1/propertyeditors/JSF1_1ValidatorPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1492.3 @@ -1,7 +1,10 @@
1492.4 /*
1492.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1492.6 *
1492.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1492.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1492.9 + *
1492.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1492.11 + * Other names may be trademarks of their respective owners.
1492.12 *
1492.13 * The contents of this file are subject to the terms of either the GNU
1492.14 * General Public License Version 2 only ("GPL") or the Common
1492.15 @@ -13,9 +16,9 @@
1492.16 * specific language governing permissions and limitations under the
1492.17 * License. When distributing the software, include this License Header
1492.18 * Notice in each file and include the License file at
1492.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1492.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1492.21 * particular file as subject to the "Classpath" exception as provided
1492.22 - * by Sun in the GPL Version 2 section of the License file that
1492.23 + * by Oracle in the GPL Version 2 section of the License file that
1492.24 * accompanied this code. If applicable, add the following below the
1492.25 * License Header, with the fields enclosed by brackets [] replaced by
1492.26 * your own identifying information:
1493.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_1/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1493.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_1/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1493.3 @@ -1,6 +1,9 @@
1493.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1493.5 #
1493.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1493.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1493.8 +#
1493.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1493.10 +# Other names may be trademarks of their respective owners.
1493.11 #
1493.12 # The contents of this file are subject to the terms of either the GNU
1493.13 # General Public License Version 2 only ("GPL") or the Common
1493.14 @@ -12,9 +15,9 @@
1493.15 # specific language governing permissions and limitations under the
1493.16 # License. When distributing the software, include this License Header
1493.17 # Notice in each file and include the License file at
1493.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1493.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1493.20 # particular file as subject to the "Classpath" exception as provided
1493.21 -# by Sun in the GPL Version 2 section of the License file that
1493.22 +# by Oracle in the GPL Version 2 section of the License file that
1493.23 # accompanied this code. If applicable, add the following below the
1493.24 # License Header, with the fields enclosed by brackets [] replaced by
1493.25 # your own identifying information:
1494.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_1/Install.java Fri Jul 16 11:47:36 2010 -0400
1494.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_1/Install.java Fri Jul 16 14:21:50 2010 -0400
1494.3 @@ -1,7 +1,10 @@
1494.4 /*
1494.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1494.6 *
1494.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1494.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1494.9 + *
1494.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1494.11 + * Other names may be trademarks of their respective owners.
1494.12 *
1494.13 * The contents of this file are subject to the terms of either the GNU
1494.14 * General Public License Version 2 only ("GPL") or the Common
1494.15 @@ -13,9 +16,9 @@
1494.16 * specific language governing permissions and limitations under the
1494.17 * License. When distributing the software, include this License Header
1494.18 * Notice in each file and include the License file at
1494.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1494.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1494.21 * particular file as subject to the "Classpath" exception as provided
1494.22 - * by Sun in the GPL Version 2 section of the License file that
1494.23 + * by Oracle in the GPL Version 2 section of the License file that
1494.24 * accompanied this code. If applicable, add the following below the
1494.25 * License Header, with the fields enclosed by brackets [] replaced by
1494.26 * your own identifying information:
1495.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_1/layer.xml Fri Jul 16 11:47:36 2010 -0400
1495.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_1/layer.xml Fri Jul 16 14:21:50 2010 -0400
1495.3 @@ -2,7 +2,10 @@
1495.4 <!--
1495.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1495.6
1495.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1495.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1495.9 +
1495.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1495.11 +Other names may be trademarks of their respective owners.
1495.12
1495.13
1495.14 The contents of this file are subject to the terms of either the GNU
1495.15 @@ -15,9 +18,9 @@
1495.16 specific language governing permissions and limitations under the
1495.17 License. When distributing the software, include this License Header
1495.18 Notice in each file and include the License file at
1495.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1495.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1495.21 particular file as subject to the "Classpath" exception as provided
1495.22 -by Sun in the GPL Version 2 section of the License file that
1495.23 +by Oracle in the GPL Version 2 section of the License file that
1495.24 accompanied this code. If applicable, add the following below the
1495.25 License Header, with the fields enclosed by brackets [] replaced by
1495.26 your own identifying information:
1496.1 --- a/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_1/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1496.2 +++ b/visualweb.jsfsupport.designtime_1_1/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_1/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1496.3 @@ -1,6 +1,9 @@
1496.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1496.5 #
1496.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1496.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1496.8 +#
1496.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1496.10 +# Other names may be trademarks of their respective owners.
1496.11 #
1496.12 # The contents of this file are subject to the terms of either the GNU
1496.13 # General Public License Version 2 only ("GPL") or the Common
1496.14 @@ -12,9 +15,9 @@
1496.15 # specific language governing permissions and limitations under the
1496.16 # License. When distributing the software, include this License Header
1496.17 # Notice in each file and include the License file at
1496.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1496.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1496.20 # particular file as subject to the "Classpath" exception as provided
1496.21 -# by Sun in the GPL Version 2 section of the License file that
1496.22 +# by Oracle in the GPL Version 2 section of the License file that
1496.23 # accompanied this code. If applicable, add the following below the
1496.24 # License Header, with the fields enclosed by brackets [] replaced by
1496.25 # your own identifying information:
1497.1 --- a/visualweb.jsfsupport.designtime_1_1/test/unit/src/org/netbeans/modules/visualweb/test/BeanInfoTest.java Fri Jul 16 11:47:36 2010 -0400
1497.2 +++ b/visualweb.jsfsupport.designtime_1_1/test/unit/src/org/netbeans/modules/visualweb/test/BeanInfoTest.java Fri Jul 16 14:21:50 2010 -0400
1497.3 @@ -1,7 +1,10 @@
1497.4 /*
1497.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1497.6 *
1497.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1497.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1497.9 + *
1497.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1497.11 + * Other names may be trademarks of their respective owners.
1497.12 *
1497.13 * The contents of this file are subject to the terms of either the GNU
1497.14 * General Public License Version 2 only ("GPL") or the Common
1497.15 @@ -13,9 +16,9 @@
1497.16 * specific language governing permissions and limitations under the
1497.17 * License. When distributing the software, include this License Header
1497.18 * Notice in each file and include the License file at
1497.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1497.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1497.21 * particular file as subject to the "Classpath" exception as provided
1497.22 - * by Sun in the GPL Version 2 section of the License file that
1497.23 + * by Oracle in the GPL Version 2 section of the License file that
1497.24 * accompanied this code. If applicable, add the following below the
1497.25 * License Header, with the fields enclosed by brackets [] replaced by
1497.26 * your own identifying information:
1498.1 --- a/visualweb.jsfsupport.designtime_1_2/build.xml Fri Jul 16 11:47:36 2010 -0400
1498.2 +++ b/visualweb.jsfsupport.designtime_1_2/build.xml Fri Jul 16 14:21:50 2010 -0400
1498.3 @@ -2,7 +2,10 @@
1498.4 <!--
1498.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1498.6
1498.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1498.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1498.9 +
1498.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1498.11 +Other names may be trademarks of their respective owners.
1498.12
1498.13
1498.14 The contents of this file are subject to the terms of either the GNU
1498.15 @@ -15,9 +18,9 @@
1498.16 specific language governing permissions and limitations under the
1498.17 License. When distributing the software, include this License Header
1498.18 Notice in each file and include the License file at
1498.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1498.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1498.21 particular file as subject to the "Classpath" exception as provided
1498.22 -by Sun in the GPL Version 2 section of the License file that
1498.23 +by Oracle in the GPL Version 2 section of the License file that
1498.24 accompanied this code. If applicable, add the following below the
1498.25 License Header, with the fields enclosed by brackets [] replaced by
1498.26 your own identifying information:
1499.1 --- a/visualweb.jsfsupport.designtime_1_2/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1499.2 +++ b/visualweb.jsfsupport.designtime_1_2/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1499.3 @@ -1,6 +1,9 @@
1499.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1499.5 #
1499.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1499.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1499.8 +#
1499.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1499.10 +# Other names may be trademarks of their respective owners.
1499.11 #
1499.12 # The contents of this file are subject to the terms of either the GNU
1499.13 # General Public License Version 2 only ("GPL") or the Common
1499.14 @@ -12,9 +15,9 @@
1499.15 # specific language governing permissions and limitations under the
1499.16 # License. When distributing the software, include this License Header
1499.17 # Notice in each file and include the License file at
1499.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1499.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1499.20 # particular file as subject to the "Classpath" exception as provided
1499.21 -# by Sun in the GPL Version 2 section of the License file that
1499.22 +# by Oracle in the GPL Version 2 section of the License file that
1499.23 # accompanied this code. If applicable, add the following below the
1499.24 # License Header, with the fields enclosed by brackets [] replaced by
1499.25 # your own identifying information:
1499.26 @@ -37,4 +40,4 @@
1499.27 # Version 2 license, then the option applies only if the new code is
1499.28 # made subject to such option by the copyright holder.
1499.29
1499.30 -javac.source=1.5
1499.31 +javac.source=1.6
1500.1 --- a/visualweb.jsfsupport.designtime_1_2/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1500.2 +++ b/visualweb.jsfsupport.designtime_1_2/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1500.3 @@ -2,7 +2,10 @@
1500.4 <!--
1500.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1500.6
1500.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1500.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1500.9 +
1500.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1500.11 +Other names may be trademarks of their respective owners.
1500.12
1500.13
1500.14 The contents of this file are subject to the terms of either the GNU
1500.15 @@ -15,9 +18,9 @@
1500.16 specific language governing permissions and limitations under the
1500.17 License. When distributing the software, include this License Header
1500.18 Notice in each file and include the License file at
1500.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1500.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1500.21 particular file as subject to the "Classpath" exception as provided
1500.22 -by Sun in the GPL Version 2 section of the License file that
1500.23 +by Oracle in the GPL Version 2 section of the License file that
1500.24 accompanied this code. If applicable, add the following below the
1500.25 License Header, with the fields enclosed by brackets [] replaced by
1500.26 your own identifying information:
1500.27 @@ -144,7 +147,15 @@
1500.28 <build-prerequisite/>
1500.29 <compile-dependency/>
1500.30 <run-dependency>
1500.31 - <specification-version>6.8.11</specification-version>
1500.32 + <specification-version>8.0</specification-version>
1500.33 + </run-dependency>
1500.34 + </dependency>
1500.35 + <dependency>
1500.36 + <code-name-base>org.openide.util.lookup</code-name-base>
1500.37 + <build-prerequisite/>
1500.38 + <compile-dependency/>
1500.39 + <run-dependency>
1500.40 + <specification-version>8.0</specification-version>
1500.41 </run-dependency>
1500.42 </dependency>
1500.43 </module-dependencies>
1501.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1501.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1501.3 @@ -1,6 +1,9 @@
1501.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1501.5 #
1501.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1501.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1501.8 +#
1501.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1501.10 +# Other names may be trademarks of their respective owners.
1501.11 #
1501.12 # The contents of this file are subject to the terms of either the GNU
1501.13 # General Public License Version 2 only ("GPL") or the Common
1501.14 @@ -12,9 +15,9 @@
1501.15 # specific language governing permissions and limitations under the
1501.16 # License. When distributing the software, include this License Header
1501.17 # Notice in each file and include the License file at
1501.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1501.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1501.20 # particular file as subject to the "Classpath" exception as provided
1501.21 -# by Sun in the GPL Version 2 section of the License file that
1501.22 +# by Oracle in the GPL Version 2 section of the License file that
1501.23 # accompanied this code. If applicable, add the following below the
1501.24 # License Header, with the fields enclosed by brackets [] replaced by
1501.25 # your own identifying information:
1502.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIColumnBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1502.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIColumnBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1502.3 @@ -1,7 +1,10 @@
1502.4 /*
1502.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1502.6 *
1502.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1502.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1502.9 + *
1502.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1502.11 + * Other names may be trademarks of their respective owners.
1502.12 *
1502.13 * The contents of this file are subject to the terms of either the GNU
1502.14 * General Public License Version 2 only ("GPL") or the Common
1502.15 @@ -13,9 +16,9 @@
1502.16 * specific language governing permissions and limitations under the
1502.17 * License. When distributing the software, include this License Header
1502.18 * Notice in each file and include the License file at
1502.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1502.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1502.21 * particular file as subject to the "Classpath" exception as provided
1502.22 - * by Sun in the GPL Version 2 section of the License file that
1502.23 + * by Oracle in the GPL Version 2 section of the License file that
1502.24 * accompanied this code. If applicable, add the following below the
1502.25 * License Header, with the fields enclosed by brackets [] replaced by
1502.26 * your own identifying information:
1503.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIColumnBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1503.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIColumnBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1503.3 @@ -1,7 +1,10 @@
1503.4 /*
1503.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1503.6 *
1503.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1503.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1503.9 + *
1503.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1503.11 + * Other names may be trademarks of their respective owners.
1503.12 *
1503.13 * The contents of this file are subject to the terms of either the GNU
1503.14 * General Public License Version 2 only ("GPL") or the Common
1503.15 @@ -13,9 +16,9 @@
1503.16 * specific language governing permissions and limitations under the
1503.17 * License. When distributing the software, include this License Header
1503.18 * Notice in each file and include the License file at
1503.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1503.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1503.21 * particular file as subject to the "Classpath" exception as provided
1503.22 - * by Sun in the GPL Version 2 section of the License file that
1503.23 + * by Oracle in the GPL Version 2 section of the License file that
1503.24 * accompanied this code. If applicable, add the following below the
1503.25 * License Header, with the fields enclosed by brackets [] replaced by
1503.26 * your own identifying information:
1504.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UICommandBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1504.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UICommandBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1504.3 @@ -1,7 +1,10 @@
1504.4 /*
1504.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1504.6 *
1504.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1504.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1504.9 + *
1504.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1504.11 + * Other names may be trademarks of their respective owners.
1504.12 *
1504.13 * The contents of this file are subject to the terms of either the GNU
1504.14 * General Public License Version 2 only ("GPL") or the Common
1504.15 @@ -13,9 +16,9 @@
1504.16 * specific language governing permissions and limitations under the
1504.17 * License. When distributing the software, include this License Header
1504.18 * Notice in each file and include the License file at
1504.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1504.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1504.21 * particular file as subject to the "Classpath" exception as provided
1504.22 - * by Sun in the GPL Version 2 section of the License file that
1504.23 + * by Oracle in the GPL Version 2 section of the License file that
1504.24 * accompanied this code. If applicable, add the following below the
1504.25 * License Header, with the fields enclosed by brackets [] replaced by
1504.26 * your own identifying information:
1505.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIComponentBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1505.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIComponentBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1505.3 @@ -1,7 +1,10 @@
1505.4 /*
1505.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1505.6 *
1505.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1505.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1505.9 + *
1505.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1505.11 + * Other names may be trademarks of their respective owners.
1505.12 *
1505.13 * The contents of this file are subject to the terms of either the GNU
1505.14 * General Public License Version 2 only ("GPL") or the Common
1505.15 @@ -13,9 +16,9 @@
1505.16 * specific language governing permissions and limitations under the
1505.17 * License. When distributing the software, include this License Header
1505.18 * Notice in each file and include the License file at
1505.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1505.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1505.21 * particular file as subject to the "Classpath" exception as provided
1505.22 - * by Sun in the GPL Version 2 section of the License file that
1505.23 + * by Oracle in the GPL Version 2 section of the License file that
1505.24 * accompanied this code. If applicable, add the following below the
1505.25 * License Header, with the fields enclosed by brackets [] replaced by
1505.26 * your own identifying information:
1506.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIDataBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1506.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIDataBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1506.3 @@ -1,7 +1,10 @@
1506.4 /*
1506.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1506.6 *
1506.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1506.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1506.9 + *
1506.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1506.11 + * Other names may be trademarks of their respective owners.
1506.12 *
1506.13 * The contents of this file are subject to the terms of either the GNU
1506.14 * General Public License Version 2 only ("GPL") or the Common
1506.15 @@ -13,9 +16,9 @@
1506.16 * specific language governing permissions and limitations under the
1506.17 * License. When distributing the software, include this License Header
1506.18 * Notice in each file and include the License file at
1506.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1506.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1506.21 * particular file as subject to the "Classpath" exception as provided
1506.22 - * by Sun in the GPL Version 2 section of the License file that
1506.23 + * by Oracle in the GPL Version 2 section of the License file that
1506.24 * accompanied this code. If applicable, add the following below the
1506.25 * License Header, with the fields enclosed by brackets [] replaced by
1506.26 * your own identifying information:
1507.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIFormBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1507.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIFormBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1507.3 @@ -1,7 +1,10 @@
1507.4 /*
1507.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1507.6 *
1507.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1507.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1507.9 + *
1507.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1507.11 + * Other names may be trademarks of their respective owners.
1507.12 *
1507.13 * The contents of this file are subject to the terms of either the GNU
1507.14 * General Public License Version 2 only ("GPL") or the Common
1507.15 @@ -13,9 +16,9 @@
1507.16 * specific language governing permissions and limitations under the
1507.17 * License. When distributing the software, include this License Header
1507.18 * Notice in each file and include the License file at
1507.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1507.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1507.21 * particular file as subject to the "Classpath" exception as provided
1507.22 - * by Sun in the GPL Version 2 section of the License file that
1507.23 + * by Oracle in the GPL Version 2 section of the License file that
1507.24 * accompanied this code. If applicable, add the following below the
1507.25 * License Header, with the fields enclosed by brackets [] replaced by
1507.26 * your own identifying information:
1508.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIGraphicBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1508.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIGraphicBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1508.3 @@ -1,7 +1,10 @@
1508.4 /*
1508.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1508.6 *
1508.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1508.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1508.9 + *
1508.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1508.11 + * Other names may be trademarks of their respective owners.
1508.12 *
1508.13 * The contents of this file are subject to the terms of either the GNU
1508.14 * General Public License Version 2 only ("GPL") or the Common
1508.15 @@ -13,9 +16,9 @@
1508.16 * specific language governing permissions and limitations under the
1508.17 * License. When distributing the software, include this License Header
1508.18 * Notice in each file and include the License file at
1508.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1508.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1508.21 * particular file as subject to the "Classpath" exception as provided
1508.22 - * by Sun in the GPL Version 2 section of the License file that
1508.23 + * by Oracle in the GPL Version 2 section of the License file that
1508.24 * accompanied this code. If applicable, add the following below the
1508.25 * License Header, with the fields enclosed by brackets [] replaced by
1508.26 * your own identifying information:
1509.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIInputBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1509.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIInputBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1509.3 @@ -1,7 +1,10 @@
1509.4 /*
1509.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1509.6 *
1509.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1509.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1509.9 + *
1509.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1509.11 + * Other names may be trademarks of their respective owners.
1509.12 *
1509.13 * The contents of this file are subject to the terms of either the GNU
1509.14 * General Public License Version 2 only ("GPL") or the Common
1509.15 @@ -13,9 +16,9 @@
1509.16 * specific language governing permissions and limitations under the
1509.17 * License. When distributing the software, include this License Header
1509.18 * Notice in each file and include the License file at
1509.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1509.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1509.21 * particular file as subject to the "Classpath" exception as provided
1509.22 - * by Sun in the GPL Version 2 section of the License file that
1509.23 + * by Oracle in the GPL Version 2 section of the License file that
1509.24 * accompanied this code. If applicable, add the following below the
1509.25 * License Header, with the fields enclosed by brackets [] replaced by
1509.26 * your own identifying information:
1510.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIMessageBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1510.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIMessageBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1510.3 @@ -1,7 +1,10 @@
1510.4 /*
1510.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1510.6 *
1510.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1510.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1510.9 + *
1510.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1510.11 + * Other names may be trademarks of their respective owners.
1510.12 *
1510.13 * The contents of this file are subject to the terms of either the GNU
1510.14 * General Public License Version 2 only ("GPL") or the Common
1510.15 @@ -13,9 +16,9 @@
1510.16 * specific language governing permissions and limitations under the
1510.17 * License. When distributing the software, include this License Header
1510.18 * Notice in each file and include the License file at
1510.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1510.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1510.21 * particular file as subject to the "Classpath" exception as provided
1510.22 - * by Sun in the GPL Version 2 section of the License file that
1510.23 + * by Oracle in the GPL Version 2 section of the License file that
1510.24 * accompanied this code. If applicable, add the following below the
1510.25 * License Header, with the fields enclosed by brackets [] replaced by
1510.26 * your own identifying information:
1511.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIMessagesBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1511.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIMessagesBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1511.3 @@ -1,7 +1,10 @@
1511.4 /*
1511.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1511.6 *
1511.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1511.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1511.9 + *
1511.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1511.11 + * Other names may be trademarks of their respective owners.
1511.12 *
1511.13 * The contents of this file are subject to the terms of either the GNU
1511.14 * General Public License Version 2 only ("GPL") or the Common
1511.15 @@ -13,9 +16,9 @@
1511.16 * specific language governing permissions and limitations under the
1511.17 * License. When distributing the software, include this License Header
1511.18 * Notice in each file and include the License file at
1511.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1511.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1511.21 * particular file as subject to the "Classpath" exception as provided
1511.22 - * by Sun in the GPL Version 2 section of the License file that
1511.23 + * by Oracle in the GPL Version 2 section of the License file that
1511.24 * accompanied this code. If applicable, add the following below the
1511.25 * License Header, with the fields enclosed by brackets [] replaced by
1511.26 * your own identifying information:
1512.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UINamingContainerBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1512.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UINamingContainerBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1512.3 @@ -1,7 +1,10 @@
1512.4 /*
1512.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1512.6 *
1512.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1512.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1512.9 + *
1512.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1512.11 + * Other names may be trademarks of their respective owners.
1512.12 *
1512.13 * The contents of this file are subject to the terms of either the GNU
1512.14 * General Public License Version 2 only ("GPL") or the Common
1512.15 @@ -13,9 +16,9 @@
1512.16 * specific language governing permissions and limitations under the
1512.17 * License. When distributing the software, include this License Header
1512.18 * Notice in each file and include the License file at
1512.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1512.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1512.21 * particular file as subject to the "Classpath" exception as provided
1512.22 - * by Sun in the GPL Version 2 section of the License file that
1512.23 + * by Oracle in the GPL Version 2 section of the License file that
1512.24 * accompanied this code. If applicable, add the following below the
1512.25 * License Header, with the fields enclosed by brackets [] replaced by
1512.26 * your own identifying information:
1513.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIOutputBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1513.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIOutputBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1513.3 @@ -1,7 +1,10 @@
1513.4 /*
1513.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1513.6 *
1513.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1513.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1513.9 + *
1513.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1513.11 + * Other names may be trademarks of their respective owners.
1513.12 *
1513.13 * The contents of this file are subject to the terms of either the GNU
1513.14 * General Public License Version 2 only ("GPL") or the Common
1513.15 @@ -13,9 +16,9 @@
1513.16 * specific language governing permissions and limitations under the
1513.17 * License. When distributing the software, include this License Header
1513.18 * Notice in each file and include the License file at
1513.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1513.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1513.21 * particular file as subject to the "Classpath" exception as provided
1513.22 - * by Sun in the GPL Version 2 section of the License file that
1513.23 + * by Oracle in the GPL Version 2 section of the License file that
1513.24 * accompanied this code. If applicable, add the following below the
1513.25 * License Header, with the fields enclosed by brackets [] replaced by
1513.26 * your own identifying information:
1514.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIPanelBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1514.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIPanelBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1514.3 @@ -1,7 +1,10 @@
1514.4 /*
1514.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1514.6 *
1514.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1514.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1514.9 + *
1514.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1514.11 + * Other names may be trademarks of their respective owners.
1514.12 *
1514.13 * The contents of this file are subject to the terms of either the GNU
1514.14 * General Public License Version 2 only ("GPL") or the Common
1514.15 @@ -13,9 +16,9 @@
1514.16 * specific language governing permissions and limitations under the
1514.17 * License. When distributing the software, include this License Header
1514.18 * Notice in each file and include the License file at
1514.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1514.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1514.21 * particular file as subject to the "Classpath" exception as provided
1514.22 - * by Sun in the GPL Version 2 section of the License file that
1514.23 + * by Oracle in the GPL Version 2 section of the License file that
1514.24 * accompanied this code. If applicable, add the following below the
1514.25 * License Header, with the fields enclosed by brackets [] replaced by
1514.26 * your own identifying information:
1515.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIParameterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1515.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIParameterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1515.3 @@ -1,7 +1,10 @@
1515.4 /*
1515.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1515.6 *
1515.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1515.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1515.9 + *
1515.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1515.11 + * Other names may be trademarks of their respective owners.
1515.12 *
1515.13 * The contents of this file are subject to the terms of either the GNU
1515.14 * General Public License Version 2 only ("GPL") or the Common
1515.15 @@ -13,9 +16,9 @@
1515.16 * specific language governing permissions and limitations under the
1515.17 * License. When distributing the software, include this License Header
1515.18 * Notice in each file and include the License file at
1515.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1515.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1515.21 * particular file as subject to the "Classpath" exception as provided
1515.22 - * by Sun in the GPL Version 2 section of the License file that
1515.23 + * by Oracle in the GPL Version 2 section of the License file that
1515.24 * accompanied this code. If applicable, add the following below the
1515.25 * License Header, with the fields enclosed by brackets [] replaced by
1515.26 * your own identifying information:
1516.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIParameterBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1516.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UIParameterBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1516.3 @@ -1,7 +1,10 @@
1516.4 /*
1516.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1516.6 *
1516.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1516.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1516.9 + *
1516.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1516.11 + * Other names may be trademarks of their respective owners.
1516.12 *
1516.13 * The contents of this file are subject to the terms of either the GNU
1516.14 * General Public License Version 2 only ("GPL") or the Common
1516.15 @@ -13,9 +16,9 @@
1516.16 * specific language governing permissions and limitations under the
1516.17 * License. When distributing the software, include this License Header
1516.18 * Notice in each file and include the License file at
1516.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1516.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1516.21 * particular file as subject to the "Classpath" exception as provided
1516.22 - * by Sun in the GPL Version 2 section of the License file that
1516.23 + * by Oracle in the GPL Version 2 section of the License file that
1516.24 * accompanied this code. If applicable, add the following below the
1516.25 * License Header, with the fields enclosed by brackets [] replaced by
1516.26 * your own identifying information:
1517.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectBooleanBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1517.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectBooleanBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1517.3 @@ -1,7 +1,10 @@
1517.4 /*
1517.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1517.6 *
1517.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1517.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1517.9 + *
1517.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1517.11 + * Other names may be trademarks of their respective owners.
1517.12 *
1517.13 * The contents of this file are subject to the terms of either the GNU
1517.14 * General Public License Version 2 only ("GPL") or the Common
1517.15 @@ -13,9 +16,9 @@
1517.16 * specific language governing permissions and limitations under the
1517.17 * License. When distributing the software, include this License Header
1517.18 * Notice in each file and include the License file at
1517.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1517.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1517.21 * particular file as subject to the "Classpath" exception as provided
1517.22 - * by Sun in the GPL Version 2 section of the License file that
1517.23 + * by Oracle in the GPL Version 2 section of the License file that
1517.24 * accompanied this code. If applicable, add the following below the
1517.25 * License Header, with the fields enclosed by brackets [] replaced by
1517.26 * your own identifying information:
1518.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1518.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1518.3 @@ -1,7 +1,10 @@
1518.4 /*
1518.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1518.6 *
1518.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1518.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1518.9 + *
1518.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1518.11 + * Other names may be trademarks of their respective owners.
1518.12 *
1518.13 * The contents of this file are subject to the terms of either the GNU
1518.14 * General Public License Version 2 only ("GPL") or the Common
1518.15 @@ -13,9 +16,9 @@
1518.16 * specific language governing permissions and limitations under the
1518.17 * License. When distributing the software, include this License Header
1518.18 * Notice in each file and include the License file at
1518.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1518.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1518.21 * particular file as subject to the "Classpath" exception as provided
1518.22 - * by Sun in the GPL Version 2 section of the License file that
1518.23 + * by Oracle in the GPL Version 2 section of the License file that
1518.24 * accompanied this code. If applicable, add the following below the
1518.25 * License Header, with the fields enclosed by brackets [] replaced by
1518.26 * your own identifying information:
1519.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1519.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1519.3 @@ -1,7 +1,10 @@
1519.4 /*
1519.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1519.6 *
1519.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1519.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1519.9 + *
1519.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1519.11 + * Other names may be trademarks of their respective owners.
1519.12 *
1519.13 * The contents of this file are subject to the terms of either the GNU
1519.14 * General Public License Version 2 only ("GPL") or the Common
1519.15 @@ -13,9 +16,9 @@
1519.16 * specific language governing permissions and limitations under the
1519.17 * License. When distributing the software, include this License Header
1519.18 * Notice in each file and include the License file at
1519.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1519.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1519.21 * particular file as subject to the "Classpath" exception as provided
1519.22 - * by Sun in the GPL Version 2 section of the License file that
1519.23 + * by Oracle in the GPL Version 2 section of the License file that
1519.24 * accompanied this code. If applicable, add the following below the
1519.25 * License Header, with the fields enclosed by brackets [] replaced by
1519.26 * your own identifying information:
1520.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1520.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1520.3 @@ -1,7 +1,10 @@
1520.4 /*
1520.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1520.6 *
1520.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1520.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1520.9 + *
1520.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1520.11 + * Other names may be trademarks of their respective owners.
1520.12 *
1520.13 * The contents of this file are subject to the terms of either the GNU
1520.14 * General Public License Version 2 only ("GPL") or the Common
1520.15 @@ -13,9 +16,9 @@
1520.16 * specific language governing permissions and limitations under the
1520.17 * License. When distributing the software, include this License Header
1520.18 * Notice in each file and include the License file at
1520.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1520.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1520.21 * particular file as subject to the "Classpath" exception as provided
1520.22 - * by Sun in the GPL Version 2 section of the License file that
1520.23 + * by Oracle in the GPL Version 2 section of the License file that
1520.24 * accompanied this code. If applicable, add the following below the
1520.25 * License Header, with the fields enclosed by brackets [] replaced by
1520.26 * your own identifying information:
1521.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemsBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1521.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemsBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1521.3 @@ -1,7 +1,10 @@
1521.4 /*
1521.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1521.6 *
1521.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1521.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1521.9 + *
1521.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1521.11 + * Other names may be trademarks of their respective owners.
1521.12 *
1521.13 * The contents of this file are subject to the terms of either the GNU
1521.14 * General Public License Version 2 only ("GPL") or the Common
1521.15 @@ -13,9 +16,9 @@
1521.16 * specific language governing permissions and limitations under the
1521.17 * License. When distributing the software, include this License Header
1521.18 * Notice in each file and include the License file at
1521.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1521.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1521.21 * particular file as subject to the "Classpath" exception as provided
1521.22 - * by Sun in the GPL Version 2 section of the License file that
1521.23 + * by Oracle in the GPL Version 2 section of the License file that
1521.24 * accompanied this code. If applicable, add the following below the
1521.25 * License Header, with the fields enclosed by brackets [] replaced by
1521.26 * your own identifying information:
1522.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemsBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1522.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemsBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1522.3 @@ -1,7 +1,10 @@
1522.4 /*
1522.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1522.6 *
1522.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1522.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1522.9 + *
1522.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1522.11 + * Other names may be trademarks of their respective owners.
1522.12 *
1522.13 * The contents of this file are subject to the terms of either the GNU
1522.14 * General Public License Version 2 only ("GPL") or the Common
1522.15 @@ -13,9 +16,9 @@
1522.16 * specific language governing permissions and limitations under the
1522.17 * License. When distributing the software, include this License Header
1522.18 * Notice in each file and include the License file at
1522.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1522.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1522.21 * particular file as subject to the "Classpath" exception as provided
1522.22 - * by Sun in the GPL Version 2 section of the License file that
1522.23 + * by Oracle in the GPL Version 2 section of the License file that
1522.24 * accompanied this code. If applicable, add the following below the
1522.25 * License Header, with the fields enclosed by brackets [] replaced by
1522.26 * your own identifying information:
1523.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemsDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1523.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectItemsDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1523.3 @@ -1,7 +1,10 @@
1523.4 /*
1523.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1523.6 *
1523.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1523.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1523.9 + *
1523.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1523.11 + * Other names may be trademarks of their respective owners.
1523.12 *
1523.13 * The contents of this file are subject to the terms of either the GNU
1523.14 * General Public License Version 2 only ("GPL") or the Common
1523.15 @@ -13,9 +16,9 @@
1523.16 * specific language governing permissions and limitations under the
1523.17 * License. When distributing the software, include this License Header
1523.18 * Notice in each file and include the License file at
1523.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1523.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1523.21 * particular file as subject to the "Classpath" exception as provided
1523.22 - * by Sun in the GPL Version 2 section of the License file that
1523.23 + * by Oracle in the GPL Version 2 section of the License file that
1523.24 * accompanied this code. If applicable, add the following below the
1523.25 * License Header, with the fields enclosed by brackets [] replaced by
1523.26 * your own identifying information:
1524.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectManyBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1524.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectManyBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1524.3 @@ -1,7 +1,10 @@
1524.4 /*
1524.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1524.6 *
1524.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1524.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1524.9 + *
1524.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1524.11 + * Other names may be trademarks of their respective owners.
1524.12 *
1524.13 * The contents of this file are subject to the terms of either the GNU
1524.14 * General Public License Version 2 only ("GPL") or the Common
1524.15 @@ -13,9 +16,9 @@
1524.16 * specific language governing permissions and limitations under the
1524.17 * License. When distributing the software, include this License Header
1524.18 * Notice in each file and include the License file at
1524.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1524.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1524.21 * particular file as subject to the "Classpath" exception as provided
1524.22 - * by Sun in the GPL Version 2 section of the License file that
1524.23 + * by Oracle in the GPL Version 2 section of the License file that
1524.24 * accompanied this code. If applicable, add the following below the
1524.25 * License Header, with the fields enclosed by brackets [] replaced by
1524.26 * your own identifying information:
1525.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectOneBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1525.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/UISelectOneBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1525.3 @@ -1,7 +1,10 @@
1525.4 /*
1525.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1525.6 *
1525.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1525.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1525.9 + *
1525.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1525.11 + * Other names may be trademarks of their respective owners.
1525.12 *
1525.13 * The contents of this file are subject to the terms of either the GNU
1525.14 * General Public License Version 2 only ("GPL") or the Common
1525.15 @@ -13,9 +16,9 @@
1525.16 * specific language governing permissions and limitations under the
1525.17 * License. When distributing the software, include this License Header
1525.18 * Notice in each file and include the License file at
1525.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1525.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1525.21 * particular file as subject to the "Classpath" exception as provided
1525.22 - * by Sun in the GPL Version 2 section of the License file that
1525.23 + * by Oracle in the GPL Version 2 section of the License file that
1525.24 * accompanied this code. If applicable, add the following below the
1525.25 * License Header, with the fields enclosed by brackets [] replaced by
1525.26 * your own identifying information:
1526.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/Bundle-JSF.properties Fri Jul 16 11:47:36 2010 -0400
1526.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/Bundle-JSF.properties Fri Jul 16 14:21:50 2010 -0400
1526.3 @@ -1,6 +1,9 @@
1526.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1526.5 #
1526.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1526.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1526.8 +#
1526.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1526.10 +# Other names may be trademarks of their respective owners.
1526.11 #
1526.12 # The contents of this file are subject to the terms of either the GNU
1526.13 # General Public License Version 2 only ("GPL") or the Common
1526.14 @@ -12,9 +15,9 @@
1526.15 # specific language governing permissions and limitations under the
1526.16 # License. When distributing the software, include this License Header
1526.17 # Notice in each file and include the License file at
1526.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1526.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1526.20 # particular file as subject to the "Classpath" exception as provided
1526.21 -# by Sun in the GPL Version 2 section of the License file that
1526.22 +# by Oracle in the GPL Version 2 section of the License file that
1526.23 # accompanied this code. If applicable, add the following below the
1526.24 # License Header, with the fields enclosed by brackets [] replaced by
1526.25 # your own identifying information:
1527.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1527.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1527.3 @@ -1,6 +1,9 @@
1527.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1527.5 #
1527.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1527.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1527.8 +#
1527.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1527.10 +# Other names may be trademarks of their respective owners.
1527.11 #
1527.12 # The contents of this file are subject to the terms of either the GNU
1527.13 # General Public License Version 2 only ("GPL") or the Common
1527.14 @@ -12,9 +15,9 @@
1527.15 # specific language governing permissions and limitations under the
1527.16 # License. When distributing the software, include this License Header
1527.17 # Notice in each file and include the License file at
1527.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1527.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1527.20 # particular file as subject to the "Classpath" exception as provided
1527.21 -# by Sun in the GPL Version 2 section of the License file that
1527.22 +# by Oracle in the GPL Version 2 section of the License file that
1527.23 # accompanied this code. If applicable, add the following below the
1527.24 # License Header, with the fields enclosed by brackets [] replaced by
1527.25 # your own identifying information:
1528.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCheckboxLayoutStylesDomain.java Fri Jul 16 11:47:36 2010 -0400
1528.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCheckboxLayoutStylesDomain.java Fri Jul 16 14:21:50 2010 -0400
1528.3 @@ -1,7 +1,10 @@
1528.4 /*
1528.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1528.6 *
1528.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1528.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1528.9 + *
1528.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1528.11 + * Other names may be trademarks of their respective owners.
1528.12 *
1528.13 * The contents of this file are subject to the terms of either the GNU
1528.14 * General Public License Version 2 only ("GPL") or the Common
1528.15 @@ -13,9 +16,9 @@
1528.16 * specific language governing permissions and limitations under the
1528.17 * License. When distributing the software, include this License Header
1528.18 * Notice in each file and include the License file at
1528.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1528.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1528.21 * particular file as subject to the "Classpath" exception as provided
1528.22 - * by Sun in the GPL Version 2 section of the License file that
1528.23 + * by Oracle in the GPL Version 2 section of the License file that
1528.24 * accompanied this code. If applicable, add the following below the
1528.25 * License Header, with the fields enclosed by brackets [] replaced by
1528.26 * your own identifying information:
1529.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandButtonBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1529.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandButtonBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1529.3 @@ -1,7 +1,10 @@
1529.4 /*
1529.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1529.6 *
1529.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1529.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1529.9 + *
1529.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1529.11 + * Other names may be trademarks of their respective owners.
1529.12 *
1529.13 * The contents of this file are subject to the terms of either the GNU
1529.14 * General Public License Version 2 only ("GPL") or the Common
1529.15 @@ -13,9 +16,9 @@
1529.16 * specific language governing permissions and limitations under the
1529.17 * License. When distributing the software, include this License Header
1529.18 * Notice in each file and include the License file at
1529.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1529.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1529.21 * particular file as subject to the "Classpath" exception as provided
1529.22 - * by Sun in the GPL Version 2 section of the License file that
1529.23 + * by Oracle in the GPL Version 2 section of the License file that
1529.24 * accompanied this code. If applicable, add the following below the
1529.25 * License Header, with the fields enclosed by brackets [] replaced by
1529.26 * your own identifying information:
1530.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandButtonDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1530.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandButtonDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1530.3 @@ -1,7 +1,10 @@
1530.4 /*
1530.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1530.6 *
1530.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1530.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1530.9 + *
1530.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1530.11 + * Other names may be trademarks of their respective owners.
1530.12 *
1530.13 * The contents of this file are subject to the terms of either the GNU
1530.14 * General Public License Version 2 only ("GPL") or the Common
1530.15 @@ -13,9 +16,9 @@
1530.16 * specific language governing permissions and limitations under the
1530.17 * License. When distributing the software, include this License Header
1530.18 * Notice in each file and include the License file at
1530.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1530.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1530.21 * particular file as subject to the "Classpath" exception as provided
1530.22 - * by Sun in the GPL Version 2 section of the License file that
1530.23 + * by Oracle in the GPL Version 2 section of the License file that
1530.24 * accompanied this code. If applicable, add the following below the
1530.25 * License Header, with the fields enclosed by brackets [] replaced by
1530.26 * your own identifying information:
1531.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandButtonTypesDomain.java Fri Jul 16 11:47:36 2010 -0400
1531.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandButtonTypesDomain.java Fri Jul 16 14:21:50 2010 -0400
1531.3 @@ -1,7 +1,10 @@
1531.4 /*
1531.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1531.6 *
1531.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1531.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1531.9 + *
1531.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1531.11 + * Other names may be trademarks of their respective owners.
1531.12 *
1531.13 * The contents of this file are subject to the terms of either the GNU
1531.14 * General Public License Version 2 only ("GPL") or the Common
1531.15 @@ -13,9 +16,9 @@
1531.16 * specific language governing permissions and limitations under the
1531.17 * License. When distributing the software, include this License Header
1531.18 * Notice in each file and include the License file at
1531.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1531.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1531.21 * particular file as subject to the "Classpath" exception as provided
1531.22 - * by Sun in the GPL Version 2 section of the License file that
1531.23 + * by Oracle in the GPL Version 2 section of the License file that
1531.24 * accompanied this code. If applicable, add the following below the
1531.25 * License Header, with the fields enclosed by brackets [] replaced by
1531.26 * your own identifying information:
1532.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandLinkBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1532.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandLinkBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1532.3 @@ -1,7 +1,10 @@
1532.4 /*
1532.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1532.6 *
1532.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1532.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1532.9 + *
1532.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1532.11 + * Other names may be trademarks of their respective owners.
1532.12 *
1532.13 * The contents of this file are subject to the terms of either the GNU
1532.14 * General Public License Version 2 only ("GPL") or the Common
1532.15 @@ -13,9 +16,9 @@
1532.16 * specific language governing permissions and limitations under the
1532.17 * License. When distributing the software, include this License Header
1532.18 * Notice in each file and include the License file at
1532.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1532.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1532.21 * particular file as subject to the "Classpath" exception as provided
1532.22 - * by Sun in the GPL Version 2 section of the License file that
1532.23 + * by Oracle in the GPL Version 2 section of the License file that
1532.24 * accompanied this code. If applicable, add the following below the
1532.25 * License Header, with the fields enclosed by brackets [] replaced by
1532.26 * your own identifying information:
1533.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandLinkDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1533.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlCommandLinkDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1533.3 @@ -1,7 +1,10 @@
1533.4 /*
1533.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1533.6 *
1533.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1533.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1533.9 + *
1533.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1533.11 + * Other names may be trademarks of their respective owners.
1533.12 *
1533.13 * The contents of this file are subject to the terms of either the GNU
1533.14 * General Public License Version 2 only ("GPL") or the Common
1533.15 @@ -13,9 +16,9 @@
1533.16 * specific language governing permissions and limitations under the
1533.17 * License. When distributing the software, include this License Header
1533.18 * Notice in each file and include the License file at
1533.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1533.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1533.21 * particular file as subject to the "Classpath" exception as provided
1533.22 - * by Sun in the GPL Version 2 section of the License file that
1533.23 + * by Oracle in the GPL Version 2 section of the License file that
1533.24 * accompanied this code. If applicable, add the following below the
1533.25 * License Header, with the fields enclosed by brackets [] replaced by
1533.26 * your own identifying information:
1534.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableAddColumnAction.java Fri Jul 16 11:47:36 2010 -0400
1534.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableAddColumnAction.java Fri Jul 16 14:21:50 2010 -0400
1534.3 @@ -1,7 +1,10 @@
1534.4 /*
1534.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1534.6 *
1534.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1534.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1534.9 + *
1534.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1534.11 + * Other names may be trademarks of their respective owners.
1534.12 *
1534.13 * The contents of this file are subject to the terms of either the GNU
1534.14 * General Public License Version 2 only ("GPL") or the Common
1534.15 @@ -13,9 +16,9 @@
1534.16 * specific language governing permissions and limitations under the
1534.17 * License. When distributing the software, include this License Header
1534.18 * Notice in each file and include the License file at
1534.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1534.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1534.21 * particular file as subject to the "Classpath" exception as provided
1534.22 - * by Sun in the GPL Version 2 section of the License file that
1534.23 + * by Oracle in the GPL Version 2 section of the License file that
1534.24 * accompanied this code. If applicable, add the following below the
1534.25 * License Header, with the fields enclosed by brackets [] replaced by
1534.26 * your own identifying information:
1535.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1535.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1535.3 @@ -1,7 +1,10 @@
1535.4 /*
1535.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1535.6 *
1535.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1535.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1535.9 + *
1535.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1535.11 + * Other names may be trademarks of their respective owners.
1535.12 *
1535.13 * The contents of this file are subject to the terms of either the GNU
1535.14 * General Public License Version 2 only ("GPL") or the Common
1535.15 @@ -13,9 +16,9 @@
1535.16 * specific language governing permissions and limitations under the
1535.17 * License. When distributing the software, include this License Header
1535.18 * Notice in each file and include the License file at
1535.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1535.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1535.21 * particular file as subject to the "Classpath" exception as provided
1535.22 - * by Sun in the GPL Version 2 section of the License file that
1535.23 + * by Oracle in the GPL Version 2 section of the License file that
1535.24 * accompanied this code. If applicable, add the following below the
1535.25 * License Header, with the fields enclosed by brackets [] replaced by
1535.26 * your own identifying information:
1536.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizer.java Fri Jul 16 11:47:36 2010 -0400
1536.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizer.java Fri Jul 16 14:21:50 2010 -0400
1536.3 @@ -1,7 +1,10 @@
1536.4 /*
1536.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1536.6 *
1536.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1536.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1536.9 + *
1536.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1536.11 + * Other names may be trademarks of their respective owners.
1536.12 *
1536.13 * The contents of this file are subject to the terms of either the GNU
1536.14 * General Public License Version 2 only ("GPL") or the Common
1536.15 @@ -13,9 +16,9 @@
1536.16 * specific language governing permissions and limitations under the
1536.17 * License. When distributing the software, include this License Header
1536.18 * Notice in each file and include the License file at
1536.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1536.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1536.21 * particular file as subject to the "Classpath" exception as provided
1536.22 - * by Sun in the GPL Version 2 section of the License file that
1536.23 + * by Oracle in the GPL Version 2 section of the License file that
1536.24 * accompanied this code. If applicable, add the following below the
1536.25 * License Header, with the fields enclosed by brackets [] replaced by
1536.26 * your own identifying information:
1537.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
1537.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
1537.3 @@ -1,7 +1,10 @@
1537.4 /*
1537.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1537.6 *
1537.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1537.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1537.9 + *
1537.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1537.11 + * Other names may be trademarks of their respective owners.
1537.12 *
1537.13 * The contents of this file are subject to the terms of either the GNU
1537.14 * General Public License Version 2 only ("GPL") or the Common
1537.15 @@ -13,9 +16,9 @@
1537.16 * specific language governing permissions and limitations under the
1537.17 * License. When distributing the software, include this License Header
1537.18 * Notice in each file and include the License file at
1537.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1537.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1537.21 * particular file as subject to the "Classpath" exception as provided
1537.22 - * by Sun in the GPL Version 2 section of the License file that
1537.23 + * by Oracle in the GPL Version 2 section of the License file that
1537.24 * accompanied this code. If applicable, add the following below the
1537.25 * License Header, with the fields enclosed by brackets [] replaced by
1537.26 * your own identifying information:
1538.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizerColumnsPanel.java Fri Jul 16 11:47:36 2010 -0400
1538.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizerColumnsPanel.java Fri Jul 16 14:21:50 2010 -0400
1538.3 @@ -1,7 +1,10 @@
1538.4 /*
1538.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1538.6 *
1538.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1538.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1538.9 + *
1538.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1538.11 + * Other names may be trademarks of their respective owners.
1538.12 *
1538.13 * The contents of this file are subject to the terms of either the GNU
1538.14 * General Public License Version 2 only ("GPL") or the Common
1538.15 @@ -13,9 +16,9 @@
1538.16 * specific language governing permissions and limitations under the
1538.17 * License. When distributing the software, include this License Header
1538.18 * Notice in each file and include the License file at
1538.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1538.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1538.21 * particular file as subject to the "Classpath" exception as provided
1538.22 - * by Sun in the GPL Version 2 section of the License file that
1538.23 + * by Oracle in the GPL Version 2 section of the License file that
1538.24 * accompanied this code. If applicable, add the following below the
1538.25 * License Header, with the fields enclosed by brackets [] replaced by
1538.26 * your own identifying information:
1539.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizerMainPanel.java Fri Jul 16 11:47:36 2010 -0400
1539.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizerMainPanel.java Fri Jul 16 14:21:50 2010 -0400
1539.3 @@ -1,7 +1,10 @@
1539.4 /*
1539.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1539.6 *
1539.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1539.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1539.9 + *
1539.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1539.11 + * Other names may be trademarks of their respective owners.
1539.12 *
1539.13 * The contents of this file are subject to the terms of either the GNU
1539.14 * General Public License Version 2 only ("GPL") or the Common
1539.15 @@ -13,9 +16,9 @@
1539.16 * specific language governing permissions and limitations under the
1539.17 * License. When distributing the software, include this License Header
1539.18 * Notice in each file and include the License file at
1539.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1539.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1539.21 * particular file as subject to the "Classpath" exception as provided
1539.22 - * by Sun in the GPL Version 2 section of the License file that
1539.23 + * by Oracle in the GPL Version 2 section of the License file that
1539.24 * accompanied this code. If applicable, add the following below the
1539.25 * License Header, with the fields enclosed by brackets [] replaced by
1539.26 * your own identifying information:
1540.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizerPagingPanel.java Fri Jul 16 11:47:36 2010 -0400
1540.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableCustomizerPagingPanel.java Fri Jul 16 14:21:50 2010 -0400
1540.3 @@ -1,7 +1,10 @@
1540.4 /*
1540.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1540.6 *
1540.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1540.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1540.9 + *
1540.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1540.11 + * Other names may be trademarks of their respective owners.
1540.12 *
1540.13 * The contents of this file are subject to the terms of either the GNU
1540.14 * General Public License Version 2 only ("GPL") or the Common
1540.15 @@ -13,9 +16,9 @@
1540.16 * specific language governing permissions and limitations under the
1540.17 * License. When distributing the software, include this License Header
1540.18 * Notice in each file and include the License file at
1540.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1540.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1540.21 * particular file as subject to the "Classpath" exception as provided
1540.22 - * by Sun in the GPL Version 2 section of the License file that
1540.23 + * by Oracle in the GPL Version 2 section of the License file that
1540.24 * accompanied this code. If applicable, add the following below the
1540.25 * License Header, with the fields enclosed by brackets [] replaced by
1540.26 * your own identifying information:
1541.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1541.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1541.3 @@ -1,7 +1,10 @@
1541.4 /*
1541.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1541.6 *
1541.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1541.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1541.9 + *
1541.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1541.11 + * Other names may be trademarks of their respective owners.
1541.12 *
1541.13 * The contents of this file are subject to the terms of either the GNU
1541.14 * General Public License Version 2 only ("GPL") or the Common
1541.15 @@ -13,9 +16,9 @@
1541.16 * specific language governing permissions and limitations under the
1541.17 * License. When distributing the software, include this License Header
1541.18 * Notice in each file and include the License file at
1541.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1541.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1541.21 * particular file as subject to the "Classpath" exception as provided
1541.22 - * by Sun in the GPL Version 2 section of the License file that
1541.23 + * by Oracle in the GPL Version 2 section of the License file that
1541.24 * accompanied this code. If applicable, add the following below the
1541.25 * License Header, with the fields enclosed by brackets [] replaced by
1541.26 * your own identifying information:
1542.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableState.java Fri Jul 16 11:47:36 2010 -0400
1542.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlDataTableState.java Fri Jul 16 14:21:50 2010 -0400
1542.3 @@ -1,7 +1,10 @@
1542.4 /*
1542.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1542.6 *
1542.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1542.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1542.9 + *
1542.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1542.11 + * Other names may be trademarks of their respective owners.
1542.12 *
1542.13 * The contents of this file are subject to the terms of either the GNU
1542.14 * General Public License Version 2 only ("GPL") or the Common
1542.15 @@ -13,9 +16,9 @@
1542.16 * specific language governing permissions and limitations under the
1542.17 * License. When distributing the software, include this License Header
1542.18 * Notice in each file and include the License file at
1542.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1542.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1542.21 * particular file as subject to the "Classpath" exception as provided
1542.22 - * by Sun in the GPL Version 2 section of the License file that
1542.23 + * by Oracle in the GPL Version 2 section of the License file that
1542.24 * accompanied this code. If applicable, add the following below the
1542.25 * License Header, with the fields enclosed by brackets [] replaced by
1542.26 * your own identifying information:
1543.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlGraphicImageBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1543.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlGraphicImageBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1543.3 @@ -1,7 +1,10 @@
1543.4 /*
1543.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1543.6 *
1543.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1543.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1543.9 + *
1543.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1543.11 + * Other names may be trademarks of their respective owners.
1543.12 *
1543.13 * The contents of this file are subject to the terms of either the GNU
1543.14 * General Public License Version 2 only ("GPL") or the Common
1543.15 @@ -13,9 +16,9 @@
1543.16 * specific language governing permissions and limitations under the
1543.17 * License. When distributing the software, include this License Header
1543.18 * Notice in each file and include the License file at
1543.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1543.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1543.21 * particular file as subject to the "Classpath" exception as provided
1543.22 - * by Sun in the GPL Version 2 section of the License file that
1543.23 + * by Oracle in the GPL Version 2 section of the License file that
1543.24 * accompanied this code. If applicable, add the following below the
1543.25 * License Header, with the fields enclosed by brackets [] replaced by
1543.26 * your own identifying information:
1544.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlGraphicImageDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1544.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlGraphicImageDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1544.3 @@ -1,7 +1,10 @@
1544.4 /*
1544.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1544.6 *
1544.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1544.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1544.9 + *
1544.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1544.11 + * Other names may be trademarks of their respective owners.
1544.12 *
1544.13 * The contents of this file are subject to the terms of either the GNU
1544.14 * General Public License Version 2 only ("GPL") or the Common
1544.15 @@ -13,9 +16,9 @@
1544.16 * specific language governing permissions and limitations under the
1544.17 * License. When distributing the software, include this License Header
1544.18 * Notice in each file and include the License file at
1544.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1544.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1544.21 * particular file as subject to the "Classpath" exception as provided
1544.22 - * by Sun in the GPL Version 2 section of the License file that
1544.23 + * by Oracle in the GPL Version 2 section of the License file that
1544.24 * accompanied this code. If applicable, add the following below the
1544.25 * License Header, with the fields enclosed by brackets [] replaced by
1544.26 * your own identifying information:
1545.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputHiddenBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1545.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputHiddenBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1545.3 @@ -1,7 +1,10 @@
1545.4 /*
1545.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1545.6 *
1545.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1545.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1545.9 + *
1545.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1545.11 + * Other names may be trademarks of their respective owners.
1545.12 *
1545.13 * The contents of this file are subject to the terms of either the GNU
1545.14 * General Public License Version 2 only ("GPL") or the Common
1545.15 @@ -13,9 +16,9 @@
1545.16 * specific language governing permissions and limitations under the
1545.17 * License. When distributing the software, include this License Header
1545.18 * Notice in each file and include the License file at
1545.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1545.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1545.21 * particular file as subject to the "Classpath" exception as provided
1545.22 - * by Sun in the GPL Version 2 section of the License file that
1545.23 + * by Oracle in the GPL Version 2 section of the License file that
1545.24 * accompanied this code. If applicable, add the following below the
1545.25 * License Header, with the fields enclosed by brackets [] replaced by
1545.26 * your own identifying information:
1546.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputHiddenDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1546.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputHiddenDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1546.3 @@ -1,7 +1,10 @@
1546.4 /*
1546.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1546.6 *
1546.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1546.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1546.9 + *
1546.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1546.11 + * Other names may be trademarks of their respective owners.
1546.12 *
1546.13 * The contents of this file are subject to the terms of either the GNU
1546.14 * General Public License Version 2 only ("GPL") or the Common
1546.15 @@ -13,9 +16,9 @@
1546.16 * specific language governing permissions and limitations under the
1546.17 * License. When distributing the software, include this License Header
1546.18 * Notice in each file and include the License file at
1546.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1546.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1546.21 * particular file as subject to the "Classpath" exception as provided
1546.22 - * by Sun in the GPL Version 2 section of the License file that
1546.23 + * by Oracle in the GPL Version 2 section of the License file that
1546.24 * accompanied this code. If applicable, add the following below the
1546.25 * License Header, with the fields enclosed by brackets [] replaced by
1546.26 * your own identifying information:
1547.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputSecretBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1547.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputSecretBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1547.3 @@ -1,7 +1,10 @@
1547.4 /*
1547.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1547.6 *
1547.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1547.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1547.9 + *
1547.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1547.11 + * Other names may be trademarks of their respective owners.
1547.12 *
1547.13 * The contents of this file are subject to the terms of either the GNU
1547.14 * General Public License Version 2 only ("GPL") or the Common
1547.15 @@ -13,9 +16,9 @@
1547.16 * specific language governing permissions and limitations under the
1547.17 * License. When distributing the software, include this License Header
1547.18 * Notice in each file and include the License file at
1547.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1547.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1547.21 * particular file as subject to the "Classpath" exception as provided
1547.22 - * by Sun in the GPL Version 2 section of the License file that
1547.23 + * by Oracle in the GPL Version 2 section of the License file that
1547.24 * accompanied this code. If applicable, add the following below the
1547.25 * License Header, with the fields enclosed by brackets [] replaced by
1547.26 * your own identifying information:
1548.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputSecretDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1548.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputSecretDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1548.3 @@ -1,7 +1,10 @@
1548.4 /*
1548.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1548.6 *
1548.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1548.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1548.9 + *
1548.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1548.11 + * Other names may be trademarks of their respective owners.
1548.12 *
1548.13 * The contents of this file are subject to the terms of either the GNU
1548.14 * General Public License Version 2 only ("GPL") or the Common
1548.15 @@ -13,9 +16,9 @@
1548.16 * specific language governing permissions and limitations under the
1548.17 * License. When distributing the software, include this License Header
1548.18 * Notice in each file and include the License file at
1548.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1548.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1548.21 * particular file as subject to the "Classpath" exception as provided
1548.22 - * by Sun in the GPL Version 2 section of the License file that
1548.23 + * by Oracle in the GPL Version 2 section of the License file that
1548.24 * accompanied this code. If applicable, add the following below the
1548.25 * License Header, with the fields enclosed by brackets [] replaced by
1548.26 * your own identifying information:
1549.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputTextBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1549.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputTextBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1549.3 @@ -1,7 +1,10 @@
1549.4 /*
1549.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1549.6 *
1549.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1549.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1549.9 + *
1549.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1549.11 + * Other names may be trademarks of their respective owners.
1549.12 *
1549.13 * The contents of this file are subject to the terms of either the GNU
1549.14 * General Public License Version 2 only ("GPL") or the Common
1549.15 @@ -13,9 +16,9 @@
1549.16 * specific language governing permissions and limitations under the
1549.17 * License. When distributing the software, include this License Header
1549.18 * Notice in each file and include the License file at
1549.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1549.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1549.21 * particular file as subject to the "Classpath" exception as provided
1549.22 - * by Sun in the GPL Version 2 section of the License file that
1549.23 + * by Oracle in the GPL Version 2 section of the License file that
1549.24 * accompanied this code. If applicable, add the following below the
1549.25 * License Header, with the fields enclosed by brackets [] replaced by
1549.26 * your own identifying information:
1550.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputTextDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1550.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputTextDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1550.3 @@ -1,7 +1,10 @@
1550.4 /*
1550.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1550.6 *
1550.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1550.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1550.9 + *
1550.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1550.11 + * Other names may be trademarks of their respective owners.
1550.12 *
1550.13 * The contents of this file are subject to the terms of either the GNU
1550.14 * General Public License Version 2 only ("GPL") or the Common
1550.15 @@ -13,9 +16,9 @@
1550.16 * specific language governing permissions and limitations under the
1550.17 * License. When distributing the software, include this License Header
1550.18 * Notice in each file and include the License file at
1550.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1550.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1550.21 * particular file as subject to the "Classpath" exception as provided
1550.22 - * by Sun in the GPL Version 2 section of the License file that
1550.23 + * by Oracle in the GPL Version 2 section of the License file that
1550.24 * accompanied this code. If applicable, add the following below the
1550.25 * License Header, with the fields enclosed by brackets [] replaced by
1550.26 * your own identifying information:
1551.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputTextareaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1551.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputTextareaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1551.3 @@ -1,7 +1,10 @@
1551.4 /*
1551.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1551.6 *
1551.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1551.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1551.9 + *
1551.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1551.11 + * Other names may be trademarks of their respective owners.
1551.12 *
1551.13 * The contents of this file are subject to the terms of either the GNU
1551.14 * General Public License Version 2 only ("GPL") or the Common
1551.15 @@ -13,9 +16,9 @@
1551.16 * specific language governing permissions and limitations under the
1551.17 * License. When distributing the software, include this License Header
1551.18 * Notice in each file and include the License file at
1551.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1551.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1551.21 * particular file as subject to the "Classpath" exception as provided
1551.22 - * by Sun in the GPL Version 2 section of the License file that
1551.23 + * by Oracle in the GPL Version 2 section of the License file that
1551.24 * accompanied this code. If applicable, add the following below the
1551.25 * License Header, with the fields enclosed by brackets [] replaced by
1551.26 * your own identifying information:
1552.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputTextareaDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1552.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlInputTextareaDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1552.3 @@ -1,7 +1,10 @@
1552.4 /*
1552.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1552.6 *
1552.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1552.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1552.9 + *
1552.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1552.11 + * Other names may be trademarks of their respective owners.
1552.12 *
1552.13 * The contents of this file are subject to the terms of either the GNU
1552.14 * General Public License Version 2 only ("GPL") or the Common
1552.15 @@ -13,9 +16,9 @@
1552.16 * specific language governing permissions and limitations under the
1552.17 * License. When distributing the software, include this License Header
1552.18 * Notice in each file and include the License file at
1552.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1552.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1552.21 * particular file as subject to the "Classpath" exception as provided
1552.22 - * by Sun in the GPL Version 2 section of the License file that
1552.23 + * by Oracle in the GPL Version 2 section of the License file that
1552.24 * accompanied this code. If applicable, add the following below the
1552.25 * License Header, with the fields enclosed by brackets [] replaced by
1552.26 * your own identifying information:
1553.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessageBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1553.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessageBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1553.3 @@ -1,7 +1,10 @@
1553.4 /*
1553.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1553.6 *
1553.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1553.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1553.9 + *
1553.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1553.11 + * Other names may be trademarks of their respective owners.
1553.12 *
1553.13 * The contents of this file are subject to the terms of either the GNU
1553.14 * General Public License Version 2 only ("GPL") or the Common
1553.15 @@ -13,9 +16,9 @@
1553.16 * specific language governing permissions and limitations under the
1553.17 * License. When distributing the software, include this License Header
1553.18 * Notice in each file and include the License file at
1553.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1553.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1553.21 * particular file as subject to the "Classpath" exception as provided
1553.22 - * by Sun in the GPL Version 2 section of the License file that
1553.23 + * by Oracle in the GPL Version 2 section of the License file that
1553.24 * accompanied this code. If applicable, add the following below the
1553.25 * License Header, with the fields enclosed by brackets [] replaced by
1553.26 * your own identifying information:
1554.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessageDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1554.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessageDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1554.3 @@ -1,7 +1,10 @@
1554.4 /*
1554.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1554.6 *
1554.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1554.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1554.9 + *
1554.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1554.11 + * Other names may be trademarks of their respective owners.
1554.12 *
1554.13 * The contents of this file are subject to the terms of either the GNU
1554.14 * General Public License Version 2 only ("GPL") or the Common
1554.15 @@ -13,9 +16,9 @@
1554.16 * specific language governing permissions and limitations under the
1554.17 * License. When distributing the software, include this License Header
1554.18 * Notice in each file and include the License file at
1554.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1554.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1554.21 * particular file as subject to the "Classpath" exception as provided
1554.22 - * by Sun in the GPL Version 2 section of the License file that
1554.23 + * by Oracle in the GPL Version 2 section of the License file that
1554.24 * accompanied this code. If applicable, add the following below the
1554.25 * License Header, with the fields enclosed by brackets [] replaced by
1554.26 * your own identifying information:
1555.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessagesBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1555.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessagesBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1555.3 @@ -1,7 +1,10 @@
1555.4 /*
1555.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1555.6 *
1555.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1555.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1555.9 + *
1555.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1555.11 + * Other names may be trademarks of their respective owners.
1555.12 *
1555.13 * The contents of this file are subject to the terms of either the GNU
1555.14 * General Public License Version 2 only ("GPL") or the Common
1555.15 @@ -13,9 +16,9 @@
1555.16 * specific language governing permissions and limitations under the
1555.17 * License. When distributing the software, include this License Header
1555.18 * Notice in each file and include the License file at
1555.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1555.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1555.21 * particular file as subject to the "Classpath" exception as provided
1555.22 - * by Sun in the GPL Version 2 section of the License file that
1555.23 + * by Oracle in the GPL Version 2 section of the License file that
1555.24 * accompanied this code. If applicable, add the following below the
1555.25 * License Header, with the fields enclosed by brackets [] replaced by
1555.26 * your own identifying information:
1556.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessagesDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1556.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessagesDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1556.3 @@ -1,7 +1,10 @@
1556.4 /*
1556.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1556.6 *
1556.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1556.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1556.9 + *
1556.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1556.11 + * Other names may be trademarks of their respective owners.
1556.12 *
1556.13 * The contents of this file are subject to the terms of either the GNU
1556.14 * General Public License Version 2 only ("GPL") or the Common
1556.15 @@ -13,9 +16,9 @@
1556.16 * specific language governing permissions and limitations under the
1556.17 * License. When distributing the software, include this License Header
1556.18 * Notice in each file and include the License file at
1556.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1556.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1556.21 * particular file as subject to the "Classpath" exception as provided
1556.22 - * by Sun in the GPL Version 2 section of the License file that
1556.23 + * by Oracle in the GPL Version 2 section of the License file that
1556.24 * accompanied this code. If applicable, add the following below the
1556.25 * License Header, with the fields enclosed by brackets [] replaced by
1556.26 * your own identifying information:
1557.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessagesLayoutStylesDomain.java Fri Jul 16 11:47:36 2010 -0400
1557.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlMessagesLayoutStylesDomain.java Fri Jul 16 14:21:50 2010 -0400
1557.3 @@ -1,7 +1,10 @@
1557.4 /*
1557.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1557.6 *
1557.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1557.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1557.9 + *
1557.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1557.11 + * Other names may be trademarks of their respective owners.
1557.12 *
1557.13 * The contents of this file are subject to the terms of either the GNU
1557.14 * General Public License Version 2 only ("GPL") or the Common
1557.15 @@ -13,9 +16,9 @@
1557.16 * specific language governing permissions and limitations under the
1557.17 * License. When distributing the software, include this License Header
1557.18 * Notice in each file and include the License file at
1557.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1557.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1557.21 * particular file as subject to the "Classpath" exception as provided
1557.22 - * by Sun in the GPL Version 2 section of the License file that
1557.23 + * by Oracle in the GPL Version 2 section of the License file that
1557.24 * accompanied this code. If applicable, add the following below the
1557.25 * License Header, with the fields enclosed by brackets [] replaced by
1557.26 * your own identifying information:
1558.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputFormatBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1558.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputFormatBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1558.3 @@ -1,7 +1,10 @@
1558.4 /*
1558.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1558.6 *
1558.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1558.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1558.9 + *
1558.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1558.11 + * Other names may be trademarks of their respective owners.
1558.12 *
1558.13 * The contents of this file are subject to the terms of either the GNU
1558.14 * General Public License Version 2 only ("GPL") or the Common
1558.15 @@ -13,9 +16,9 @@
1558.16 * specific language governing permissions and limitations under the
1558.17 * License. When distributing the software, include this License Header
1558.18 * Notice in each file and include the License file at
1558.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1558.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1558.21 * particular file as subject to the "Classpath" exception as provided
1558.22 - * by Sun in the GPL Version 2 section of the License file that
1558.23 + * by Oracle in the GPL Version 2 section of the License file that
1558.24 * accompanied this code. If applicable, add the following below the
1558.25 * License Header, with the fields enclosed by brackets [] replaced by
1558.26 * your own identifying information:
1559.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputFormatDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1559.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputFormatDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1559.3 @@ -1,7 +1,10 @@
1559.4 /*
1559.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1559.6 *
1559.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1559.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1559.9 + *
1559.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1559.11 + * Other names may be trademarks of their respective owners.
1559.12 *
1559.13 * The contents of this file are subject to the terms of either the GNU
1559.14 * General Public License Version 2 only ("GPL") or the Common
1559.15 @@ -13,9 +16,9 @@
1559.16 * specific language governing permissions and limitations under the
1559.17 * License. When distributing the software, include this License Header
1559.18 * Notice in each file and include the License file at
1559.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1559.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1559.21 * particular file as subject to the "Classpath" exception as provided
1559.22 - * by Sun in the GPL Version 2 section of the License file that
1559.23 + * by Oracle in the GPL Version 2 section of the License file that
1559.24 * accompanied this code. If applicable, add the following below the
1559.25 * License Header, with the fields enclosed by brackets [] replaced by
1559.26 * your own identifying information:
1560.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputLabelBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1560.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputLabelBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1560.3 @@ -1,7 +1,10 @@
1560.4 /*
1560.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1560.6 *
1560.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1560.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1560.9 + *
1560.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1560.11 + * Other names may be trademarks of their respective owners.
1560.12 *
1560.13 * The contents of this file are subject to the terms of either the GNU
1560.14 * General Public License Version 2 only ("GPL") or the Common
1560.15 @@ -13,9 +16,9 @@
1560.16 * specific language governing permissions and limitations under the
1560.17 * License. When distributing the software, include this License Header
1560.18 * Notice in each file and include the License file at
1560.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1560.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1560.21 * particular file as subject to the "Classpath" exception as provided
1560.22 - * by Sun in the GPL Version 2 section of the License file that
1560.23 + * by Oracle in the GPL Version 2 section of the License file that
1560.24 * accompanied this code. If applicable, add the following below the
1560.25 * License Header, with the fields enclosed by brackets [] replaced by
1560.26 * your own identifying information:
1561.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputLabelDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1561.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputLabelDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1561.3 @@ -1,7 +1,10 @@
1561.4 /*
1561.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1561.6 *
1561.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1561.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1561.9 + *
1561.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1561.11 + * Other names may be trademarks of their respective owners.
1561.12 *
1561.13 * The contents of this file are subject to the terms of either the GNU
1561.14 * General Public License Version 2 only ("GPL") or the Common
1561.15 @@ -13,9 +16,9 @@
1561.16 * specific language governing permissions and limitations under the
1561.17 * License. When distributing the software, include this License Header
1561.18 * Notice in each file and include the License file at
1561.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1561.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1561.21 * particular file as subject to the "Classpath" exception as provided
1561.22 - * by Sun in the GPL Version 2 section of the License file that
1561.23 + * by Oracle in the GPL Version 2 section of the License file that
1561.24 * accompanied this code. If applicable, add the following below the
1561.25 * License Header, with the fields enclosed by brackets [] replaced by
1561.26 * your own identifying information:
1562.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputLinkBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1562.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputLinkBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1562.3 @@ -1,7 +1,10 @@
1562.4 /*
1562.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1562.6 *
1562.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1562.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1562.9 + *
1562.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1562.11 + * Other names may be trademarks of their respective owners.
1562.12 *
1562.13 * The contents of this file are subject to the terms of either the GNU
1562.14 * General Public License Version 2 only ("GPL") or the Common
1562.15 @@ -13,9 +16,9 @@
1562.16 * specific language governing permissions and limitations under the
1562.17 * License. When distributing the software, include this License Header
1562.18 * Notice in each file and include the License file at
1562.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1562.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1562.21 * particular file as subject to the "Classpath" exception as provided
1562.22 - * by Sun in the GPL Version 2 section of the License file that
1562.23 + * by Oracle in the GPL Version 2 section of the License file that
1562.24 * accompanied this code. If applicable, add the following below the
1562.25 * License Header, with the fields enclosed by brackets [] replaced by
1562.26 * your own identifying information:
1563.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputLinkDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1563.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputLinkDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1563.3 @@ -1,7 +1,10 @@
1563.4 /*
1563.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1563.6 *
1563.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1563.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1563.9 + *
1563.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1563.11 + * Other names may be trademarks of their respective owners.
1563.12 *
1563.13 * The contents of this file are subject to the terms of either the GNU
1563.14 * General Public License Version 2 only ("GPL") or the Common
1563.15 @@ -13,9 +16,9 @@
1563.16 * specific language governing permissions and limitations under the
1563.17 * License. When distributing the software, include this License Header
1563.18 * Notice in each file and include the License file at
1563.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1563.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1563.21 * particular file as subject to the "Classpath" exception as provided
1563.22 - * by Sun in the GPL Version 2 section of the License file that
1563.23 + * by Oracle in the GPL Version 2 section of the License file that
1563.24 * accompanied this code. If applicable, add the following below the
1563.25 * License Header, with the fields enclosed by brackets [] replaced by
1563.26 * your own identifying information:
1564.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputTextBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1564.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputTextBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1564.3 @@ -1,7 +1,10 @@
1564.4 /*
1564.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1564.6 *
1564.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1564.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1564.9 + *
1564.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1564.11 + * Other names may be trademarks of their respective owners.
1564.12 *
1564.13 * The contents of this file are subject to the terms of either the GNU
1564.14 * General Public License Version 2 only ("GPL") or the Common
1564.15 @@ -13,9 +16,9 @@
1564.16 * specific language governing permissions and limitations under the
1564.17 * License. When distributing the software, include this License Header
1564.18 * Notice in each file and include the License file at
1564.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1564.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1564.21 * particular file as subject to the "Classpath" exception as provided
1564.22 - * by Sun in the GPL Version 2 section of the License file that
1564.23 + * by Oracle in the GPL Version 2 section of the License file that
1564.24 * accompanied this code. If applicable, add the following below the
1564.25 * License Header, with the fields enclosed by brackets [] replaced by
1564.26 * your own identifying information:
1565.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputTextDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1565.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlOutputTextDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1565.3 @@ -1,7 +1,10 @@
1565.4 /*
1565.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1565.6 *
1565.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1565.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1565.9 + *
1565.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1565.11 + * Other names may be trademarks of their respective owners.
1565.12 *
1565.13 * The contents of this file are subject to the terms of either the GNU
1565.14 * General Public License Version 2 only ("GPL") or the Common
1565.15 @@ -13,9 +16,9 @@
1565.16 * specific language governing permissions and limitations under the
1565.17 * License. When distributing the software, include this License Header
1565.18 * Notice in each file and include the License file at
1565.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1565.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1565.21 * particular file as subject to the "Classpath" exception as provided
1565.22 - * by Sun in the GPL Version 2 section of the License file that
1565.23 + * by Oracle in the GPL Version 2 section of the License file that
1565.24 * accompanied this code. If applicable, add the following below the
1565.25 * License Header, with the fields enclosed by brackets [] replaced by
1565.26 * your own identifying information:
1566.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectBooleanCheckboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1566.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectBooleanCheckboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1566.3 @@ -1,7 +1,10 @@
1566.4 /*
1566.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1566.6 *
1566.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1566.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1566.9 + *
1566.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1566.11 + * Other names may be trademarks of their respective owners.
1566.12 *
1566.13 * The contents of this file are subject to the terms of either the GNU
1566.14 * General Public License Version 2 only ("GPL") or the Common
1566.15 @@ -13,9 +16,9 @@
1566.16 * specific language governing permissions and limitations under the
1566.17 * License. When distributing the software, include this License Header
1566.18 * Notice in each file and include the License file at
1566.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1566.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1566.21 * particular file as subject to the "Classpath" exception as provided
1566.22 - * by Sun in the GPL Version 2 section of the License file that
1566.23 + * by Oracle in the GPL Version 2 section of the License file that
1566.24 * accompanied this code. If applicable, add the following below the
1566.25 * License Header, with the fields enclosed by brackets [] replaced by
1566.26 * your own identifying information:
1567.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectBooleanCheckboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1567.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectBooleanCheckboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1567.3 @@ -1,7 +1,10 @@
1567.4 /*
1567.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1567.6 *
1567.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1567.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1567.9 + *
1567.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1567.11 + * Other names may be trademarks of their respective owners.
1567.12 *
1567.13 * The contents of this file are subject to the terms of either the GNU
1567.14 * General Public License Version 2 only ("GPL") or the Common
1567.15 @@ -13,9 +16,9 @@
1567.16 * specific language governing permissions and limitations under the
1567.17 * License. When distributing the software, include this License Header
1567.18 * Notice in each file and include the License file at
1567.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1567.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1567.21 * particular file as subject to the "Classpath" exception as provided
1567.22 - * by Sun in the GPL Version 2 section of the License file that
1567.23 + * by Oracle in the GPL Version 2 section of the License file that
1567.24 * accompanied this code. If applicable, add the following below the
1567.25 * License Header, with the fields enclosed by brackets [] replaced by
1567.26 * your own identifying information:
1568.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectDesignInfoBase.java Fri Jul 16 11:47:36 2010 -0400
1568.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectDesignInfoBase.java Fri Jul 16 14:21:50 2010 -0400
1568.3 @@ -1,7 +1,10 @@
1568.4 /*
1568.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1568.6 *
1568.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1568.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1568.9 + *
1568.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1568.11 + * Other names may be trademarks of their respective owners.
1568.12 *
1568.13 * The contents of this file are subject to the terms of either the GNU
1568.14 * General Public License Version 2 only ("GPL") or the Common
1568.15 @@ -13,9 +16,9 @@
1568.16 * specific language governing permissions and limitations under the
1568.17 * License. When distributing the software, include this License Header
1568.18 * Notice in each file and include the License file at
1568.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1568.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1568.21 * particular file as subject to the "Classpath" exception as provided
1568.22 - * by Sun in the GPL Version 2 section of the License file that
1568.23 + * by Oracle in the GPL Version 2 section of the License file that
1568.24 * accompanied this code. If applicable, add the following below the
1568.25 * License Header, with the fields enclosed by brackets [] replaced by
1568.26 * your own identifying information:
1569.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyCheckboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1569.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyCheckboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1569.3 @@ -1,7 +1,10 @@
1569.4 /*
1569.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1569.6 *
1569.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1569.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1569.9 + *
1569.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1569.11 + * Other names may be trademarks of their respective owners.
1569.12 *
1569.13 * The contents of this file are subject to the terms of either the GNU
1569.14 * General Public License Version 2 only ("GPL") or the Common
1569.15 @@ -13,9 +16,9 @@
1569.16 * specific language governing permissions and limitations under the
1569.17 * License. When distributing the software, include this License Header
1569.18 * Notice in each file and include the License file at
1569.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1569.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1569.21 * particular file as subject to the "Classpath" exception as provided
1569.22 - * by Sun in the GPL Version 2 section of the License file that
1569.23 + * by Oracle in the GPL Version 2 section of the License file that
1569.24 * accompanied this code. If applicable, add the following below the
1569.25 * License Header, with the fields enclosed by brackets [] replaced by
1569.26 * your own identifying information:
1570.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyCheckboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1570.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyCheckboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1570.3 @@ -1,7 +1,10 @@
1570.4 /*
1570.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1570.6 *
1570.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1570.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1570.9 + *
1570.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1570.11 + * Other names may be trademarks of their respective owners.
1570.12 *
1570.13 * The contents of this file are subject to the terms of either the GNU
1570.14 * General Public License Version 2 only ("GPL") or the Common
1570.15 @@ -13,9 +16,9 @@
1570.16 * specific language governing permissions and limitations under the
1570.17 * License. When distributing the software, include this License Header
1570.18 * Notice in each file and include the License file at
1570.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1570.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1570.21 * particular file as subject to the "Classpath" exception as provided
1570.22 - * by Sun in the GPL Version 2 section of the License file that
1570.23 + * by Oracle in the GPL Version 2 section of the License file that
1570.24 * accompanied this code. If applicable, add the following below the
1570.25 * License Header, with the fields enclosed by brackets [] replaced by
1570.26 * your own identifying information:
1571.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyListboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1571.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyListboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1571.3 @@ -1,7 +1,10 @@
1571.4 /*
1571.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1571.6 *
1571.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1571.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1571.9 + *
1571.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1571.11 + * Other names may be trademarks of their respective owners.
1571.12 *
1571.13 * The contents of this file are subject to the terms of either the GNU
1571.14 * General Public License Version 2 only ("GPL") or the Common
1571.15 @@ -13,9 +16,9 @@
1571.16 * specific language governing permissions and limitations under the
1571.17 * License. When distributing the software, include this License Header
1571.18 * Notice in each file and include the License file at
1571.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1571.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1571.21 * particular file as subject to the "Classpath" exception as provided
1571.22 - * by Sun in the GPL Version 2 section of the License file that
1571.23 + * by Oracle in the GPL Version 2 section of the License file that
1571.24 * accompanied this code. If applicable, add the following below the
1571.25 * License Header, with the fields enclosed by brackets [] replaced by
1571.26 * your own identifying information:
1572.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyListboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1572.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyListboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1572.3 @@ -1,7 +1,10 @@
1572.4 /*
1572.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1572.6 *
1572.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1572.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1572.9 + *
1572.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1572.11 + * Other names may be trademarks of their respective owners.
1572.12 *
1572.13 * The contents of this file are subject to the terms of either the GNU
1572.14 * General Public License Version 2 only ("GPL") or the Common
1572.15 @@ -13,9 +16,9 @@
1572.16 * specific language governing permissions and limitations under the
1572.17 * License. When distributing the software, include this License Header
1572.18 * Notice in each file and include the License file at
1572.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1572.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1572.21 * particular file as subject to the "Classpath" exception as provided
1572.22 - * by Sun in the GPL Version 2 section of the License file that
1572.23 + * by Oracle in the GPL Version 2 section of the License file that
1572.24 * accompanied this code. If applicable, add the following below the
1572.25 * License Header, with the fields enclosed by brackets [] replaced by
1572.26 * your own identifying information:
1573.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyMenuBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1573.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyMenuBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1573.3 @@ -1,7 +1,10 @@
1573.4 /*
1573.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1573.6 *
1573.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1573.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1573.9 + *
1573.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1573.11 + * Other names may be trademarks of their respective owners.
1573.12 *
1573.13 * The contents of this file are subject to the terms of either the GNU
1573.14 * General Public License Version 2 only ("GPL") or the Common
1573.15 @@ -13,9 +16,9 @@
1573.16 * specific language governing permissions and limitations under the
1573.17 * License. When distributing the software, include this License Header
1573.18 * Notice in each file and include the License file at
1573.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1573.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1573.21 * particular file as subject to the "Classpath" exception as provided
1573.22 - * by Sun in the GPL Version 2 section of the License file that
1573.23 + * by Oracle in the GPL Version 2 section of the License file that
1573.24 * accompanied this code. If applicable, add the following below the
1573.25 * License Header, with the fields enclosed by brackets [] replaced by
1573.26 * your own identifying information:
1574.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyMenuDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1574.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectManyMenuDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1574.3 @@ -1,7 +1,10 @@
1574.4 /*
1574.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1574.6 *
1574.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1574.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1574.9 + *
1574.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1574.11 + * Other names may be trademarks of their respective owners.
1574.12 *
1574.13 * The contents of this file are subject to the terms of either the GNU
1574.14 * General Public License Version 2 only ("GPL") or the Common
1574.15 @@ -13,9 +16,9 @@
1574.16 * specific language governing permissions and limitations under the
1574.17 * License. When distributing the software, include this License Header
1574.18 * Notice in each file and include the License file at
1574.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1574.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1574.21 * particular file as subject to the "Classpath" exception as provided
1574.22 - * by Sun in the GPL Version 2 section of the License file that
1574.23 + * by Oracle in the GPL Version 2 section of the License file that
1574.24 * accompanied this code. If applicable, add the following below the
1574.25 * License Header, with the fields enclosed by brackets [] replaced by
1574.26 * your own identifying information:
1575.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneListboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1575.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneListboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1575.3 @@ -1,7 +1,10 @@
1575.4 /*
1575.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1575.6 *
1575.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1575.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1575.9 + *
1575.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1575.11 + * Other names may be trademarks of their respective owners.
1575.12 *
1575.13 * The contents of this file are subject to the terms of either the GNU
1575.14 * General Public License Version 2 only ("GPL") or the Common
1575.15 @@ -13,9 +16,9 @@
1575.16 * specific language governing permissions and limitations under the
1575.17 * License. When distributing the software, include this License Header
1575.18 * Notice in each file and include the License file at
1575.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1575.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1575.21 * particular file as subject to the "Classpath" exception as provided
1575.22 - * by Sun in the GPL Version 2 section of the License file that
1575.23 + * by Oracle in the GPL Version 2 section of the License file that
1575.24 * accompanied this code. If applicable, add the following below the
1575.25 * License Header, with the fields enclosed by brackets [] replaced by
1575.26 * your own identifying information:
1576.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneListboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1576.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneListboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1576.3 @@ -1,7 +1,10 @@
1576.4 /*
1576.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1576.6 *
1576.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1576.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1576.9 + *
1576.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1576.11 + * Other names may be trademarks of their respective owners.
1576.12 *
1576.13 * The contents of this file are subject to the terms of either the GNU
1576.14 * General Public License Version 2 only ("GPL") or the Common
1576.15 @@ -13,9 +16,9 @@
1576.16 * specific language governing permissions and limitations under the
1576.17 * License. When distributing the software, include this License Header
1576.18 * Notice in each file and include the License file at
1576.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1576.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1576.21 * particular file as subject to the "Classpath" exception as provided
1576.22 - * by Sun in the GPL Version 2 section of the License file that
1576.23 + * by Oracle in the GPL Version 2 section of the License file that
1576.24 * accompanied this code. If applicable, add the following below the
1576.25 * License Header, with the fields enclosed by brackets [] replaced by
1576.26 * your own identifying information:
1577.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneMenuBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1577.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneMenuBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1577.3 @@ -1,7 +1,10 @@
1577.4 /*
1577.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1577.6 *
1577.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1577.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1577.9 + *
1577.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1577.11 + * Other names may be trademarks of their respective owners.
1577.12 *
1577.13 * The contents of this file are subject to the terms of either the GNU
1577.14 * General Public License Version 2 only ("GPL") or the Common
1577.15 @@ -13,9 +16,9 @@
1577.16 * specific language governing permissions and limitations under the
1577.17 * License. When distributing the software, include this License Header
1577.18 * Notice in each file and include the License file at
1577.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1577.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1577.21 * particular file as subject to the "Classpath" exception as provided
1577.22 - * by Sun in the GPL Version 2 section of the License file that
1577.23 + * by Oracle in the GPL Version 2 section of the License file that
1577.24 * accompanied this code. If applicable, add the following below the
1577.25 * License Header, with the fields enclosed by brackets [] replaced by
1577.26 * your own identifying information:
1578.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneMenuDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1578.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneMenuDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1578.3 @@ -1,7 +1,10 @@
1578.4 /*
1578.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1578.6 *
1578.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1578.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1578.9 + *
1578.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1578.11 + * Other names may be trademarks of their respective owners.
1578.12 *
1578.13 * The contents of this file are subject to the terms of either the GNU
1578.14 * General Public License Version 2 only ("GPL") or the Common
1578.15 @@ -13,9 +16,9 @@
1578.16 * specific language governing permissions and limitations under the
1578.17 * License. When distributing the software, include this License Header
1578.18 * Notice in each file and include the License file at
1578.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1578.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1578.21 * particular file as subject to the "Classpath" exception as provided
1578.22 - * by Sun in the GPL Version 2 section of the License file that
1578.23 + * by Oracle in the GPL Version 2 section of the License file that
1578.24 * accompanied this code. If applicable, add the following below the
1578.25 * License Header, with the fields enclosed by brackets [] replaced by
1578.26 * your own identifying information:
1579.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneRadioBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1579.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneRadioBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1579.3 @@ -1,7 +1,10 @@
1579.4 /*
1579.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1579.6 *
1579.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1579.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1579.9 + *
1579.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1579.11 + * Other names may be trademarks of their respective owners.
1579.12 *
1579.13 * The contents of this file are subject to the terms of either the GNU
1579.14 * General Public License Version 2 only ("GPL") or the Common
1579.15 @@ -13,9 +16,9 @@
1579.16 * specific language governing permissions and limitations under the
1579.17 * License. When distributing the software, include this License Header
1579.18 * Notice in each file and include the License file at
1579.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1579.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1579.21 * particular file as subject to the "Classpath" exception as provided
1579.22 - * by Sun in the GPL Version 2 section of the License file that
1579.23 + * by Oracle in the GPL Version 2 section of the License file that
1579.24 * accompanied this code. If applicable, add the following below the
1579.25 * License Header, with the fields enclosed by brackets [] replaced by
1579.26 * your own identifying information:
1580.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneRadioDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
1580.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/HtmlSelectOneRadioDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
1580.3 @@ -1,7 +1,10 @@
1580.4 /*
1580.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1580.6 *
1580.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1580.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1580.9 + *
1580.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1580.11 + * Other names may be trademarks of their respective owners.
1580.12 *
1580.13 * The contents of this file are subject to the terms of either the GNU
1580.14 * General Public License Version 2 only ("GPL") or the Common
1580.15 @@ -13,9 +16,9 @@
1580.16 * specific language governing permissions and limitations under the
1580.17 * License. When distributing the software, include this License Header
1580.18 * Notice in each file and include the License file at
1580.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1580.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1580.21 * particular file as subject to the "Classpath" exception as provided
1580.22 - * by Sun in the GPL Version 2 section of the License file that
1580.23 + * by Oracle in the GPL Version 2 section of the License file that
1580.24 * accompanied this code. If applicable, add the following below the
1580.25 * License Header, with the fields enclosed by brackets [] replaced by
1580.26 * your own identifying information:
1581.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/Properties.java Fri Jul 16 11:47:36 2010 -0400
1581.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/component/html/Properties.java Fri Jul 16 14:21:50 2010 -0400
1581.3 @@ -1,7 +1,10 @@
1581.4 /*
1581.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1581.6 *
1581.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1581.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1581.9 + *
1581.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1581.11 + * Other names may be trademarks of their respective owners.
1581.12 *
1581.13 * The contents of this file are subject to the terms of either the GNU
1581.14 * General Public License Version 2 only ("GPL") or the Common
1581.15 @@ -13,9 +16,9 @@
1581.16 * specific language governing permissions and limitations under the
1581.17 * License. When distributing the software, include this License Header
1581.18 * Notice in each file and include the License file at
1581.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1581.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1581.21 * particular file as subject to the "Classpath" exception as provided
1581.22 - * by Sun in the GPL Version 2 section of the License file that
1581.23 + * by Oracle in the GPL Version 2 section of the License file that
1581.24 * accompanied this code. If applicable, add the following below the
1581.25 * License Header, with the fields enclosed by brackets [] replaced by
1581.26 * your own identifying information:
1582.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/converter/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1582.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/converter/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1582.3 @@ -1,6 +1,9 @@
1582.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1582.5 #
1582.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1582.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1582.8 +#
1582.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1582.10 +# Other names may be trademarks of their respective owners.
1582.11 #
1582.12 # The contents of this file are subject to the terms of either the GNU
1582.13 # General Public License Version 2 only ("GPL") or the Common
1582.14 @@ -12,9 +15,9 @@
1582.15 # specific language governing permissions and limitations under the
1582.16 # License. When distributing the software, include this License Header
1582.17 # Notice in each file and include the License file at
1582.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1582.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1582.20 # particular file as subject to the "Classpath" exception as provided
1582.21 -# by Sun in the GPL Version 2 section of the License file that
1582.22 +# by Oracle in the GPL Version 2 section of the License file that
1582.23 # accompanied this code. If applicable, add the following below the
1582.24 # License Header, with the fields enclosed by brackets [] replaced by
1582.25 # your own identifying information:
1583.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/converter/EnumConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1583.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/faces/dt_1_2/converter/EnumConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1583.3 @@ -1,7 +1,10 @@
1583.4 /*
1583.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1583.6 *
1583.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1583.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1583.9 + *
1583.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1583.11 + * Other names may be trademarks of their respective owners.
1583.12 *
1583.13 * The contents of this file are subject to the terms of either the GNU
1583.14 * General Public License Version 2 only ("GPL") or the Common
1583.15 @@ -13,9 +16,9 @@
1583.16 * specific language governing permissions and limitations under the
1583.17 * License. When distributing the software, include this License Header
1583.18 * Notice in each file and include the License file at
1583.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1583.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1583.21 * particular file as subject to the "Classpath" exception as provided
1583.22 - * by Sun in the GPL Version 2 section of the License file that
1583.23 + * by Oracle in the GPL Version 2 section of the License file that
1583.24 * accompanied this code. If applicable, add the following below the
1583.25 * License Header, with the fields enclosed by brackets [] replaced by
1583.26 * your own identifying information:
1584.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_2/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1584.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_2/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1584.3 @@ -1,6 +1,9 @@
1584.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1584.5 #
1584.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1584.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1584.8 +#
1584.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1584.10 +# Other names may be trademarks of their respective owners.
1584.11 #
1584.12 # The contents of this file are subject to the terms of either the GNU
1584.13 # General Public License Version 2 only ("GPL") or the Common
1584.14 @@ -12,9 +15,9 @@
1584.15 # specific language governing permissions and limitations under the
1584.16 # License. When distributing the software, include this License Header
1584.17 # Notice in each file and include the License file at
1584.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1584.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1584.20 # particular file as subject to the "Classpath" exception as provided
1584.21 -# by Sun in the GPL Version 2 section of the License file that
1584.22 +# by Oracle in the GPL Version 2 section of the License file that
1584.23 # accompanied this code. If applicable, add the following below the
1584.24 # License Header, with the fields enclosed by brackets [] replaced by
1584.25 # your own identifying information:
1585.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_2/Install.java Fri Jul 16 11:47:36 2010 -0400
1585.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_2/Install.java Fri Jul 16 14:21:50 2010 -0400
1585.3 @@ -1,7 +1,10 @@
1585.4 /*
1585.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1585.6 *
1585.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1585.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1585.9 + *
1585.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1585.11 + * Other names may be trademarks of their respective owners.
1585.12 *
1585.13 * The contents of this file are subject to the terms of either the GNU
1585.14 * General Public License Version 2 only ("GPL") or the Common
1585.15 @@ -13,9 +16,9 @@
1585.16 * specific language governing permissions and limitations under the
1585.17 * License. When distributing the software, include this License Header
1585.18 * Notice in each file and include the License file at
1585.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1585.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1585.21 * particular file as subject to the "Classpath" exception as provided
1585.22 - * by Sun in the GPL Version 2 section of the License file that
1585.23 + * by Oracle in the GPL Version 2 section of the License file that
1585.24 * accompanied this code. If applicable, add the following below the
1585.25 * License Header, with the fields enclosed by brackets [] replaced by
1585.26 * your own identifying information:
1586.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_2/layer.xml Fri Jul 16 11:47:36 2010 -0400
1586.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_2/layer.xml Fri Jul 16 14:21:50 2010 -0400
1586.3 @@ -2,7 +2,10 @@
1586.4 <!--
1586.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1586.6
1586.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1586.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1586.9 +
1586.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1586.11 +Other names may be trademarks of their respective owners.
1586.12
1586.13
1586.14 The contents of this file are subject to the terms of either the GNU
1586.15 @@ -15,9 +18,9 @@
1586.16 specific language governing permissions and limitations under the
1586.17 License. When distributing the software, include this License Header
1586.18 Notice in each file and include the License file at
1586.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1586.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1586.21 particular file as subject to the "Classpath" exception as provided
1586.22 -by Sun in the GPL Version 2 section of the License file that
1586.23 +by Oracle in the GPL Version 2 section of the License file that
1586.24 accompanied this code. If applicable, add the following below the
1586.25 License Header, with the fields enclosed by brackets [] replaced by
1586.26 your own identifying information:
1587.1 --- a/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_2/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1587.2 +++ b/visualweb.jsfsupport.designtime_1_2/src/org/netbeans/modules/visualweb/jsfsupport/designtime_1_2/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1587.3 @@ -1,6 +1,9 @@
1587.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1587.5 #
1587.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1587.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1587.8 +#
1587.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1587.10 +# Other names may be trademarks of their respective owners.
1587.11 #
1587.12 # The contents of this file are subject to the terms of either the GNU
1587.13 # General Public License Version 2 only ("GPL") or the Common
1587.14 @@ -12,9 +15,9 @@
1587.15 # specific language governing permissions and limitations under the
1587.16 # License. When distributing the software, include this License Header
1587.17 # Notice in each file and include the License file at
1587.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1587.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1587.20 # particular file as subject to the "Classpath" exception as provided
1587.21 -# by Sun in the GPL Version 2 section of the License file that
1587.22 +# by Oracle in the GPL Version 2 section of the License file that
1587.23 # accompanied this code. If applicable, add the following below the
1587.24 # License Header, with the fields enclosed by brackets [] replaced by
1587.25 # your own identifying information:
1588.1 --- a/visualweb.jsfsupport.designtime_1_2/test/unit/src/org/netbeans/modules/visualweb/test/BeanInfoTest.java Fri Jul 16 11:47:36 2010 -0400
1588.2 +++ b/visualweb.jsfsupport.designtime_1_2/test/unit/src/org/netbeans/modules/visualweb/test/BeanInfoTest.java Fri Jul 16 14:21:50 2010 -0400
1588.3 @@ -1,7 +1,10 @@
1588.4 /*
1588.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1588.6 *
1588.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1588.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1588.9 + *
1588.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1588.11 + * Other names may be trademarks of their respective owners.
1588.12 *
1588.13 * The contents of this file are subject to the terms of either the GNU
1588.14 * General Public License Version 2 only ("GPL") or the Common
1588.15 @@ -13,9 +16,9 @@
1588.16 * specific language governing permissions and limitations under the
1588.17 * License. When distributing the software, include this License Header
1588.18 * Notice in each file and include the License file at
1588.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1588.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1588.21 * particular file as subject to the "Classpath" exception as provided
1588.22 - * by Sun in the GPL Version 2 section of the License file that
1588.23 + * by Oracle in the GPL Version 2 section of the License file that
1588.24 * accompanied this code. If applicable, add the following below the
1588.25 * License Header, with the fields enclosed by brackets [] replaced by
1588.26 * your own identifying information:
1589.1 --- a/visualweb.jsfsupport/build.xml Fri Jul 16 11:47:36 2010 -0400
1589.2 +++ b/visualweb.jsfsupport/build.xml Fri Jul 16 14:21:50 2010 -0400
1589.3 @@ -2,7 +2,10 @@
1589.4 <!--
1589.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1589.6
1589.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1589.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1589.9 +
1589.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1589.11 +Other names may be trademarks of their respective owners.
1589.12
1589.13
1589.14 The contents of this file are subject to the terms of either the GNU
1589.15 @@ -15,9 +18,9 @@
1589.16 specific language governing permissions and limitations under the
1589.17 License. When distributing the software, include this License Header
1589.18 Notice in each file and include the License file at
1589.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1589.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1589.21 particular file as subject to the "Classpath" exception as provided
1589.22 -by Sun in the GPL Version 2 section of the License file that
1589.23 +by Oracle in the GPL Version 2 section of the License file that
1589.24 accompanied this code. If applicable, add the following below the
1589.25 License Header, with the fields enclosed by brackets [] replaced by
1589.26 your own identifying information:
1590.1 --- a/visualweb.jsfsupport/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1590.2 +++ b/visualweb.jsfsupport/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1590.3 @@ -1,6 +1,9 @@
1590.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1590.5 #
1590.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1590.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1590.8 +#
1590.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1590.10 +# Other names may be trademarks of their respective owners.
1590.11 #
1590.12 # The contents of this file are subject to the terms of either the GNU
1590.13 # General Public License Version 2 only ("GPL") or the Common
1590.14 @@ -12,9 +15,9 @@
1590.15 # specific language governing permissions and limitations under the
1590.16 # License. When distributing the software, include this License Header
1590.17 # Notice in each file and include the License file at
1590.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1590.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1590.20 # particular file as subject to the "Classpath" exception as provided
1590.21 -# by Sun in the GPL Version 2 section of the License file that
1590.22 +# by Oracle in the GPL Version 2 section of the License file that
1590.23 # accompanied this code. If applicable, add the following below the
1590.24 # License Header, with the fields enclosed by brackets [] replaced by
1590.25 # your own identifying information:
1590.26 @@ -61,4 +64,4 @@
1590.27 # all-jsfsupport <- all-jsfcl <- all-ravelibs/webui <- all-jsfsupport
1590.28 # Hopefully jsfcl can be pulled out of the equation soon now that propertyeditors
1590.29 # etc. are moving over and then this can be cleaned up.
1590.30 -javac.source=1.5
1590.31 +javac.source=1.6
1591.1 --- a/visualweb.jsfsupport/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1591.2 +++ b/visualweb.jsfsupport/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1591.3 @@ -2,7 +2,10 @@
1591.4 <!--
1591.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1591.6
1591.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1591.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1591.9 +
1591.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1591.11 +Other names may be trademarks of their respective owners.
1591.12
1591.13
1591.14 The contents of this file are subject to the terms of either the GNU
1591.15 @@ -15,9 +18,9 @@
1591.16 specific language governing permissions and limitations under the
1591.17 License. When distributing the software, include this License Header
1591.18 Notice in each file and include the License file at
1591.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1591.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1591.21 particular file as subject to the "Classpath" exception as provided
1591.22 -by Sun in the GPL Version 2 section of the License file that
1591.23 +by Oracle in the GPL Version 2 section of the License file that
1591.24 accompanied this code. If applicable, add the following below the
1591.25 License Header, with the fields enclosed by brackets [] replaced by
1591.26 your own identifying information:
1591.27 @@ -130,7 +133,15 @@
1591.28 <build-prerequisite/>
1591.29 <compile-dependency/>
1591.30 <run-dependency>
1591.31 - <specification-version>6.8</specification-version>
1591.32 + <specification-version>8.0</specification-version>
1591.33 + </run-dependency>
1591.34 + </dependency>
1591.35 + <dependency>
1591.36 + <code-name-base>org.openide.util.lookup</code-name-base>
1591.37 + <build-prerequisite/>
1591.38 + <compile-dependency/>
1591.39 + <run-dependency>
1591.40 + <specification-version>8.0</specification-version>
1591.41 </run-dependency>
1591.42 </dependency>
1591.43 </module-dependencies>
1591.44 @@ -138,6 +149,15 @@
1591.45 <test-type>
1591.46 <name>unit</name>
1591.47 <test-dependency>
1591.48 + <code-name-base>org.netbeans.libs.junit4</code-name-base>
1591.49 + <compile-dependency/>
1591.50 + </test-dependency>
1591.51 + <test-dependency>
1591.52 + <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
1591.53 + <recursive/>
1591.54 + <compile-dependency/>
1591.55 + </test-dependency>
1591.56 + <test-dependency>
1591.57 <code-name-base>org.openide.util</code-name-base>
1591.58 <compile-dependency/>
1591.59 <test/>
1592.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1592.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1592.3 @@ -1,6 +1,9 @@
1592.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1592.5 #
1592.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1592.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1592.8 +#
1592.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1592.10 +# Other names may be trademarks of their respective owners.
1592.11 #
1592.12 # The contents of this file are subject to the terms of either the GNU
1592.13 # General Public License Version 2 only ("GPL") or the Common
1592.14 @@ -12,9 +15,9 @@
1592.15 # specific language governing permissions and limitations under the
1592.16 # License. When distributing the software, include this License Header
1592.17 # Notice in each file and include the License file at
1592.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1592.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1592.20 # particular file as subject to the "Classpath" exception as provided
1592.21 -# by Sun in the GPL Version 2 section of the License file that
1592.22 +# by Oracle in the GPL Version 2 section of the License file that
1592.23 # accompanied this code. If applicable, add the following below the
1592.24 # License Header, with the fields enclosed by brackets [] replaced by
1592.25 # your own identifying information:
1593.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1593.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1593.3 @@ -1,7 +1,10 @@
1593.4 #
1593.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1593.6 #
1593.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1593.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1593.9 +#
1593.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1593.11 +# Other names may be trademarks of their respective owners.
1593.12 #
1593.13 # The contents of this file are subject to the terms of either the GNU
1593.14 # General Public License Version 2 only ("GPL") or the Common
1593.15 @@ -13,9 +16,9 @@
1593.16 # specific language governing permissions and limitations under the
1593.17 # License. When distributing the software, include this License Header
1593.18 # Notice in each file and include the License file at
1593.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1593.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1593.21 # particular file as subject to the "Classpath" exception as provided
1593.22 -# by Sun in the GPL Version 2 section of the License file that
1593.23 +# by Oracle in the GPL Version 2 section of the License file that
1593.24 # accompanied this code. If applicable, add the following below the
1593.25 # License Header, with the fields enclosed by brackets [] replaced by
1593.26 # your own identifying information:
1594.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/FacesContainer.java Fri Jul 16 11:47:36 2010 -0400
1594.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/FacesContainer.java Fri Jul 16 14:21:50 2010 -0400
1594.3 @@ -1,7 +1,10 @@
1594.4 /*
1594.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1594.6 *
1594.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1594.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1594.9 + *
1594.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1594.11 + * Other names may be trademarks of their respective owners.
1594.12 *
1594.13 * The contents of this file are subject to the terms of either the GNU
1594.14 * General Public License Version 2 only ("GPL") or the Common
1594.15 @@ -13,9 +16,9 @@
1594.16 * specific language governing permissions and limitations under the
1594.17 * License. When distributing the software, include this License Header
1594.18 * Notice in each file and include the License file at
1594.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1594.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1594.21 * particular file as subject to the "Classpath" exception as provided
1594.22 - * by Sun in the GPL Version 2 section of the License file that
1594.23 + * by Oracle in the GPL Version 2 section of the License file that
1594.24 * accompanied this code. If applicable, add the following below the
1594.25 * License Header, with the fields enclosed by brackets [] replaced by
1594.26 * your own identifying information:
1595.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/JsfTagSupportException.java Fri Jul 16 11:47:36 2010 -0400
1595.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/JsfTagSupportException.java Fri Jul 16 14:21:50 2010 -0400
1595.3 @@ -1,8 +1,11 @@
1595.4 /*
1595.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1595.6 - *
1595.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1595.8 - *
1595.9 + *
1595.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1595.11 + *
1595.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1595.13 + * Other names may be trademarks of their respective owners.
1595.14 + *
1595.15 * The contents of this file are subject to the terms of either the GNU
1595.16 * General Public License Version 2 only ("GPL") or the Common
1595.17 * Development and Distribution License("CDDL") (collectively, the
1595.18 @@ -13,9 +16,9 @@
1595.19 * specific language governing permissions and limitations under the
1595.20 * License. When distributing the software, include this License Header
1595.21 * Notice in each file and include the License file at
1595.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1595.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1595.24 * particular file as subject to the "Classpath" exception as provided
1595.25 - * by Sun in the GPL Version 2 section of the License file that
1595.26 + * by Oracle in the GPL Version 2 section of the License file that
1595.27 * accompanied this code. If applicable, add the following below the
1595.28 * License Header, with the fields enclosed by brackets [] replaced by
1595.29 * your own identifying information:
1596.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/PrettyJspWriter.java Fri Jul 16 11:47:36 2010 -0400
1596.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/PrettyJspWriter.java Fri Jul 16 14:21:50 2010 -0400
1596.3 @@ -1,7 +1,10 @@
1596.4 /*
1596.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1596.6 *
1596.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1596.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1596.9 + *
1596.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1596.11 + * Other names may be trademarks of their respective owners.
1596.12 *
1596.13 * The contents of this file are subject to the terms of either the GNU
1596.14 * General Public License Version 2 only ("GPL") or the Common
1596.15 @@ -13,9 +16,9 @@
1596.16 * specific language governing permissions and limitations under the
1596.17 * License. When distributing the software, include this License Header
1596.18 * Notice in each file and include the License file at
1596.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1596.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1596.21 * particular file as subject to the "Classpath" exception as provided
1596.22 - * by Sun in the GPL Version 2 section of the License file that
1596.23 + * by Oracle in the GPL Version 2 section of the License file that
1596.24 * accompanied this code. If applicable, add the following below the
1596.25 * License Header, with the fields enclosed by brackets [] replaced by
1596.26 * your own identifying information:
1597.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveConfigureListener.java Fri Jul 16 11:47:36 2010 -0400
1597.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveConfigureListener.java Fri Jul 16 14:21:50 2010 -0400
1597.3 @@ -1,7 +1,10 @@
1597.4 /*
1597.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1597.6 *
1597.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1597.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1597.9 + *
1597.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1597.11 + * Other names may be trademarks of their respective owners.
1597.12 *
1597.13 * The contents of this file are subject to the terms of either the GNU
1597.14 * General Public License Version 2 only ("GPL") or the Common
1597.15 @@ -13,9 +16,9 @@
1597.16 * specific language governing permissions and limitations under the
1597.17 * License. When distributing the software, include this License Header
1597.18 * Notice in each file and include the License file at
1597.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1597.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1597.21 * particular file as subject to the "Classpath" exception as provided
1597.22 - * by Sun in the GPL Version 2 section of the License file that
1597.23 + * by Oracle in the GPL Version 2 section of the License file that
1597.24 * accompanied this code. If applicable, add the following below the
1597.25 * License Header, with the fields enclosed by brackets [] replaced by
1597.26 * your own identifying information:
1598.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveExternalContext.java Fri Jul 16 11:47:36 2010 -0400
1598.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveExternalContext.java Fri Jul 16 14:21:50 2010 -0400
1598.3 @@ -1,7 +1,10 @@
1598.4 /*
1598.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1598.6 *
1598.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1598.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1598.9 + *
1598.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1598.11 + * Other names may be trademarks of their respective owners.
1598.12 *
1598.13 * The contents of this file are subject to the terms of either the GNU
1598.14 * General Public License Version 2 only ("GPL") or the Common
1598.15 @@ -13,9 +16,9 @@
1598.16 * specific language governing permissions and limitations under the
1598.17 * License. When distributing the software, include this License Header
1598.18 * Notice in each file and include the License file at
1598.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1598.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1598.21 * particular file as subject to the "Classpath" exception as provided
1598.22 - * by Sun in the GPL Version 2 section of the License file that
1598.23 + * by Oracle in the GPL Version 2 section of the License file that
1598.24 * accompanied this code. If applicable, add the following below the
1598.25 * License Header, with the fields enclosed by brackets [] replaced by
1598.26 * your own identifying information:
1598.27 @@ -45,6 +48,7 @@
1598.28 import java.net.MalformedURLException;
1598.29 import java.net.URL;
1598.30 import java.security.Principal;
1598.31 +import java.util.Collection;
1598.32 import java.util.Enumeration;
1598.33 import java.util.HashMap;
1598.34 import java.util.Iterator;
1598.35 @@ -53,9 +57,16 @@
1598.36 import java.util.Set;
1598.37 import javax.faces.context.ExternalContext;
1598.38 //import javax.portlet.PortletContext;
1598.39 +import javax.servlet.AsyncContext;
1598.40 +import javax.servlet.DispatcherType;
1598.41 import javax.servlet.ServletContext;
1598.42 +import javax.servlet.ServletException;
1598.43 +import javax.servlet.ServletRequest;
1598.44 +import javax.servlet.ServletResponse;
1598.45 import javax.servlet.http.HttpServletRequest;
1598.46 +import javax.servlet.http.HttpServletResponse;
1598.47 import javax.servlet.http.HttpSession;
1598.48 +import javax.servlet.http.Part;
1598.49 import org.openide.util.Enumerations;
1598.50
1598.51 /**
1598.52 @@ -426,6 +437,54 @@
1598.53
1598.54 public void setCharacterEncoding(String str) throws java.io.UnsupportedEncodingException {
1598.55 }
1598.56 + @Override
1598.57 + public boolean authenticate(HttpServletResponse hsr) throws IOException, ServletException {
1598.58 + throw new UnsupportedOperationException("Not supported yet.");
1598.59 + }
1598.60 + @Override
1598.61 + public void login(String string, String string1) throws ServletException {
1598.62 + throw new UnsupportedOperationException("Not supported yet.");
1598.63 + }
1598.64 + @Override
1598.65 + public void logout() throws ServletException {
1598.66 + throw new UnsupportedOperationException("Not supported yet.");
1598.67 + }
1598.68 + @Override
1598.69 + public Collection<Part> getParts() throws IOException, ServletException {
1598.70 + throw new UnsupportedOperationException("Not supported yet.");
1598.71 + }
1598.72 + @Override
1598.73 + public Part getPart(String string) throws IOException, ServletException {
1598.74 + throw new UnsupportedOperationException("Not supported yet.");
1598.75 + }
1598.76 + @Override
1598.77 + public ServletContext getServletContext() {
1598.78 + throw new UnsupportedOperationException("Not supported yet.");
1598.79 + }
1598.80 + @Override
1598.81 + public AsyncContext startAsync() throws IllegalStateException {
1598.82 + throw new UnsupportedOperationException("Not supported yet.");
1598.83 + }
1598.84 + @Override
1598.85 + public AsyncContext startAsync(ServletRequest sr, ServletResponse sr1) throws IllegalStateException {
1598.86 + throw new UnsupportedOperationException("Not supported yet.");
1598.87 + }
1598.88 + @Override
1598.89 + public boolean isAsyncStarted() {
1598.90 + throw new UnsupportedOperationException("Not supported yet.");
1598.91 + }
1598.92 + @Override
1598.93 + public boolean isAsyncSupported() {
1598.94 + throw new UnsupportedOperationException("Not supported yet.");
1598.95 + }
1598.96 + @Override
1598.97 + public AsyncContext getAsyncContext() {
1598.98 + throw new UnsupportedOperationException("Not supported yet.");
1598.99 + }
1598.100 + @Override
1598.101 + public DispatcherType getDispatcherType() {
1598.102 + throw new UnsupportedOperationException("Not supported yet.");
1598.103 + }
1598.104 };
1598.105
1598.106 /**
1599.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveFacesContext.java Fri Jul 16 11:47:36 2010 -0400
1599.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveFacesContext.java Fri Jul 16 14:21:50 2010 -0400
1599.3 @@ -1,7 +1,10 @@
1599.4 /*
1599.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1599.6 *
1599.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1599.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1599.9 + *
1599.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1599.11 + * Other names may be trademarks of their respective owners.
1599.12 *
1599.13 * The contents of this file are subject to the terms of either the GNU
1599.14 * General Public License Version 2 only ("GPL") or the Common
1599.15 @@ -13,9 +16,9 @@
1599.16 * specific language governing permissions and limitations under the
1599.17 * License. When distributing the software, include this License Header
1599.18 * Notice in each file and include the License file at
1599.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1599.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1599.21 * particular file as subject to the "Classpath" exception as provided
1599.22 - * by Sun in the GPL Version 2 section of the License file that
1599.23 + * by Oracle in the GPL Version 2 section of the License file that
1599.24 * accompanied this code. If applicable, add the following below the
1599.25 * License Header, with the fields enclosed by brackets [] replaced by
1599.26 * your own identifying information:
1600.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RavePortletContext.java Fri Jul 16 11:47:36 2010 -0400
1600.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RavePortletContext.java Fri Jul 16 14:21:50 2010 -0400
1600.3 @@ -1,7 +1,10 @@
1600.4 /*
1600.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1600.6 *
1600.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1600.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1600.9 + *
1600.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1600.11 + * Other names may be trademarks of their respective owners.
1600.12 *
1600.13 * The contents of this file are subject to the terms of either the GNU
1600.14 * General Public License Version 2 only ("GPL") or the Common
1600.15 @@ -13,9 +16,9 @@
1600.16 * specific language governing permissions and limitations under the
1600.17 * License. When distributing the software, include this License Header
1600.18 * Notice in each file and include the License file at
1600.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1600.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1600.21 * particular file as subject to the "Classpath" exception as provided
1600.22 - * by Sun in the GPL Version 2 section of the License file that
1600.23 + * by Oracle in the GPL Version 2 section of the License file that
1600.24 * accompanied this code. If applicable, add the following below the
1600.25 * License Header, with the fields enclosed by brackets [] replaced by
1600.26 * your own identifying information:
1601.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveServlet.java Fri Jul 16 11:47:36 2010 -0400
1601.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveServlet.java Fri Jul 16 14:21:50 2010 -0400
1601.3 @@ -1,7 +1,10 @@
1601.4 /*
1601.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1601.6 *
1601.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1601.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1601.9 + *
1601.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1601.11 + * Other names may be trademarks of their respective owners.
1601.12 *
1601.13 * The contents of this file are subject to the terms of either the GNU
1601.14 * General Public License Version 2 only ("GPL") or the Common
1601.15 @@ -13,9 +16,9 @@
1601.16 * specific language governing permissions and limitations under the
1601.17 * License. When distributing the software, include this License Header
1601.18 * Notice in each file and include the License file at
1601.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1601.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1601.21 * particular file as subject to the "Classpath" exception as provided
1601.22 - * by Sun in the GPL Version 2 section of the License file that
1601.23 + * by Oracle in the GPL Version 2 section of the License file that
1601.24 * accompanied this code. If applicable, add the following below the
1601.25 * License Header, with the fields enclosed by brackets [] replaced by
1601.26 * your own identifying information:
1602.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveServletConfig.java Fri Jul 16 11:47:36 2010 -0400
1602.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveServletConfig.java Fri Jul 16 14:21:50 2010 -0400
1602.3 @@ -1,7 +1,10 @@
1602.4 /*
1602.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1602.6 *
1602.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1602.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1602.9 + *
1602.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1602.11 + * Other names may be trademarks of their respective owners.
1602.12 *
1602.13 * The contents of this file are subject to the terms of either the GNU
1602.14 * General Public License Version 2 only ("GPL") or the Common
1602.15 @@ -13,9 +16,9 @@
1602.16 * specific language governing permissions and limitations under the
1602.17 * License. When distributing the software, include this License Header
1602.18 * Notice in each file and include the License file at
1602.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1602.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1602.21 * particular file as subject to the "Classpath" exception as provided
1602.22 - * by Sun in the GPL Version 2 section of the License file that
1602.23 + * by Oracle in the GPL Version 2 section of the License file that
1602.24 * accompanied this code. If applicable, add the following below the
1602.25 * License Header, with the fields enclosed by brackets [] replaced by
1602.26 * your own identifying information:
1603.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveServletContext.java Fri Jul 16 11:47:36 2010 -0400
1603.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveServletContext.java Fri Jul 16 14:21:50 2010 -0400
1603.3 @@ -1,7 +1,10 @@
1603.4 /*
1603.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1603.6 *
1603.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1603.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1603.9 + *
1603.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1603.11 + * Other names may be trademarks of their respective owners.
1603.12 *
1603.13 * The contents of this file are subject to the terms of either the GNU
1603.14 * General Public License Version 2 only ("GPL") or the Common
1603.15 @@ -13,9 +16,9 @@
1603.16 * specific language governing permissions and limitations under the
1603.17 * License. When distributing the software, include this License Header
1603.18 * Notice in each file and include the License file at
1603.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1603.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1603.21 * particular file as subject to the "Classpath" exception as provided
1603.22 - * by Sun in the GPL Version 2 section of the License file that
1603.23 + * by Oracle in the GPL Version 2 section of the License file that
1603.24 * accompanied this code. If applicable, add the following below the
1603.25 * License Header, with the fields enclosed by brackets [] replaced by
1603.26 * your own identifying information:
1603.27 @@ -45,13 +48,22 @@
1603.28 import java.net.MalformedURLException;
1603.29 import java.net.URL;
1603.30 import java.util.Enumeration;
1603.31 +import java.util.EventListener;
1603.32 import java.util.Hashtable;
1603.33 +import java.util.Map;
1603.34 import java.util.Set;
1603.35 +import javax.servlet.Filter;
1603.36 +import javax.servlet.FilterRegistration;
1603.37
1603.38 import javax.servlet.RequestDispatcher;
1603.39 import javax.servlet.Servlet;
1603.40 import javax.servlet.ServletContext;
1603.41 import javax.servlet.ServletException;
1603.42 +import javax.servlet.ServletRegistration;
1603.43 +import javax.servlet.ServletRegistration.Dynamic;
1603.44 +import javax.servlet.SessionCookieConfig;
1603.45 +import javax.servlet.SessionTrackingMode;
1603.46 +import javax.servlet.descriptor.JspConfigDescriptor;
1603.47
1603.48 import org.openide.modules.InstalledFileLocator;
1603.49
1603.50 @@ -377,4 +389,108 @@
1603.51 public String getContextPath() {
1603.52 return "";
1603.53 }
1603.54 + @Override
1603.55 + public int getEffectiveMajorVersion() {
1603.56 + throw new UnsupportedOperationException("Not supported yet.");
1603.57 + }
1603.58 + @Override
1603.59 + public int getEffectiveMinorVersion() {
1603.60 + throw new UnsupportedOperationException("Not supported yet.");
1603.61 + }
1603.62 + @Override
1603.63 + public boolean setInitParameter(String string, String string1) {
1603.64 + throw new UnsupportedOperationException("Not supported yet.");
1603.65 + }
1603.66 + @Override
1603.67 + public Dynamic addServlet(String string, String string1) {
1603.68 + throw new UnsupportedOperationException("Not supported yet.");
1603.69 + }
1603.70 + @Override
1603.71 + public Dynamic addServlet(String string, Servlet srvlt) {
1603.72 + throw new UnsupportedOperationException("Not supported yet.");
1603.73 + }
1603.74 + @Override
1603.75 + public Dynamic addServlet(String string, Class<? extends Servlet> type) {
1603.76 + throw new UnsupportedOperationException("Not supported yet.");
1603.77 + }
1603.78 + @Override
1603.79 + public <T extends Servlet> T createServlet(Class<T> type) throws ServletException {
1603.80 + throw new UnsupportedOperationException("Not supported yet.");
1603.81 + }
1603.82 + @Override
1603.83 + public ServletRegistration getServletRegistration(String string) {
1603.84 + throw new UnsupportedOperationException("Not supported yet.");
1603.85 + }
1603.86 + @Override
1603.87 + public Map<String, ? extends ServletRegistration> getServletRegistrations() {
1603.88 + throw new UnsupportedOperationException("Not supported yet.");
1603.89 + }
1603.90 + @Override
1603.91 + public FilterRegistration.Dynamic addFilter(String string, String string1) {
1603.92 + throw new UnsupportedOperationException("Not supported yet.");
1603.93 + }
1603.94 + @Override
1603.95 + public FilterRegistration.Dynamic addFilter(String string, Filter filter) {
1603.96 + throw new UnsupportedOperationException("Not supported yet.");
1603.97 + }
1603.98 + @Override
1603.99 + public FilterRegistration.Dynamic addFilter(String string, Class<? extends Filter> type) {
1603.100 + throw new UnsupportedOperationException("Not supported yet.");
1603.101 + }
1603.102 + @Override
1603.103 + public <T extends Filter> T createFilter(Class<T> type) throws ServletException {
1603.104 + throw new UnsupportedOperationException("Not supported yet.");
1603.105 + }
1603.106 + @Override
1603.107 + public FilterRegistration getFilterRegistration(String string) {
1603.108 + throw new UnsupportedOperationException("Not supported yet.");
1603.109 + }
1603.110 + @Override
1603.111 + public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
1603.112 + throw new UnsupportedOperationException("Not supported yet.");
1603.113 + }
1603.114 + @Override
1603.115 + public SessionCookieConfig getSessionCookieConfig() {
1603.116 + throw new UnsupportedOperationException("Not supported yet.");
1603.117 + }
1603.118 + @Override
1603.119 + public void setSessionTrackingModes(Set<SessionTrackingMode> set) {
1603.120 + throw new UnsupportedOperationException("Not supported yet.");
1603.121 + }
1603.122 + @Override
1603.123 + public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
1603.124 + throw new UnsupportedOperationException("Not supported yet.");
1603.125 + }
1603.126 + @Override
1603.127 + public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
1603.128 + throw new UnsupportedOperationException("Not supported yet.");
1603.129 + }
1603.130 + @Override
1603.131 + public void addListener(String string) {
1603.132 + throw new UnsupportedOperationException("Not supported yet.");
1603.133 + }
1603.134 + @Override
1603.135 + public <T extends EventListener> void addListener(T t) {
1603.136 + throw new UnsupportedOperationException("Not supported yet.");
1603.137 + }
1603.138 + @Override
1603.139 + public void addListener(Class<? extends EventListener> type) {
1603.140 + throw new UnsupportedOperationException("Not supported yet.");
1603.141 + }
1603.142 + @Override
1603.143 + public <T extends EventListener> T createListener(Class<T> type) throws ServletException {
1603.144 + throw new UnsupportedOperationException("Not supported yet.");
1603.145 + }
1603.146 + @Override
1603.147 + public JspConfigDescriptor getJspConfigDescriptor() {
1603.148 + throw new UnsupportedOperationException("Not supported yet.");
1603.149 + }
1603.150 + @Override
1603.151 + public ClassLoader getClassLoader() {
1603.152 + throw new UnsupportedOperationException("Not supported yet.");
1603.153 + }
1603.154 + @Override
1603.155 + public void declareRoles(String... strings) {
1603.156 + throw new UnsupportedOperationException("Not supported yet.");
1603.157 + }
1603.158 }
1604.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/ResettableStringWriter.java Fri Jul 16 11:47:36 2010 -0400
1604.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/ResettableStringWriter.java Fri Jul 16 14:21:50 2010 -0400
1604.3 @@ -1,7 +1,10 @@
1604.4 /*
1604.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1604.6 *
1604.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1604.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1604.9 + *
1604.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1604.11 + * Other names may be trademarks of their respective owners.
1604.12 *
1604.13 * The contents of this file are subject to the terms of either the GNU
1604.14 * General Public License Version 2 only ("GPL") or the Common
1604.15 @@ -13,9 +16,9 @@
1604.16 * specific language governing permissions and limitations under the
1604.17 * License. When distributing the software, include this License Header
1604.18 * Notice in each file and include the License file at
1604.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1604.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1604.21 * particular file as subject to the "Classpath" exception as provided
1604.22 - * by Sun in the GPL Version 2 section of the License file that
1604.23 + * by Oracle in the GPL Version 2 section of the License file that
1604.24 * accompanied this code. If applicable, add the following below the
1604.25 * License Header, with the fields enclosed by brackets [] replaced by
1604.26 * your own identifying information:
1605.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/ResultSetPropertyResolver.java Fri Jul 16 11:47:36 2010 -0400
1605.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/ResultSetPropertyResolver.java Fri Jul 16 14:21:50 2010 -0400
1605.3 @@ -1,7 +1,10 @@
1605.4 /*
1605.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1605.6 *
1605.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1605.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1605.9 + *
1605.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1605.11 + * Other names may be trademarks of their respective owners.
1605.12 *
1605.13 * The contents of this file are subject to the terms of either the GNU
1605.14 * General Public License Version 2 only ("GPL") or the Common
1605.15 @@ -13,9 +16,9 @@
1605.16 * specific language governing permissions and limitations under the
1605.17 * License. When distributing the software, include this License Header
1605.18 * Notice in each file and include the License file at
1605.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1605.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1605.21 * particular file as subject to the "Classpath" exception as provided
1605.22 - * by Sun in the GPL Version 2 section of the License file that
1605.23 + * by Oracle in the GPL Version 2 section of the License file that
1605.24 * accompanied this code. If applicable, add the following below the
1605.25 * License Header, with the fields enclosed by brackets [] replaced by
1605.26 * your own identifying information:
1606.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/WEB-INF/web.xml Fri Jul 16 11:47:36 2010 -0400
1606.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/WEB-INF/web.xml Fri Jul 16 14:21:50 2010 -0400
1606.3 @@ -2,7 +2,10 @@
1606.4 <!--
1606.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1606.6
1606.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1606.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1606.9 +
1606.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1606.11 +Other names may be trademarks of their respective owners.
1606.12
1606.13
1606.14 The contents of this file are subject to the terms of either the GNU
1606.15 @@ -15,9 +18,9 @@
1606.16 specific language governing permissions and limitations under the
1606.17 License. When distributing the software, include this License Header
1606.18 Notice in each file and include the License file at
1606.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1606.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1606.21 particular file as subject to the "Classpath" exception as provided
1606.22 -by Sun in the GPL Version 2 section of the License file that
1606.23 +by Oracle in the GPL Version 2 section of the License file that
1606.24 accompanied this code. If applicable, add the following below the
1606.25 License Header, with the fields enclosed by brackets [] replaced by
1606.26 your own identifying information:
1607.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/render/RaveRenderKit.java Fri Jul 16 11:47:36 2010 -0400
1607.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/render/RaveRenderKit.java Fri Jul 16 14:21:50 2010 -0400
1607.3 @@ -1,7 +1,10 @@
1607.4 /*
1607.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1607.6 *
1607.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1607.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1607.9 + *
1607.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1607.11 + * Other names may be trademarks of their respective owners.
1607.12 *
1607.13 * The contents of this file are subject to the terms of either the GNU
1607.14 * General Public License Version 2 only ("GPL") or the Common
1607.15 @@ -13,9 +16,9 @@
1607.16 * specific language governing permissions and limitations under the
1607.17 * License. When distributing the software, include this License Header
1607.18 * Notice in each file and include the License file at
1607.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1607.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1607.21 * particular file as subject to the "Classpath" exception as provided
1607.22 - * by Sun in the GPL Version 2 section of the License file that
1607.23 + * by Oracle in the GPL Version 2 section of the License file that
1607.24 * accompanied this code. If applicable, add the following below the
1607.25 * License Header, with the fields enclosed by brackets [] replaced by
1607.26 * your own identifying information:
1608.1 --- a/visualweb.jsfsupport/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/container/FacesConatainerTest.java Fri Jul 16 11:47:36 2010 -0400
1608.2 +++ b/visualweb.jsfsupport/test/unit/src/org/netbeans/modules/visualweb/jsfsupport/container/FacesConatainerTest.java Fri Jul 16 14:21:50 2010 -0400
1608.3 @@ -2,9 +2,12 @@
1608.4
1608.5 /*
1608.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1608.7 - *
1608.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1608.9 - *
1608.10 + *
1608.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1608.12 + *
1608.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1608.14 + * Other names may be trademarks of their respective owners.
1608.15 + *
1608.16 * The contents of this file are subject to the terms of either the GNU
1608.17 * General Public License Version 2 only ("GPL") or the Common
1608.18 * Development and Distribution License("CDDL") (collectively, the
1608.19 @@ -15,9 +18,9 @@
1608.20 * specific language governing permissions and limitations under the
1608.21 * License. When distributing the software, include this License Header
1608.22 * Notice in each file and include the License file at
1608.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1608.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1608.25 * particular file as subject to the "Classpath" exception as provided
1608.26 - * by Sun in the GPL Version 2 section of the License file that
1608.27 + * by Oracle in the GPL Version 2 section of the License file that
1608.28 * accompanied this code. If applicable, add the following below the
1608.29 * License Header, with the fields enclosed by brackets [] replaced by
1608.30 * your own identifying information:
1609.1 --- a/visualweb.kit/build.xml Fri Jul 16 11:47:36 2010 -0400
1609.2 +++ b/visualweb.kit/build.xml Fri Jul 16 14:21:50 2010 -0400
1609.3 @@ -2,7 +2,10 @@
1609.4 <!--
1609.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1609.6
1609.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1609.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1609.9 +
1609.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1609.11 +Other names may be trademarks of their respective owners.
1609.12
1609.13
1609.14 The contents of this file are subject to the terms of either the GNU
1609.15 @@ -15,9 +18,9 @@
1609.16 specific language governing permissions and limitations under the
1609.17 License. When distributing the software, include this License Header
1609.18 Notice in each file and include the License file at
1609.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1609.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1609.21 particular file as subject to the "Classpath" exception as provided
1609.22 -by Sun in the GPL Version 2 section of the License file that
1609.23 +by Oracle in the GPL Version 2 section of the License file that
1609.24 accompanied this code. If applicable, add the following below the
1609.25 License Header, with the fields enclosed by brackets [] replaced by
1609.26 your own identifying information:
1610.1 --- a/visualweb.kit/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1610.2 +++ b/visualweb.kit/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1610.3 @@ -1,6 +1,9 @@
1610.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1610.5 #
1610.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1610.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1610.8 +#
1610.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1610.10 +# Other names may be trademarks of their respective owners.
1610.11 #
1610.12 # The contents of this file are subject to the terms of either the GNU
1610.13 # General Public License Version 2 only ("GPL") or the Common
1610.14 @@ -12,9 +15,9 @@
1610.15 # specific language governing permissions and limitations under the
1610.16 # License. When distributing the software, include this License Header
1610.17 # Notice in each file and include the License file at
1610.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1610.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1610.20 # particular file as subject to the "Classpath" exception as provided
1610.21 -# by Sun in the GPL Version 2 section of the License file that
1610.22 +# by Oracle in the GPL Version 2 section of the License file that
1610.23 # accompanied this code. If applicable, add the following below the
1610.24 # License Header, with the fields enclosed by brackets [] replaced by
1610.25 # your own identifying information:
1610.26 @@ -38,7 +41,7 @@
1610.27 # made subject to such option by the copyright holder.
1610.28
1610.29 javac.compilerargs=-Xlint -Xlint:-serial
1610.30 -javac.source=1.5
1610.31 +javac.source=1.6
1610.32 test.qa-functional.extra.clusters=nb.cluster.testlibs
1610.33 test.qa-functional.cp.extra=\
1610.34 ${visualweb.kit.dir}/modules/ext/tidy-mod.jar:\
1611.1 --- a/visualweb.kit/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1611.2 +++ b/visualweb.kit/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1611.3 @@ -2,7 +2,10 @@
1611.4 <!--
1611.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1611.6
1611.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1611.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1611.9 +
1611.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1611.11 +Other names may be trademarks of their respective owners.
1611.12
1611.13
1611.14 The contents of this file are subject to the terms of either the GNU
1611.15 @@ -15,9 +18,9 @@
1611.16 specific language governing permissions and limitations under the
1611.17 License. When distributing the software, include this License Header
1611.18 Notice in each file and include the License file at
1611.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1611.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1611.21 particular file as subject to the "Classpath" exception as provided
1611.22 -by Sun in the GPL Version 2 section of the License file that
1611.23 +by Oracle in the GPL Version 2 section of the License file that
1611.24 accompanied this code. If applicable, add the following below the
1611.25 License Header, with the fields enclosed by brackets [] replaced by
1611.26 your own identifying information:
1612.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1612.2 +++ b/visualweb.kit/release/VERSION.txt Fri Jul 16 14:21:50 2010 -0400
1612.3 @@ -0,0 +1,2 @@
1612.4 +# cluster incompatible release version
1612.5 +3
1613.1 --- a/visualweb.kit/src/org/netbeans/modules/visualweb/kit/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1613.2 +++ b/visualweb.kit/src/org/netbeans/modules/visualweb/kit/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1613.3 @@ -1,6 +1,9 @@
1613.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1613.5 #
1613.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1613.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1613.8 +#
1613.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1613.10 +# Other names may be trademarks of their respective owners.
1613.11 #
1613.12 # The contents of this file are subject to the terms of either the GNU
1613.13 # General Public License Version 2 only ("GPL") or the Common
1613.14 @@ -12,9 +15,9 @@
1613.15 # specific language governing permissions and limitations under the
1613.16 # License. When distributing the software, include this License Header
1613.17 # Notice in each file and include the License file at
1613.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1613.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1613.20 # particular file as subject to the "Classpath" exception as provided
1613.21 -# by Sun in the GPL Version 2 section of the License file that
1613.22 +# by Oracle in the GPL Version 2 section of the License file that
1613.23 # accompanied this code. If applicable, add the following below the
1613.24 # License Header, with the fields enclosed by brackets [] replaced by
1613.25 # your own identifying information:
1614.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/generic/DeploymentAcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
1614.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/generic/DeploymentAcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
1614.3 @@ -1,7 +1,10 @@
1614.4 /*
1614.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1614.6 *
1614.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1614.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1614.9 + *
1614.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1614.11 + * Other names may be trademarks of their respective owners.
1614.12 *
1614.13 * The contents of this file are subject to the terms of either the GNU
1614.14 * General Public License Version 2 only ("GPL") or the Common
1614.15 @@ -13,9 +16,9 @@
1614.16 * specific language governing permissions and limitations under the
1614.17 * License. When distributing the software, include this License Header
1614.18 * Notice in each file and include the License file at
1614.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1614.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1614.21 * particular file as subject to the "Classpath" exception as provided
1614.22 - * by Sun in the GPL Version 2 section of the License file that
1614.23 + * by Oracle in the GPL Version 2 section of the License file that
1614.24 * accompanied this code. If applicable, add the following below the
1614.25 * License Header, with the fields enclosed by brackets [] replaced by
1614.26 * your own identifying information:
1615.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/generic/DeploymentTest.java Fri Jul 16 11:47:36 2010 -0400
1615.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/generic/DeploymentTest.java Fri Jul 16 14:21:50 2010 -0400
1615.3 @@ -1,7 +1,10 @@
1615.4 /*
1615.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1615.6 *
1615.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1615.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1615.9 + *
1615.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1615.11 + * Other names may be trademarks of their respective owners.
1615.12 *
1615.13 * The contents of this file are subject to the terms of either the GNU
1615.14 * General Public License Version 2 only ("GPL") or the Common
1615.15 @@ -13,9 +16,9 @@
1615.16 * specific language governing permissions and limitations under the
1615.17 * License. When distributing the software, include this License Header
1615.18 * Notice in each file and include the License file at
1615.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1615.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1615.21 * particular file as subject to the "Classpath" exception as provided
1615.22 - * by Sun in the GPL Version 2 section of the License file that
1615.23 + * by Oracle in the GPL Version 2 section of the License file that
1615.24 * accompanied this code. If applicable, add the following below the
1615.25 * License Header, with the fields enclosed by brackets [] replaced by
1615.26 * your own identifying information:
1616.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/generic/OtherDeploymentTest.java Fri Jul 16 11:47:36 2010 -0400
1616.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/generic/OtherDeploymentTest.java Fri Jul 16 14:21:50 2010 -0400
1616.3 @@ -1,7 +1,10 @@
1616.4 /*
1616.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1616.6 *
1616.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1616.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1616.9 + *
1616.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1616.11 + * Other names may be trademarks of their respective owners.
1616.12 *
1616.13 * The contents of this file are subject to the terms of either the GNU
1616.14 * General Public License Version 2 only ("GPL") or the Common
1616.15 @@ -13,9 +16,9 @@
1616.16 * specific language governing permissions and limitations under the
1616.17 * License. When distributing the software, include this License Header
1616.18 * Notice in each file and include the License file at
1616.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1616.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1616.21 * particular file as subject to the "Classpath" exception as provided
1616.22 - * by Sun in the GPL Version 2 section of the License file that
1616.23 + * by Oracle in the GPL Version 2 section of the License file that
1616.24 * accompanied this code. If applicable, add the following below the
1616.25 * License Header, with the fields enclosed by brackets [] replaced by
1616.26 * your own identifying information:
1617.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/generic/RestartTest.java Fri Jul 16 11:47:36 2010 -0400
1617.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/generic/RestartTest.java Fri Jul 16 14:21:50 2010 -0400
1617.3 @@ -1,7 +1,10 @@
1617.4 /*
1617.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1617.6 *
1617.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1617.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1617.9 + *
1617.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1617.11 + * Other names may be trademarks of their respective owners.
1617.12 *
1617.13 * The contents of this file are subject to the terms of either the GNU
1617.14 * General Public License Version 2 only ("GPL") or the Common
1617.15 @@ -13,9 +16,9 @@
1617.16 * specific language governing permissions and limitations under the
1617.17 * License. When distributing the software, include this License Header
1617.18 * Notice in each file and include the License file at
1617.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1617.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1617.21 * particular file as subject to the "Classpath" exception as provided
1617.22 - * by Sun in the GPL Version 2 section of the License file that
1617.23 + * by Oracle in the GPL Version 2 section of the License file that
1617.24 * accompanied this code. If applicable, add the following below the
1617.25 * License Header, with the fields enclosed by brackets [] replaced by
1617.26 * your own identifying information:
1618.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/glassfish/GlassFishAcceptanceTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1618.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/glassfish/GlassFishAcceptanceTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1618.3 @@ -1,7 +1,10 @@
1618.4 /*
1618.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1618.6 *
1618.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1618.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1618.9 + *
1618.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1618.11 + * Other names may be trademarks of their respective owners.
1618.12 *
1618.13 * The contents of this file are subject to the terms of either the GNU
1618.14 * General Public License Version 2 only ("GPL") or the Common
1618.15 @@ -13,9 +16,9 @@
1618.16 * specific language governing permissions and limitations under the
1618.17 * License. When distributing the software, include this License Header
1618.18 * Notice in each file and include the License file at
1618.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1618.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1618.21 * particular file as subject to the "Classpath" exception as provided
1618.22 - * by Sun in the GPL Version 2 section of the License file that
1618.23 + * by Oracle in the GPL Version 2 section of the License file that
1618.24 * accompanied this code. If applicable, add the following below the
1618.25 * License Header, with the fields enclosed by brackets [] replaced by
1618.26 * your own identifying information:
1619.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/glassfish/GlassFishOtherTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1619.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/glassfish/GlassFishOtherTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1619.3 @@ -1,7 +1,10 @@
1619.4 /*
1619.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1619.6 *
1619.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1619.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1619.9 + *
1619.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1619.11 + * Other names may be trademarks of their respective owners.
1619.12 *
1619.13 * The contents of this file are subject to the terms of either the GNU
1619.14 * General Public License Version 2 only ("GPL") or the Common
1619.15 @@ -13,9 +16,9 @@
1619.16 * specific language governing permissions and limitations under the
1619.17 * License. When distributing the software, include this License Header
1619.18 * Notice in each file and include the License file at
1619.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1619.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1619.21 * particular file as subject to the "Classpath" exception as provided
1619.22 - * by Sun in the GPL Version 2 section of the License file that
1619.23 + * by Oracle in the GPL Version 2 section of the License file that
1619.24 * accompanied this code. If applicable, add the following below the
1619.25 * License Header, with the fields enclosed by brackets [] replaced by
1619.26 * your own identifying information:
1620.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/glassfish/GlassFishRestartTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1620.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/glassfish/GlassFishRestartTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1620.3 @@ -1,7 +1,10 @@
1620.4 /*
1620.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1620.6 *
1620.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1620.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1620.9 + *
1620.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1620.11 + * Other names may be trademarks of their respective owners.
1620.12 *
1620.13 * The contents of this file are subject to the terms of either the GNU
1620.14 * General Public License Version 2 only ("GPL") or the Common
1620.15 @@ -13,9 +16,9 @@
1620.16 * specific language governing permissions and limitations under the
1620.17 * License. When distributing the software, include this License Header
1620.18 * Notice in each file and include the License file at
1620.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1620.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1620.21 * particular file as subject to the "Classpath" exception as provided
1620.22 - * by Sun in the GPL Version 2 section of the License file that
1620.23 + * by Oracle in the GPL Version 2 section of the License file that
1620.24 * accompanied this code. If applicable, add the following below the
1620.25 * License Header, with the fields enclosed by brackets [] replaced by
1620.26 * your own identifying information:
1621.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/glassfish/GlassFishTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1621.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/glassfish/GlassFishTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1621.3 @@ -1,7 +1,10 @@
1621.4 /*
1621.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1621.6 *
1621.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1621.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1621.9 + *
1621.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1621.11 + * Other names may be trademarks of their respective owners.
1621.12 *
1621.13 * The contents of this file are subject to the terms of either the GNU
1621.14 * General Public License Version 2 only ("GPL") or the Common
1621.15 @@ -13,9 +16,9 @@
1621.16 * specific language governing permissions and limitations under the
1621.17 * License. When distributing the software, include this License Header
1621.18 * Notice in each file and include the License file at
1621.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1621.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1621.21 * particular file as subject to the "Classpath" exception as provided
1621.22 - * by Sun in the GPL Version 2 section of the License file that
1621.23 + * by Oracle in the GPL Version 2 section of the License file that
1621.24 * accompanied this code. If applicable, add the following below the
1621.25 * License Header, with the fields enclosed by brackets [] replaced by
1621.26 * your own identifying information:
1622.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/jboss/JBossAcceptanceTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1622.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/jboss/JBossAcceptanceTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1622.3 @@ -1,7 +1,10 @@
1622.4 /*
1622.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1622.6 *
1622.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1622.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1622.9 + *
1622.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1622.11 + * Other names may be trademarks of their respective owners.
1622.12 *
1622.13 * The contents of this file are subject to the terms of either the GNU
1622.14 * General Public License Version 2 only ("GPL") or the Common
1622.15 @@ -13,9 +16,9 @@
1622.16 * specific language governing permissions and limitations under the
1622.17 * License. When distributing the software, include this License Header
1622.18 * Notice in each file and include the License file at
1622.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1622.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1622.21 * particular file as subject to the "Classpath" exception as provided
1622.22 - * by Sun in the GPL Version 2 section of the License file that
1622.23 + * by Oracle in the GPL Version 2 section of the License file that
1622.24 * accompanied this code. If applicable, add the following below the
1622.25 * License Header, with the fields enclosed by brackets [] replaced by
1622.26 * your own identifying information:
1623.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/jboss/JBossOtherTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1623.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/jboss/JBossOtherTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1623.3 @@ -1,7 +1,10 @@
1623.4 /*
1623.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1623.6 *
1623.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1623.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1623.9 + *
1623.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1623.11 + * Other names may be trademarks of their respective owners.
1623.12 *
1623.13 * The contents of this file are subject to the terms of either the GNU
1623.14 * General Public License Version 2 only ("GPL") or the Common
1623.15 @@ -13,9 +16,9 @@
1623.16 * specific language governing permissions and limitations under the
1623.17 * License. When distributing the software, include this License Header
1623.18 * Notice in each file and include the License file at
1623.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1623.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1623.21 * particular file as subject to the "Classpath" exception as provided
1623.22 - * by Sun in the GPL Version 2 section of the License file that
1623.23 + * by Oracle in the GPL Version 2 section of the License file that
1623.24 * accompanied this code. If applicable, add the following below the
1623.25 * License Header, with the fields enclosed by brackets [] replaced by
1623.26 * your own identifying information:
1624.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/jboss/JBossRestartTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1624.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/jboss/JBossRestartTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1624.3 @@ -1,7 +1,10 @@
1624.4 /*
1624.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1624.6 *
1624.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1624.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1624.9 + *
1624.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1624.11 + * Other names may be trademarks of their respective owners.
1624.12 *
1624.13 * The contents of this file are subject to the terms of either the GNU
1624.14 * General Public License Version 2 only ("GPL") or the Common
1624.15 @@ -13,9 +16,9 @@
1624.16 * specific language governing permissions and limitations under the
1624.17 * License. When distributing the software, include this License Header
1624.18 * Notice in each file and include the License file at
1624.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1624.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1624.21 * particular file as subject to the "Classpath" exception as provided
1624.22 - * by Sun in the GPL Version 2 section of the License file that
1624.23 + * by Oracle in the GPL Version 2 section of the License file that
1624.24 * accompanied this code. If applicable, add the following below the
1624.25 * License Header, with the fields enclosed by brackets [] replaced by
1624.26 * your own identifying information:
1625.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/jboss/JBossTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1625.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/jboss/JBossTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1625.3 @@ -1,7 +1,10 @@
1625.4 /*
1625.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1625.6 *
1625.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1625.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1625.9 + *
1625.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1625.11 + * Other names may be trademarks of their respective owners.
1625.12 *
1625.13 * The contents of this file are subject to the terms of either the GNU
1625.14 * General Public License Version 2 only ("GPL") or the Common
1625.15 @@ -13,9 +16,9 @@
1625.16 * specific language governing permissions and limitations under the
1625.17 * License. When distributing the software, include this License Header
1625.18 * Notice in each file and include the License file at
1625.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1625.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1625.21 * particular file as subject to the "Classpath" exception as provided
1625.22 - * by Sun in the GPL Version 2 section of the License file that
1625.23 + * by Oracle in the GPL Version 2 section of the License file that
1625.24 * accompanied this code. If applicable, add the following below the
1625.25 * License Header, with the fields enclosed by brackets [] replaced by
1625.26 * your own identifying information:
1626.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/tomcat/TomcatAcceptanceTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1626.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/tomcat/TomcatAcceptanceTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1626.3 @@ -1,7 +1,10 @@
1626.4 /*
1626.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1626.6 *
1626.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1626.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1626.9 + *
1626.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1626.11 + * Other names may be trademarks of their respective owners.
1626.12 *
1626.13 * The contents of this file are subject to the terms of either the GNU
1626.14 * General Public License Version 2 only ("GPL") or the Common
1626.15 @@ -13,9 +16,9 @@
1626.16 * specific language governing permissions and limitations under the
1626.17 * License. When distributing the software, include this License Header
1626.18 * Notice in each file and include the License file at
1626.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1626.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1626.21 * particular file as subject to the "Classpath" exception as provided
1626.22 - * by Sun in the GPL Version 2 section of the License file that
1626.23 + * by Oracle in the GPL Version 2 section of the License file that
1626.24 * accompanied this code. If applicable, add the following below the
1626.25 * License Header, with the fields enclosed by brackets [] replaced by
1626.26 * your own identifying information:
1627.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/tomcat/TomcatOtherTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1627.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/tomcat/TomcatOtherTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1627.3 @@ -1,7 +1,10 @@
1627.4 /*
1627.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1627.6 *
1627.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1627.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1627.9 + *
1627.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1627.11 + * Other names may be trademarks of their respective owners.
1627.12 *
1627.13 * The contents of this file are subject to the terms of either the GNU
1627.14 * General Public License Version 2 only ("GPL") or the Common
1627.15 @@ -13,9 +16,9 @@
1627.16 * specific language governing permissions and limitations under the
1627.17 * License. When distributing the software, include this License Header
1627.18 * Notice in each file and include the License file at
1627.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1627.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1627.21 * particular file as subject to the "Classpath" exception as provided
1627.22 - * by Sun in the GPL Version 2 section of the License file that
1627.23 + * by Oracle in the GPL Version 2 section of the License file that
1627.24 * accompanied this code. If applicable, add the following below the
1627.25 * License Header, with the fields enclosed by brackets [] replaced by
1627.26 * your own identifying information:
1628.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/tomcat/TomcatRestartTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1628.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/tomcat/TomcatRestartTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1628.3 @@ -1,7 +1,10 @@
1628.4 /*
1628.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1628.6 *
1628.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1628.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1628.9 + *
1628.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1628.11 + * Other names may be trademarks of their respective owners.
1628.12 *
1628.13 * The contents of this file are subject to the terms of either the GNU
1628.14 * General Public License Version 2 only ("GPL") or the Common
1628.15 @@ -13,9 +16,9 @@
1628.16 * specific language governing permissions and limitations under the
1628.17 * License. When distributing the software, include this License Header
1628.18 * Notice in each file and include the License file at
1628.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1628.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1628.21 * particular file as subject to the "Classpath" exception as provided
1628.22 - * by Sun in the GPL Version 2 section of the License file that
1628.23 + * by Oracle in the GPL Version 2 section of the License file that
1628.24 * accompanied this code. If applicable, add the following below the
1628.25 * License Header, with the fields enclosed by brackets [] replaced by
1628.26 * your own identifying information:
1629.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/tomcat/TomcatTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1629.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/tomcat/TomcatTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1629.3 @@ -1,7 +1,10 @@
1629.4 /*
1629.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1629.6 *
1629.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1629.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1629.9 + *
1629.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1629.11 + * Other names may be trademarks of their respective owners.
1629.12 *
1629.13 * The contents of this file are subject to the terms of either the GNU
1629.14 * General Public License Version 2 only ("GPL") or the Common
1629.15 @@ -13,9 +16,9 @@
1629.16 * specific language governing permissions and limitations under the
1629.17 * License. When distributing the software, include this License Header
1629.18 * Notice in each file and include the License file at
1629.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1629.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1629.21 * particular file as subject to the "Classpath" exception as provided
1629.22 - * by Sun in the GPL Version 2 section of the License file that
1629.23 + * by Oracle in the GPL Version 2 section of the License file that
1629.24 * accompanied this code. If applicable, add the following below the
1629.25 * License Header, with the fields enclosed by brackets [] replaced by
1629.26 * your own identifying information:
1630.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/weblogic/WebLogicAcceptanceTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1630.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/weblogic/WebLogicAcceptanceTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1630.3 @@ -1,7 +1,10 @@
1630.4 /*
1630.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1630.6 *
1630.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1630.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1630.9 + *
1630.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1630.11 + * Other names may be trademarks of their respective owners.
1630.12 *
1630.13 * The contents of this file are subject to the terms of either the GNU
1630.14 * General Public License Version 2 only ("GPL") or the Common
1630.15 @@ -13,9 +16,9 @@
1630.16 * specific language governing permissions and limitations under the
1630.17 * License. When distributing the software, include this License Header
1630.18 * Notice in each file and include the License file at
1630.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1630.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1630.21 * particular file as subject to the "Classpath" exception as provided
1630.22 - * by Sun in the GPL Version 2 section of the License file that
1630.23 + * by Oracle in the GPL Version 2 section of the License file that
1630.24 * accompanied this code. If applicable, add the following below the
1630.25 * License Header, with the fields enclosed by brackets [] replaced by
1630.26 * your own identifying information:
1631.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/weblogic/WebLogicOtherTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1631.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/weblogic/WebLogicOtherTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1631.3 @@ -1,7 +1,10 @@
1631.4 /*
1631.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1631.6 *
1631.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1631.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1631.9 + *
1631.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1631.11 + * Other names may be trademarks of their respective owners.
1631.12 *
1631.13 * The contents of this file are subject to the terms of either the GNU
1631.14 * General Public License Version 2 only ("GPL") or the Common
1631.15 @@ -13,9 +16,9 @@
1631.16 * specific language governing permissions and limitations under the
1631.17 * License. When distributing the software, include this License Header
1631.18 * Notice in each file and include the License file at
1631.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1631.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1631.21 * particular file as subject to the "Classpath" exception as provided
1631.22 - * by Sun in the GPL Version 2 section of the License file that
1631.23 + * by Oracle in the GPL Version 2 section of the License file that
1631.24 * accompanied this code. If applicable, add the following below the
1631.25 * License Header, with the fields enclosed by brackets [] replaced by
1631.26 * your own identifying information:
1632.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/weblogic/WebLogicRestartTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1632.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/weblogic/WebLogicRestartTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1632.3 @@ -1,7 +1,10 @@
1632.4 /*
1632.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1632.6 *
1632.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1632.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1632.9 + *
1632.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1632.11 + * Other names may be trademarks of their respective owners.
1632.12 *
1632.13 * The contents of this file are subject to the terms of either the GNU
1632.14 * General Public License Version 2 only ("GPL") or the Common
1632.15 @@ -13,9 +16,9 @@
1632.16 * specific language governing permissions and limitations under the
1632.17 * License. When distributing the software, include this License Header
1632.18 * Notice in each file and include the License file at
1632.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1632.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1632.21 * particular file as subject to the "Classpath" exception as provided
1632.22 - * by Sun in the GPL Version 2 section of the License file that
1632.23 + * by Oracle in the GPL Version 2 section of the License file that
1632.24 * accompanied this code. If applicable, add the following below the
1632.25 * License Header, with the fields enclosed by brackets [] replaced by
1632.26 * your own identifying information:
1633.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/weblogic/WebLogicTestSuite.java Fri Jul 16 11:47:36 2010 -0400
1633.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/deployment/weblogic/WebLogicTestSuite.java Fri Jul 16 14:21:50 2010 -0400
1633.3 @@ -1,7 +1,10 @@
1633.4 /*
1633.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1633.6 *
1633.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1633.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1633.9 + *
1633.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1633.11 + * Other names may be trademarks of their respective owners.
1633.12 *
1633.13 * The contents of this file are subject to the terms of either the GNU
1633.14 * General Public License Version 2 only ("GPL") or the Common
1633.15 @@ -13,9 +16,9 @@
1633.16 * specific language governing permissions and limitations under the
1633.17 * License. When distributing the software, include this License Header
1633.18 * Notice in each file and include the License file at
1633.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1633.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1633.21 * particular file as subject to the "Classpath" exception as provided
1633.22 - * by Sun in the GPL Version 2 section of the License file that
1633.23 + * by Oracle in the GPL Version 2 section of the License file that
1633.24 * accompanied this code. If applicable, add the following below the
1633.25 * License Header, with the fields enclosed by brackets [] replaced by
1633.26 * your own identifying information:
1634.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/sanity/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1634.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/sanity/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1634.3 @@ -1,6 +1,9 @@
1634.4 #DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1634.5 #
1634.6 -#Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
1634.7 +#Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1634.8 +#
1634.9 +#Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1634.10 +#Other names may be trademarks of their respective owners.
1634.11 #
1634.12 #The contents of this file are subject to the terms of either the GNU
1634.13 #General Public License Version 2 only ("GPL") or the Common
1634.14 @@ -12,9 +15,9 @@
1634.15 #specific language governing permissions and limitations under the
1634.16 #License. When distributing the software, include this License Header
1634.17 #Notice in each file and include the License file at
1634.18 -#nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1634.19 +#nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1634.20 #particular file as subject to the "Classpath" exception as provided
1634.21 -#by Sun in the GPL Version 2 section of the License file that
1634.22 +#by Oracle in the GPL Version 2 section of the License file that
1634.23 #accompanied this code. If applicable, add the following below the
1634.24 #License Header, with the fields enclosed by brackets [] replaced by
1634.25 #your own identifying information:
1635.1 --- a/visualweb.kit/test/qa-functional/src/org/netbeans/test/sanity/SanityTests.java Fri Jul 16 11:47:36 2010 -0400
1635.2 +++ b/visualweb.kit/test/qa-functional/src/org/netbeans/test/sanity/SanityTests.java Fri Jul 16 14:21:50 2010 -0400
1635.3 @@ -1,7 +1,10 @@
1635.4 /*
1635.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1635.6 *
1635.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1635.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1635.9 + *
1635.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1635.11 + * Other names may be trademarks of their respective owners.
1635.12 *
1635.13 * The contents of this file are subject to the terms of either the GNU
1635.14 * General Public License Version 2 only ("GPL") or the Common
1635.15 @@ -13,9 +16,9 @@
1635.16 * specific language governing permissions and limitations under the
1635.17 * License. When distributing the software, include this License Header
1635.18 * Notice in each file and include the License file at
1635.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1635.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1635.21 * particular file as subject to the "Classpath" exception as provided
1635.22 - * by Sun in the GPL Version 2 section of the License file that
1635.23 + * by Oracle in the GPL Version 2 section of the License file that
1635.24 * accompanied this code. If applicable, add the following below the
1635.25 * License Header, with the fields enclosed by brackets [] replaced by
1635.26 * your own identifying information:
1636.1 --- a/visualweb.libs.batik/build.xml Fri Jul 16 11:47:36 2010 -0400
1636.2 +++ b/visualweb.libs.batik/build.xml Fri Jul 16 14:21:50 2010 -0400
1636.3 @@ -2,7 +2,10 @@
1636.4 <!--
1636.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1636.6
1636.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1636.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1636.9 +
1636.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1636.11 +Other names may be trademarks of their respective owners.
1636.12
1636.13
1636.14 The contents of this file are subject to the terms of either the GNU
1636.15 @@ -15,9 +18,9 @@
1636.16 specific language governing permissions and limitations under the
1636.17 License. When distributing the software, include this License Header
1636.18 Notice in each file and include the License file at
1636.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1636.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1636.21 particular file as subject to the "Classpath" exception as provided
1636.22 -by Sun in the GPL Version 2 section of the License file that
1636.23 +by Oracle in the GPL Version 2 section of the License file that
1636.24 accompanied this code. If applicable, add the following below the
1636.25 License Header, with the fields enclosed by brackets [] replaced by
1636.26 your own identifying information:
1637.1 --- a/visualweb.libs.batik/library/build.xml Fri Jul 16 11:47:36 2010 -0400
1637.2 +++ b/visualweb.libs.batik/library/build.xml Fri Jul 16 14:21:50 2010 -0400
1637.3 @@ -2,7 +2,10 @@
1637.4 <!--
1637.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1637.6
1637.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1637.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1637.9 +
1637.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1637.11 +Other names may be trademarks of their respective owners.
1637.12
1637.13
1637.14 The contents of this file are subject to the terms of either the GNU
1637.15 @@ -15,9 +18,9 @@
1637.16 specific language governing permissions and limitations under the
1637.17 License. When distributing the software, include this License Header
1637.18 Notice in each file and include the License file at
1637.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1637.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1637.21 particular file as subject to the "Classpath" exception as provided
1637.22 -by Sun in the GPL Version 2 section of the License file that
1637.23 +by Oracle in the GPL Version 2 section of the License file that
1637.24 accompanied this code. If applicable, add the following below the
1637.25 License Header, with the fields enclosed by brackets [] replaced by
1637.26 your own identifying information:
1638.1 --- a/visualweb.libs.batik/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1638.2 +++ b/visualweb.libs.batik/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1638.3 @@ -1,6 +1,9 @@
1638.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1638.5 #
1638.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1638.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1638.8 +#
1638.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1638.10 +# Other names may be trademarks of their respective owners.
1638.11 #
1638.12 # The contents of this file are subject to the terms of either the GNU
1638.13 # General Public License Version 2 only ("GPL") or the Common
1638.14 @@ -12,9 +15,9 @@
1638.15 # specific language governing permissions and limitations under the
1638.16 # License. When distributing the software, include this License Header
1638.17 # Notice in each file and include the License file at
1638.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1638.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1638.20 # particular file as subject to the "Classpath" exception as provided
1638.21 -# by Sun in the GPL Version 2 section of the License file that
1638.22 +# by Oracle in the GPL Version 2 section of the License file that
1638.23 # accompanied this code. If applicable, add the following below the
1638.24 # License Header, with the fields enclosed by brackets [] replaced by
1638.25 # your own identifying information:
1639.1 --- a/visualweb.libs.batik/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1639.2 +++ b/visualweb.libs.batik/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1639.3 @@ -2,7 +2,10 @@
1639.4 <!--
1639.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1639.6
1639.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1639.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1639.9 +
1639.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1639.11 +Other names may be trademarks of their respective owners.
1639.12
1639.13
1639.14 The contents of this file are subject to the terms of either the GNU
1639.15 @@ -15,9 +18,9 @@
1639.16 specific language governing permissions and limitations under the
1639.17 License. When distributing the software, include this License Header
1639.18 Notice in each file and include the License file at
1639.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1639.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1639.21 particular file as subject to the "Classpath" exception as provided
1639.22 -by Sun in the GPL Version 2 section of the License file that
1639.23 +by Oracle in the GPL Version 2 section of the License file that
1639.24 accompanied this code. If applicable, add the following below the
1639.25 License Header, with the fields enclosed by brackets [] replaced by
1639.26 your own identifying information:
1640.1 --- a/visualweb.libs.batik/library/src/org/apache/batik/css/engine/StyleSheetCache.java Fri Jul 16 11:47:36 2010 -0400
1640.2 +++ b/visualweb.libs.batik/library/src/org/apache/batik/css/engine/StyleSheetCache.java Fri Jul 16 14:21:50 2010 -0400
1640.3 @@ -1,6 +1,9 @@
1640.4 /*
1640.5 * {START_JAVA_COPYRIGHT_NOTICE
1640.6 - * Copyright 2002 Sun Microsystems, Inc. All rights reserved.
1640.7 + * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
1640.8 +
1640.9 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1640.10 +Other names may be trademarks of their respective owners.
1640.11 * SUN PROPRIETARY/CONFIDENTIAL.
1640.12 * Use is subject to license terms.
1640.13 * END_COPYRIGHT_NOTICE}
1641.1 --- a/visualweb.libs.batik/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1641.2 +++ b/visualweb.libs.batik/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1641.3 @@ -1,6 +1,9 @@
1641.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1641.5 #
1641.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1641.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1641.8 +#
1641.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1641.10 +# Other names may be trademarks of their respective owners.
1641.11 #
1641.12 # The contents of this file are subject to the terms of either the GNU
1641.13 # General Public License Version 2 only ("GPL") or the Common
1641.14 @@ -12,9 +15,9 @@
1641.15 # specific language governing permissions and limitations under the
1641.16 # License. When distributing the software, include this License Header
1641.17 # Notice in each file and include the License file at
1641.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1641.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1641.20 # particular file as subject to the "Classpath" exception as provided
1641.21 -# by Sun in the GPL Version 2 section of the License file that
1641.22 +# by Oracle in the GPL Version 2 section of the License file that
1641.23 # accompanied this code. If applicable, add the following below the
1641.24 # License Header, with the fields enclosed by brackets [] replaced by
1641.25 # your own identifying information:
1641.26 @@ -39,4 +42,4 @@
1641.27 is.autoload=true
1641.28 extra.module.files=modules/ext/batik-mod.jar
1641.29 javac.compilerargs=-Xlint -Xlint:-serial
1641.30 -javac.source=1.5
1641.31 +javac.source=1.6
1642.1 --- a/visualweb.libs.batik/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1642.2 +++ b/visualweb.libs.batik/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1642.3 @@ -2,7 +2,10 @@
1642.4 <!--
1642.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1642.6
1642.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1642.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1642.9 +
1642.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1642.11 +Other names may be trademarks of their respective owners.
1642.12
1642.13
1642.14 The contents of this file are subject to the terms of either the GNU
1642.15 @@ -15,9 +18,9 @@
1642.16 specific language governing permissions and limitations under the
1642.17 License. When distributing the software, include this License Header
1642.18 Notice in each file and include the License file at
1642.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1642.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1642.21 particular file as subject to the "Classpath" exception as provided
1642.22 -by Sun in the GPL Version 2 section of the License file that
1642.23 +by Oracle in the GPL Version 2 section of the License file that
1642.24 accompanied this code. If applicable, add the following below the
1642.25 License Header, with the fields enclosed by brackets [] replaced by
1642.26 your own identifying information:
1643.1 --- a/visualweb.libs.batik/src/org/netbeans/modules/visualweb/libs/batik/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1643.2 +++ b/visualweb.libs.batik/src/org/netbeans/modules/visualweb/libs/batik/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1643.3 @@ -1,6 +1,9 @@
1643.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1643.5 #
1643.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1643.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1643.8 +#
1643.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1643.10 +# Other names may be trademarks of their respective owners.
1643.11 #
1643.12 # The contents of this file are subject to the terms of either the GNU
1643.13 # General Public License Version 2 only ("GPL") or the Common
1643.14 @@ -12,9 +15,9 @@
1643.15 # specific language governing permissions and limitations under the
1643.16 # License. When distributing the software, include this License Header
1643.17 # Notice in each file and include the License file at
1643.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1643.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1643.20 # particular file as subject to the "Classpath" exception as provided
1643.21 -# by Sun in the GPL Version 2 section of the License file that
1643.22 +# by Oracle in the GPL Version 2 section of the License file that
1643.23 # accompanied this code. If applicable, add the following below the
1643.24 # License Header, with the fields enclosed by brackets [] replaced by
1643.25 # your own identifying information:
1644.1 --- a/visualweb.libs.jtidy/build.xml Fri Jul 16 11:47:36 2010 -0400
1644.2 +++ b/visualweb.libs.jtidy/build.xml Fri Jul 16 14:21:50 2010 -0400
1644.3 @@ -2,7 +2,10 @@
1644.4 <!--
1644.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1644.6
1644.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1644.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1644.9 +
1644.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1644.11 +Other names may be trademarks of their respective owners.
1644.12
1644.13
1644.14 The contents of this file are subject to the terms of either the GNU
1644.15 @@ -15,9 +18,9 @@
1644.16 specific language governing permissions and limitations under the
1644.17 License. When distributing the software, include this License Header
1644.18 Notice in each file and include the License file at
1644.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1644.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1644.21 particular file as subject to the "Classpath" exception as provided
1644.22 -by Sun in the GPL Version 2 section of the License file that
1644.23 +by Oracle in the GPL Version 2 section of the License file that
1644.24 accompanied this code. If applicable, add the following below the
1644.25 License Header, with the fields enclosed by brackets [] replaced by
1644.26 your own identifying information:
1645.1 --- a/visualweb.libs.jtidy/library/build.xml Fri Jul 16 11:47:36 2010 -0400
1645.2 +++ b/visualweb.libs.jtidy/library/build.xml Fri Jul 16 14:21:50 2010 -0400
1645.3 @@ -2,7 +2,10 @@
1645.4 <!--
1645.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1645.6
1645.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1645.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1645.9 +
1645.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1645.11 +Other names may be trademarks of their respective owners.
1645.12
1645.13
1645.14 The contents of this file are subject to the terms of either the GNU
1645.15 @@ -15,9 +18,9 @@
1645.16 specific language governing permissions and limitations under the
1645.17 License. When distributing the software, include this License Header
1645.18 Notice in each file and include the License file at
1645.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1645.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1645.21 particular file as subject to the "Classpath" exception as provided
1645.22 -by Sun in the GPL Version 2 section of the License file that
1645.23 +by Oracle in the GPL Version 2 section of the License file that
1645.24 accompanied this code. If applicable, add the following below the
1645.25 License Header, with the fields enclosed by brackets [] replaced by
1645.26 your own identifying information:
1646.1 --- a/visualweb.libs.jtidy/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1646.2 +++ b/visualweb.libs.jtidy/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1646.3 @@ -1,6 +1,9 @@
1646.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1646.5 #
1646.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1646.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1646.8 +#
1646.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1646.10 +# Other names may be trademarks of their respective owners.
1646.11 #
1646.12 # The contents of this file are subject to the terms of either the GNU
1646.13 # General Public License Version 2 only ("GPL") or the Common
1646.14 @@ -12,9 +15,9 @@
1646.15 # specific language governing permissions and limitations under the
1646.16 # License. When distributing the software, include this License Header
1646.17 # Notice in each file and include the License file at
1646.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1646.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1646.20 # particular file as subject to the "Classpath" exception as provided
1646.21 -# by Sun in the GPL Version 2 section of the License file that
1646.22 +# by Oracle in the GPL Version 2 section of the License file that
1646.23 # accompanied this code. If applicable, add the following below the
1646.24 # License Header, with the fields enclosed by brackets [] replaced by
1646.25 # your own identifying information:
1646.26 @@ -55,7 +58,7 @@
1646.27 dist.jar=${dist.dir}/tidy-mod.jar
1646.28 dist.javadoc.dir=${dist.dir}/javadoc
1646.29 excludes=
1646.30 -file.reference.xerces-2.6.2.jar=../../../ravebuild/rave/ide8/modules/ext/xerces-2.8.0.jar
1646.31 +file.reference.xerces-2.6.2.jar=../../../ravebuild/rave/ide/modules/ext/xerces-2.8.0.jar
1646.32 includes=**
1646.33 jar.compress=false
1646.34 javac.classpath=\
1647.1 --- a/visualweb.libs.jtidy/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1647.2 +++ b/visualweb.libs.jtidy/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1647.3 @@ -2,7 +2,10 @@
1647.4 <!--
1647.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1647.6
1647.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1647.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1647.9 +
1647.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1647.11 +Other names may be trademarks of their respective owners.
1647.12
1647.13
1647.14 The contents of this file are subject to the terms of either the GNU
1647.15 @@ -15,9 +18,9 @@
1647.16 specific language governing permissions and limitations under the
1647.17 License. When distributing the software, include this License Header
1647.18 Notice in each file and include the License file at
1647.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1647.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1647.21 particular file as subject to the "Classpath" exception as provided
1647.22 -by Sun in the GPL Version 2 section of the License file that
1647.23 +by Oracle in the GPL Version 2 section of the License file that
1647.24 accompanied this code. If applicable, add the following below the
1647.25 License Header, with the fields enclosed by brackets [] replaced by
1647.26 your own identifying information:
1648.1 --- a/visualweb.libs.jtidy/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1648.2 +++ b/visualweb.libs.jtidy/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1648.3 @@ -1,6 +1,9 @@
1648.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1648.5 #
1648.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1648.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1648.8 +#
1648.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1648.10 +# Other names may be trademarks of their respective owners.
1648.11 #
1648.12 # The contents of this file are subject to the terms of either the GNU
1648.13 # General Public License Version 2 only ("GPL") or the Common
1648.14 @@ -12,9 +15,9 @@
1648.15 # specific language governing permissions and limitations under the
1648.16 # License. When distributing the software, include this License Header
1648.17 # Notice in each file and include the License file at
1648.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1648.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1648.20 # particular file as subject to the "Classpath" exception as provided
1648.21 -# by Sun in the GPL Version 2 section of the License file that
1648.22 +# by Oracle in the GPL Version 2 section of the License file that
1648.23 # accompanied this code. If applicable, add the following below the
1648.24 # License Header, with the fields enclosed by brackets [] replaced by
1648.25 # your own identifying information:
1649.1 --- a/visualweb.libs.jtidy/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1649.2 +++ b/visualweb.libs.jtidy/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1649.3 @@ -2,7 +2,10 @@
1649.4 <!--
1649.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1649.6
1649.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1649.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1649.9 +
1649.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1649.11 +Other names may be trademarks of their respective owners.
1649.12
1649.13
1649.14 The contents of this file are subject to the terms of either the GNU
1649.15 @@ -15,9 +18,9 @@
1649.16 specific language governing permissions and limitations under the
1649.17 License. When distributing the software, include this License Header
1649.18 Notice in each file and include the License file at
1649.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1649.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1649.21 particular file as subject to the "Classpath" exception as provided
1649.22 -by Sun in the GPL Version 2 section of the License file that
1649.23 +by Oracle in the GPL Version 2 section of the License file that
1649.24 accompanied this code. If applicable, add the following below the
1649.25 License Header, with the fields enclosed by brackets [] replaced by
1649.26 your own identifying information:
1650.1 --- a/visualweb.libs.jtidy/src/org/netbeans/modules/visualweb/libs/jtidy/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1650.2 +++ b/visualweb.libs.jtidy/src/org/netbeans/modules/visualweb/libs/jtidy/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1650.3 @@ -1,6 +1,9 @@
1650.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1650.5 #
1650.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1650.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1650.8 +#
1650.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1650.10 +# Other names may be trademarks of their respective owners.
1650.11 #
1650.12 # The contents of this file are subject to the terms of either the GNU
1650.13 # General Public License Version 2 only ("GPL") or the Common
1650.14 @@ -12,9 +15,9 @@
1650.15 # specific language governing permissions and limitations under the
1650.16 # License. When distributing the software, include this License Header
1650.17 # Notice in each file and include the License file at
1650.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1650.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1650.20 # particular file as subject to the "Classpath" exception as provided
1650.21 -# by Sun in the GPL Version 2 section of the License file that
1650.22 +# by Oracle in the GPL Version 2 section of the License file that
1650.23 # accompanied this code. If applicable, add the following below the
1650.24 # License Header, with the fields enclosed by brackets [] replaced by
1650.25 # your own identifying information:
1651.1 --- a/visualweb.libs.rowset/build.xml Fri Jul 16 11:47:36 2010 -0400
1651.2 +++ b/visualweb.libs.rowset/build.xml Fri Jul 16 14:21:50 2010 -0400
1651.3 @@ -2,7 +2,10 @@
1651.4 <!--
1651.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1651.6
1651.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1651.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1651.9 +
1651.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1651.11 +Other names may be trademarks of their respective owners.
1651.12
1651.13
1651.14 The contents of this file are subject to the terms of either the GNU
1651.15 @@ -15,9 +18,9 @@
1651.16 specific language governing permissions and limitations under the
1651.17 License. When distributing the software, include this License Header
1651.18 Notice in each file and include the License file at
1651.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1651.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1651.21 particular file as subject to the "Classpath" exception as provided
1651.22 -by Sun in the GPL Version 2 section of the License file that
1651.23 +by Oracle in the GPL Version 2 section of the License file that
1651.24 accompanied this code. If applicable, add the following below the
1651.25 License Header, with the fields enclosed by brackets [] replaced by
1651.26 your own identifying information:
1652.1 --- a/visualweb.libs.rowset/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1652.2 +++ b/visualweb.libs.rowset/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1652.3 @@ -1,6 +1,9 @@
1652.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1652.5 #
1652.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1652.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1652.8 +#
1652.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1652.10 +# Other names may be trademarks of their respective owners.
1652.11 #
1652.12 # The contents of this file are subject to the terms of either the GNU
1652.13 # General Public License Version 2 only ("GPL") or the Common
1652.14 @@ -12,9 +15,9 @@
1652.15 # specific language governing permissions and limitations under the
1652.16 # License. When distributing the software, include this License Header
1652.17 # Notice in each file and include the License file at
1652.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1652.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1652.20 # particular file as subject to the "Classpath" exception as provided
1652.21 -# by Sun in the GPL Version 2 section of the License file that
1652.22 +# by Oracle in the GPL Version 2 section of the License file that
1652.23 # accompanied this code. If applicable, add the following below the
1652.24 # License Header, with the fields enclosed by brackets [] replaced by
1652.25 # your own identifying information:
1653.1 --- a/visualweb.libs.rowset/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1653.2 +++ b/visualweb.libs.rowset/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1653.3 @@ -2,7 +2,10 @@
1653.4 <!--
1653.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1653.6
1653.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1653.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1653.9 +
1653.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1653.11 +Other names may be trademarks of their respective owners.
1653.12
1653.13
1653.14 The contents of this file are subject to the terms of either the GNU
1653.15 @@ -15,9 +18,9 @@
1653.16 specific language governing permissions and limitations under the
1653.17 License. When distributing the software, include this License Header
1653.18 Notice in each file and include the License file at
1653.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1653.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1653.21 particular file as subject to the "Classpath" exception as provided
1653.22 -by Sun in the GPL Version 2 section of the License file that
1653.23 +by Oracle in the GPL Version 2 section of the License file that
1653.24 accompanied this code. If applicable, add the following below the
1653.25 License Header, with the fields enclosed by brackets [] replaced by
1653.26 your own identifying information:
1654.1 --- a/visualweb.libs.rowset/src/org/netbeans/modules/visualweb/libs/rowset/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1654.2 +++ b/visualweb.libs.rowset/src/org/netbeans/modules/visualweb/libs/rowset/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1654.3 @@ -1,6 +1,9 @@
1654.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1654.5 #
1654.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1654.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1654.8 +#
1654.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1654.10 +# Other names may be trademarks of their respective owners.
1654.11 #
1654.12 # The contents of this file are subject to the terms of either the GNU
1654.13 # General Public License Version 2 only ("GPL") or the Common
1654.14 @@ -12,9 +15,9 @@
1654.15 # specific language governing permissions and limitations under the
1654.16 # License. When distributing the software, include this License Header
1654.17 # Notice in each file and include the License file at
1654.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1654.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1654.20 # particular file as subject to the "Classpath" exception as provided
1654.21 -# by Sun in the GPL Version 2 section of the License file that
1654.22 +# by Oracle in the GPL Version 2 section of the License file that
1654.23 # accompanied this code. If applicable, add the following below the
1654.24 # License Header, with the fields enclosed by brackets [] replaced by
1654.25 # your own identifying information:
1655.1 --- a/visualweb.libs.rowset/src/org/netbeans/modules/visualweb/libs/rowset/layer.xml Fri Jul 16 11:47:36 2010 -0400
1655.2 +++ b/visualweb.libs.rowset/src/org/netbeans/modules/visualweb/libs/rowset/layer.xml Fri Jul 16 14:21:50 2010 -0400
1655.3 @@ -3,7 +3,10 @@
1655.4 <!--
1655.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1655.6
1655.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1655.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1655.9 +
1655.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1655.11 +Other names may be trademarks of their respective owners.
1655.12
1655.13
1655.14 The contents of this file are subject to the terms of either the GNU
1655.15 @@ -16,9 +19,9 @@
1655.16 specific language governing permissions and limitations under the
1655.17 License. When distributing the software, include this License Header
1655.18 Notice in each file and include the License file at
1655.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1655.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1655.21 particular file as subject to the "Classpath" exception as provided
1655.22 -by Sun in the GPL Version 2 section of the License file that
1655.23 +by Oracle in the GPL Version 2 section of the License file that
1655.24 accompanied this code. If applicable, add the following below the
1655.25 License Header, with the fields enclosed by brackets [] replaced by
1655.26 your own identifying information:
1656.1 --- a/visualweb.libs.rowset/src/org/netbeans/modules/visualweb/libs/rowset/rowset-ri.xml Fri Jul 16 11:47:36 2010 -0400
1656.2 +++ b/visualweb.libs.rowset/src/org/netbeans/modules/visualweb/libs/rowset/rowset-ri.xml Fri Jul 16 14:21:50 2010 -0400
1656.3 @@ -2,7 +2,10 @@
1656.4 <!--
1656.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1656.6
1656.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1656.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1656.9 +
1656.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1656.11 +Other names may be trademarks of their respective owners.
1656.12
1656.13
1656.14 The contents of this file are subject to the terms of either the GNU
1656.15 @@ -15,9 +18,9 @@
1656.16 specific language governing permissions and limitations under the
1656.17 License. When distributing the software, include this License Header
1656.18 Notice in each file and include the License file at
1656.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1656.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1656.21 particular file as subject to the "Classpath" exception as provided
1656.22 -by Sun in the GPL Version 2 section of the License file that
1656.23 +by Oracle in the GPL Version 2 section of the License file that
1656.24 accompanied this code. If applicable, add the following below the
1656.25 License Header, with the fields enclosed by brackets [] replaced by
1656.26 your own identifying information:
1656.27 @@ -48,10 +51,10 @@
1656.28 <localizing-bundle>org.netbeans.modules.visualweb.libs.rowset.Bundle</localizing-bundle>
1656.29 <volume>
1656.30 <type>classpath</type>
1656.31 - <resource>jar:nbinst:///modules/ext/rowset-1.0.1.jar!/</resource>
1656.32 + <resource>jar:nbinst://org.netbeans.modules.visualweb.libs.rowset/modules/ext/rowset-1.0.1.jar!/</resource>
1656.33 </volume>
1656.34 <volume>
1656.35 <type>javadoc</type>
1656.36 - <resource>jar:nbinst:///docs/rowset-doc.zip!/</resource>
1656.37 + <resource>jar:nbinst://org.netbeans.modules.visualweb.libs.rowset/docs/rowset-doc.zip!/</resource>
1656.38 </volume>
1656.39 </library>
1657.1 --- a/visualweb.navigation/build.xml Fri Jul 16 11:47:36 2010 -0400
1657.2 +++ b/visualweb.navigation/build.xml Fri Jul 16 14:21:50 2010 -0400
1657.3 @@ -2,7 +2,10 @@
1657.4 <!--
1657.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1657.6
1657.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1657.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1657.9 +
1657.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1657.11 +Other names may be trademarks of their respective owners.
1657.12
1657.13
1657.14 The contents of this file are subject to the terms of either the GNU
1657.15 @@ -15,9 +18,9 @@
1657.16 specific language governing permissions and limitations under the
1657.17 License. When distributing the software, include this License Header
1657.18 Notice in each file and include the License file at
1657.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1657.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1657.21 particular file as subject to the "Classpath" exception as provided
1657.22 -by Sun in the GPL Version 2 section of the License file that
1657.23 +by Oracle in the GPL Version 2 section of the License file that
1657.24 accompanied this code. If applicable, add the following below the
1657.25 License Header, with the fields enclosed by brackets [] replaced by
1657.26 your own identifying information:
1658.1 --- a/visualweb.navigation/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1658.2 +++ b/visualweb.navigation/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1658.3 @@ -1,6 +1,9 @@
1658.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1658.5 #
1658.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1658.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1658.8 +#
1658.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1658.10 +# Other names may be trademarks of their respective owners.
1658.11 #
1658.12 # The contents of this file are subject to the terms of either the GNU
1658.13 # General Public License Version 2 only ("GPL") or the Common
1658.14 @@ -12,9 +15,9 @@
1658.15 # specific language governing permissions and limitations under the
1658.16 # License. When distributing the software, include this License Header
1658.17 # Notice in each file and include the License file at
1658.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1658.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1658.20 # particular file as subject to the "Classpath" exception as provided
1658.21 -# by Sun in the GPL Version 2 section of the License file that
1658.22 +# by Oracle in the GPL Version 2 section of the License file that
1658.23 # accompanied this code. If applicable, add the following below the
1658.24 # License Header, with the fields enclosed by brackets [] replaced by
1658.25 # your own identifying information:
1658.26 @@ -43,4 +46,4 @@
1658.27 ${cluster}/modules/ext/jsfcl-dt.jar:\
1658.28
1658.29 javac.compilerargs=\ -Xlint:unchecked
1658.30 -javac.source=1.5
1658.31 +javac.source=1.6
1659.1 --- a/visualweb.navigation/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1659.2 +++ b/visualweb.navigation/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1659.3 @@ -2,7 +2,10 @@
1659.4 <!--
1659.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1659.6
1659.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1659.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1659.9 +
1659.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1659.11 +Other names may be trademarks of their respective owners.
1659.12
1659.13
1659.14 The contents of this file are subject to the terms of either the GNU
1659.15 @@ -15,9 +18,9 @@
1659.16 specific language governing permissions and limitations under the
1659.17 License. When distributing the software, include this License Header
1659.18 Notice in each file and include the License file at
1659.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1659.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1659.21 particular file as subject to the "Classpath" exception as provided
1659.22 -by Sun in the GPL Version 2 section of the License file that
1659.23 +by Oracle in the GPL Version 2 section of the License file that
1659.24 accompanied this code. If applicable, add the following below the
1659.25 License Header, with the fields enclosed by brackets [] replaced by
1659.26 your own identifying information:
1659.27 @@ -187,7 +190,15 @@
1659.28 <build-prerequisite/>
1659.29 <compile-dependency/>
1659.30 <run-dependency>
1659.31 - <specification-version>7.15</specification-version>
1659.32 + <specification-version>8.0</specification-version>
1659.33 + </run-dependency>
1659.34 + </dependency>
1659.35 + <dependency>
1659.36 + <code-name-base>org.openide.util.lookup</code-name-base>
1659.37 + <build-prerequisite/>
1659.38 + <compile-dependency/>
1659.39 + <run-dependency>
1659.40 + <specification-version>8.0</specification-version>
1659.41 </run-dependency>
1659.42 </dependency>
1659.43 </module-dependencies>
1660.1 --- a/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1660.2 +++ b/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1660.3 @@ -1,6 +1,9 @@
1660.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1660.5 #
1660.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1660.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1660.8 +#
1660.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1660.10 +# Other names may be trademarks of their respective owners.
1660.11 #
1660.12 # The contents of this file are subject to the terms of either the GNU
1660.13 # General Public License Version 2 only ("GPL") or the Common
1660.14 @@ -12,9 +15,9 @@
1660.15 # specific language governing permissions and limitations under the
1660.16 # License. When distributing the software, include this License Header
1660.17 # Notice in each file and include the License file at
1660.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1660.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1660.20 # particular file as subject to the "Classpath" exception as provided
1660.21 -# by Sun in the GPL Version 2 section of the License file that
1660.22 +# by Oracle in the GPL Version 2 section of the License file that
1660.23 # accompanied this code. If applicable, add the following below the
1660.24 # License Header, with the fields enclosed by brackets [] replaced by
1660.25 # your own identifying information:
1661.1 --- a/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/FacesModelSetListener.java Fri Jul 16 11:47:36 2010 -0400
1661.2 +++ b/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/FacesModelSetListener.java Fri Jul 16 14:21:50 2010 -0400
1661.3 @@ -1,7 +1,10 @@
1661.4 /*
1661.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1661.6 *
1661.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1661.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1661.9 + *
1661.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1661.11 + * Other names may be trademarks of their respective owners.
1661.12 *
1661.13 * The contents of this file are subject to the terms of either the GNU
1661.14 * General Public License Version 2 only ("GPL") or the Common
1661.15 @@ -13,9 +16,9 @@
1661.16 * specific language governing permissions and limitations under the
1661.17 * License. When distributing the software, include this License Header
1661.18 * Notice in each file and include the License file at
1661.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1661.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1661.21 * particular file as subject to the "Classpath" exception as provided
1661.22 - * by Sun in the GPL Version 2 section of the License file that
1661.23 + * by Oracle in the GPL Version 2 section of the License file that
1661.24 * accompanied this code. If applicable, add the following below the
1661.25 * License Header, with the fields enclosed by brackets [] replaced by
1661.26 * your own identifying information:
1662.1 --- a/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentActions.java Fri Jul 16 11:47:36 2010 -0400
1662.2 +++ b/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentActions.java Fri Jul 16 14:21:50 2010 -0400
1662.3 @@ -1,7 +1,10 @@
1662.4 /*
1662.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1662.6 *
1662.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1662.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1662.9 + *
1662.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1662.11 + * Other names may be trademarks of their respective owners.
1662.12 *
1662.13 * The contents of this file are subject to the terms of either the GNU
1662.14 * General Public License Version 2 only ("GPL") or the Common
1662.15 @@ -13,9 +16,9 @@
1662.16 * specific language governing permissions and limitations under the
1662.17 * License. When distributing the software, include this License Header
1662.18 * Notice in each file and include the License file at
1662.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1662.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1662.21 * particular file as subject to the "Classpath" exception as provided
1662.22 - * by Sun in the GPL Version 2 section of the License file that
1662.23 + * by Oracle in the GPL Version 2 section of the License file that
1662.24 * accompanied this code. If applicable, add the following below the
1662.25 * License Header, with the fields enclosed by brackets [] replaced by
1662.26 * your own identifying information:
1663.1 --- a/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentItem.java Fri Jul 16 11:47:36 2010 -0400
1663.2 +++ b/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentItem.java Fri Jul 16 14:21:50 2010 -0400
1663.3 @@ -1,7 +1,10 @@
1663.4 /*
1663.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1663.6 *
1663.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1663.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1663.9 + *
1663.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1663.11 + * Other names may be trademarks of their respective owners.
1663.12 *
1663.13 * The contents of this file are subject to the terms of either the GNU
1663.14 * General Public License Version 2 only ("GPL") or the Common
1663.15 @@ -13,9 +16,9 @@
1663.16 * specific language governing permissions and limitations under the
1663.17 * License. When distributing the software, include this License Header
1663.18 * Notice in each file and include the License file at
1663.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1663.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1663.21 * particular file as subject to the "Classpath" exception as provided
1663.22 - * by Sun in the GPL Version 2 section of the License file that
1663.23 + * by Oracle in the GPL Version 2 section of the License file that
1663.24 * accompanied this code. If applicable, add the following below the
1663.25 * License Header, with the fields enclosed by brackets [] replaced by
1663.26 * your own identifying information:
1664.1 --- a/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentModel.java Fri Jul 16 11:47:36 2010 -0400
1664.2 +++ b/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentModel.java Fri Jul 16 14:21:50 2010 -0400
1664.3 @@ -1,7 +1,10 @@
1664.4 /*
1664.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1664.6 *
1664.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1664.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1664.9 + *
1664.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1664.11 + * Other names may be trademarks of their respective owners.
1664.12 *
1664.13 * The contents of this file are subject to the terms of either the GNU
1664.14 * General Public License Version 2 only ("GPL") or the Common
1664.15 @@ -13,9 +16,9 @@
1664.16 * specific language governing permissions and limitations under the
1664.17 * License. When distributing the software, include this License Header
1664.18 * Notice in each file and include the License file at
1664.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1664.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1664.21 * particular file as subject to the "Classpath" exception as provided
1664.22 - * by Sun in the GPL Version 2 section of the License file that
1664.23 + * by Oracle in the GPL Version 2 section of the License file that
1664.24 * accompanied this code. If applicable, add the following below the
1664.25 * License Header, with the fields enclosed by brackets [] replaced by
1664.26 * your own identifying information:
1665.1 --- a/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentModelProvider.java Fri Jul 16 11:47:36 2010 -0400
1665.2 +++ b/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentModelProvider.java Fri Jul 16 14:21:50 2010 -0400
1665.3 @@ -1,7 +1,10 @@
1665.4 /*
1665.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1665.6 *
1665.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1665.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1665.9 + *
1665.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1665.11 + * Other names may be trademarks of their respective owners.
1665.12 *
1665.13 * The contents of this file are subject to the terms of either the GNU
1665.14 * General Public License Version 2 only ("GPL") or the Common
1665.15 @@ -13,9 +16,9 @@
1665.16 * specific language governing permissions and limitations under the
1665.17 * License. When distributing the software, include this License Header
1665.18 * Notice in each file and include the License file at
1665.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1665.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1665.21 * particular file as subject to the "Classpath" exception as provided
1665.22 - * by Sun in the GPL Version 2 section of the License file that
1665.23 + * by Oracle in the GPL Version 2 section of the License file that
1665.24 * accompanied this code. If applicable, add the following below the
1665.25 * License Header, with the fields enclosed by brackets [] replaced by
1665.26 * your own identifying information:
1666.1 --- a/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentUtilities.java Fri Jul 16 11:47:36 2010 -0400
1666.2 +++ b/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPContentUtilities.java Fri Jul 16 14:21:50 2010 -0400
1666.3 @@ -1,7 +1,10 @@
1666.4 /*
1666.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1666.6 *
1666.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1666.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1666.9 + *
1666.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1666.11 + * Other names may be trademarks of their respective owners.
1666.12 *
1666.13 * The contents of this file are subject to the terms of either the GNU
1666.14 * General Public License Version 2 only ("GPL") or the Common
1666.15 @@ -13,9 +16,9 @@
1666.16 * specific language governing permissions and limitations under the
1666.17 * License. When distributing the software, include this License Header
1666.18 * Notice in each file and include the License file at
1666.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1666.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1666.21 * particular file as subject to the "Classpath" exception as provided
1666.22 - * by Sun in the GPL Version 2 section of the License file that
1666.23 + * by Oracle in the GPL Version 2 section of the License file that
1666.24 * accompanied this code. If applicable, add the following below the
1666.25 * License Header, with the fields enclosed by brackets [] replaced by
1666.26 * your own identifying information:
1667.1 --- a/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPDesignContextListener.java Fri Jul 16 11:47:36 2010 -0400
1667.2 +++ b/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/VWPDesignContextListener.java Fri Jul 16 14:21:50 2010 -0400
1667.3 @@ -1,7 +1,10 @@
1667.4 /*
1667.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1667.6 *
1667.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1667.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1667.9 + *
1667.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1667.11 + * Other names may be trademarks of their respective owners.
1667.12 *
1667.13 * The contents of this file are subject to the terms of either the GNU
1667.14 * General Public License Version 2 only ("GPL") or the Common
1667.15 @@ -13,9 +16,9 @@
1667.16 * specific language governing permissions and limitations under the
1667.17 * License. When distributing the software, include this License Header
1667.18 * Notice in each file and include the License file at
1667.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1667.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1667.21 * particular file as subject to the "Classpath" exception as provided
1667.22 - * by Sun in the GPL Version 2 section of the License file that
1667.23 + * by Oracle in the GPL Version 2 section of the License file that
1667.24 * accompanied this code. If applicable, add the following below the
1667.25 * License Header, with the fields enclosed by brackets [] replaced by
1667.26 * your own identifying information:
1668.1 --- a/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/layer.xml Fri Jul 16 11:47:36 2010 -0400
1668.2 +++ b/visualweb.navigation/src/org/netbeans/modules/visualweb/navigation/layer.xml Fri Jul 16 14:21:50 2010 -0400
1668.3 @@ -2,7 +2,10 @@
1668.4 <!--
1668.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1668.6
1668.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1668.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1668.9 +
1668.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1668.11 +Other names may be trademarks of their respective owners.
1668.12
1668.13
1668.14 The contents of this file are subject to the terms of either the GNU
1668.15 @@ -15,9 +18,9 @@
1668.16 specific language governing permissions and limitations under the
1668.17 License. When distributing the software, include this License Header
1668.18 Notice in each file and include the License file at
1668.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1668.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1668.21 particular file as subject to the "Classpath" exception as provided
1668.22 -by Sun in the GPL Version 2 section of the License file that
1668.23 +by Oracle in the GPL Version 2 section of the License file that
1668.24 accompanied this code. If applicable, add the following below the
1668.25 License Header, with the fields enclosed by brackets [] replaced by
1668.26 your own identifying information:
1669.1 --- a/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/MockOpenProjectsTrampoline.java Fri Jul 16 11:47:36 2010 -0400
1669.2 +++ b/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/MockOpenProjectsTrampoline.java Fri Jul 16 14:21:50 2010 -0400
1669.3 @@ -1,7 +1,10 @@
1669.4 /*
1669.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1669.6 *
1669.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1669.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1669.9 + *
1669.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1669.11 + * Other names may be trademarks of their respective owners.
1669.12 *
1669.13 * The contents of this file are subject to the terms of either the GNU
1669.14 * General Public License Version 2 only ("GPL") or the Common
1669.15 @@ -13,9 +16,9 @@
1669.16 * specific language governing permissions and limitations under the
1669.17 * License. When distributing the software, include this License Header
1669.18 * Notice in each file and include the License file at
1669.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1669.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1669.21 * particular file as subject to the "Classpath" exception as provided
1669.22 - * by Sun in the GPL Version 2 section of the License file that
1669.23 + * by Oracle in the GPL Version 2 section of the License file that
1669.24 * accompanied this code. If applicable, add the following below the
1669.25 * License Header, with the fields enclosed by brackets [] replaced by
1669.26 * your own identifying information:
1670.1 --- a/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/VWPContentModelProviderTest.java Fri Jul 16 11:47:36 2010 -0400
1670.2 +++ b/visualweb.navigation/test/unit/src/org/netbeans/modules/visualweb/navigation/VWPContentModelProviderTest.java Fri Jul 16 14:21:50 2010 -0400
1670.3 @@ -1,7 +1,10 @@
1670.4 /*
1670.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1670.6 *
1670.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1670.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1670.9 + *
1670.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1670.11 + * Other names may be trademarks of their respective owners.
1670.12 *
1670.13 * The contents of this file are subject to the terms of either the GNU
1670.14 * General Public License Version 2 only ("GPL") or the Common
1670.15 @@ -13,9 +16,9 @@
1670.16 * specific language governing permissions and limitations under the
1670.17 * License. When distributing the software, include this License Header
1670.18 * Notice in each file and include the License file at
1670.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1670.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1670.21 * particular file as subject to the "Classpath" exception as provided
1670.22 - * by Sun in the GPL Version 2 section of the License file that
1670.23 + * by Oracle in the GPL Version 2 section of the License file that
1670.24 * accompanied this code. If applicable, add the following below the
1670.25 * License Header, with the fields enclosed by brackets [] replaced by
1670.26 * your own identifying information:
1671.1 --- a/visualweb.outline/build.xml Fri Jul 16 11:47:36 2010 -0400
1671.2 +++ b/visualweb.outline/build.xml Fri Jul 16 14:21:50 2010 -0400
1671.3 @@ -2,7 +2,10 @@
1671.4 <!--
1671.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1671.6
1671.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1671.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1671.9 +
1671.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1671.11 +Other names may be trademarks of their respective owners.
1671.12
1671.13
1671.14 The contents of this file are subject to the terms of either the GNU
1671.15 @@ -15,9 +18,9 @@
1671.16 specific language governing permissions and limitations under the
1671.17 License. When distributing the software, include this License Header
1671.18 Notice in each file and include the License file at
1671.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1671.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1671.21 particular file as subject to the "Classpath" exception as provided
1671.22 -by Sun in the GPL Version 2 section of the License file that
1671.23 +by Oracle in the GPL Version 2 section of the License file that
1671.24 accompanied this code. If applicable, add the following below the
1671.25 License Header, with the fields enclosed by brackets [] replaced by
1671.26 your own identifying information:
1672.1 --- a/visualweb.outline/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1672.2 +++ b/visualweb.outline/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1672.3 @@ -1,6 +1,9 @@
1672.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1672.5 #
1672.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1672.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1672.8 +#
1672.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1672.10 +# Other names may be trademarks of their respective owners.
1672.11 #
1672.12 # The contents of this file are subject to the terms of either the GNU
1672.13 # General Public License Version 2 only ("GPL") or the Common
1672.14 @@ -12,9 +15,9 @@
1672.15 # specific language governing permissions and limitations under the
1672.16 # License. When distributing the software, include this License Header
1672.17 # Notice in each file and include the License file at
1672.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1672.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1672.20 # particular file as subject to the "Classpath" exception as provided
1672.21 -# by Sun in the GPL Version 2 section of the License file that
1672.22 +# by Oracle in the GPL Version 2 section of the License file that
1672.23 # accompanied this code. If applicable, add the following below the
1672.24 # License Header, with the fields enclosed by brackets [] replaced by
1672.25 # your own identifying information:
1672.26 @@ -37,4 +40,4 @@
1672.27 # Version 2 license, then the option applies only if the new code is
1672.28 # made subject to such option by the copyright holder.
1672.29 javac.compilerargs=-Xlint:unchecked
1672.30 -javac.source=1.5
1672.31 +javac.source=1.6
1673.1 --- a/visualweb.outline/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1673.2 +++ b/visualweb.outline/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1673.3 @@ -2,7 +2,10 @@
1673.4 <!--
1673.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1673.6
1673.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1673.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1673.9 +
1673.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1673.11 +Other names may be trademarks of their respective owners.
1673.12
1673.13
1673.14 The contents of this file are subject to the terms of either the GNU
1673.15 @@ -15,9 +18,9 @@
1673.16 specific language governing permissions and limitations under the
1673.17 License. When distributing the software, include this License Header
1673.18 Notice in each file and include the License file at
1673.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1673.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1673.21 particular file as subject to the "Classpath" exception as provided
1673.22 -by Sun in the GPL Version 2 section of the License file that
1673.23 +by Oracle in the GPL Version 2 section of the License file that
1673.24 accompanied this code. If applicable, add the following below the
1673.25 License Header, with the fields enclosed by brackets [] replaced by
1673.26 your own identifying information:
1673.27 @@ -144,7 +147,15 @@
1673.28 <build-prerequisite/>
1673.29 <compile-dependency/>
1673.30 <run-dependency>
1673.31 - <specification-version>6.8</specification-version>
1673.32 + <specification-version>8.0</specification-version>
1673.33 + </run-dependency>
1673.34 + </dependency>
1673.35 + <dependency>
1673.36 + <code-name-base>org.openide.util.lookup</code-name-base>
1673.37 + <build-prerequisite/>
1673.38 + <compile-dependency/>
1673.39 + <run-dependency>
1673.40 + <specification-version>8.0</specification-version>
1673.41 </run-dependency>
1673.42 </dependency>
1673.43 <dependency>
1674.1 --- a/visualweb.outline/src/org/netbeans/modules/visualweb/outline/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1674.2 +++ b/visualweb.outline/src/org/netbeans/modules/visualweb/outline/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1674.3 @@ -1,7 +1,10 @@
1674.4 #
1674.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1674.6 #
1674.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1674.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1674.9 +#
1674.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1674.11 +# Other names may be trademarks of their respective owners.
1674.12 #
1674.13 # The contents of this file are subject to the terms of either the GNU
1674.14 # General Public License Version 2 only ("GPL") or the Common
1674.15 @@ -13,9 +16,9 @@
1674.16 # specific language governing permissions and limitations under the
1674.17 # License. When distributing the software, include this License Header
1674.18 # Notice in each file and include the License file at
1674.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1674.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1674.21 # particular file as subject to the "Classpath" exception as provided
1674.22 -# by Sun in the GPL Version 2 section of the License file that
1674.23 +# by Oracle in the GPL Version 2 section of the License file that
1674.24 # accompanied this code. If applicable, add the following below the
1674.25 # License Header, with the fields enclosed by brackets [] replaced by
1674.26 # your own identifying information:
1675.1 --- a/visualweb.outline/src/org/netbeans/modules/visualweb/outline/InsyncAccessor.java Fri Jul 16 11:47:36 2010 -0400
1675.2 +++ b/visualweb.outline/src/org/netbeans/modules/visualweb/outline/InsyncAccessor.java Fri Jul 16 14:21:50 2010 -0400
1675.3 @@ -1,7 +1,10 @@
1675.4 /*
1675.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1675.6 *
1675.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1675.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1675.9 + *
1675.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1675.11 + * Other names may be trademarks of their respective owners.
1675.12 *
1675.13 * The contents of this file are subject to the terms of either the GNU
1675.14 * General Public License Version 2 only ("GPL") or the Common
1675.15 @@ -13,9 +16,9 @@
1675.16 * specific language governing permissions and limitations under the
1675.17 * License. When distributing the software, include this License Header
1675.18 * Notice in each file and include the License file at
1675.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1675.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1675.21 * particular file as subject to the "Classpath" exception as provided
1675.22 - * by Sun in the GPL Version 2 section of the License file that
1675.23 + * by Oracle in the GPL Version 2 section of the License file that
1675.24 * accompanied this code. If applicable, add the following below the
1675.25 * License Header, with the fields enclosed by brackets [] replaced by
1675.26 * your own identifying information:
1676.1 --- a/visualweb.outline/src/org/netbeans/modules/visualweb/outline/OutlineManagerListener.java Fri Jul 16 11:47:36 2010 -0400
1676.2 +++ b/visualweb.outline/src/org/netbeans/modules/visualweb/outline/OutlineManagerListener.java Fri Jul 16 14:21:50 2010 -0400
1676.3 @@ -1,7 +1,10 @@
1676.4 /*
1676.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1676.6 *
1676.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1676.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1676.9 + *
1676.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1676.11 + * Other names may be trademarks of their respective owners.
1676.12 *
1676.13 * The contents of this file are subject to the terms of either the GNU
1676.14 * General Public License Version 2 only ("GPL") or the Common
1676.15 @@ -13,9 +16,9 @@
1676.16 * specific language governing permissions and limitations under the
1676.17 * License. When distributing the software, include this License Header
1676.18 * Notice in each file and include the License file at
1676.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1676.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1676.21 * particular file as subject to the "Classpath" exception as provided
1676.22 - * by Sun in the GPL Version 2 section of the License file that
1676.23 + * by Oracle in the GPL Version 2 section of the License file that
1676.24 * accompanied this code. If applicable, add the following below the
1676.25 * License Header, with the fields enclosed by brackets [] replaced by
1676.26 * your own identifying information:
1677.1 --- a/visualweb.outline/src/org/netbeans/modules/visualweb/outline/OutlinePanel.java Fri Jul 16 11:47:36 2010 -0400
1677.2 +++ b/visualweb.outline/src/org/netbeans/modules/visualweb/outline/OutlinePanel.java Fri Jul 16 14:21:50 2010 -0400
1677.3 @@ -1,7 +1,10 @@
1677.4 /*
1677.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1677.6 *
1677.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1677.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1677.9 + *
1677.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1677.11 + * Other names may be trademarks of their respective owners.
1677.12 *
1677.13 * The contents of this file are subject to the terms of either the GNU
1677.14 * General Public License Version 2 only ("GPL") or the Common
1677.15 @@ -13,9 +16,9 @@
1677.16 * specific language governing permissions and limitations under the
1677.17 * License. When distributing the software, include this License Header
1677.18 * Notice in each file and include the License file at
1677.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1677.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1677.21 * particular file as subject to the "Classpath" exception as provided
1677.22 - * by Sun in the GPL Version 2 section of the License file that
1677.23 + * by Oracle in the GPL Version 2 section of the License file that
1677.24 * accompanied this code. If applicable, add the following below the
1677.25 * License Header, with the fields enclosed by brackets [] replaced by
1677.26 * your own identifying information:
1678.1 --- a/visualweb.outline/src/org/netbeans/modules/visualweb/outline/OutlinePanelProvider.java Fri Jul 16 11:47:36 2010 -0400
1678.2 +++ b/visualweb.outline/src/org/netbeans/modules/visualweb/outline/OutlinePanelProvider.java Fri Jul 16 14:21:50 2010 -0400
1678.3 @@ -1,7 +1,10 @@
1678.4 /*
1678.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1678.6 *
1678.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1678.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1678.9 + *
1678.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1678.11 + * Other names may be trademarks of their respective owners.
1678.12 *
1678.13 * The contents of this file are subject to the terms of either the GNU
1678.14 * General Public License Version 2 only ("GPL") or the Common
1678.15 @@ -13,9 +16,9 @@
1678.16 * specific language governing permissions and limitations under the
1678.17 * License. When distributing the software, include this License Header
1678.18 * Notice in each file and include the License file at
1678.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1678.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1678.21 * particular file as subject to the "Classpath" exception as provided
1678.22 - * by Sun in the GPL Version 2 section of the License file that
1678.23 + * by Oracle in the GPL Version 2 section of the License file that
1678.24 * accompanied this code. If applicable, add the following below the
1678.25 * License Header, with the fields enclosed by brackets [] replaced by
1678.26 * your own identifying information:
1679.1 --- a/visualweb.outline/src/org/netbeans/modules/visualweb/outline/OutlineUtilities.java Fri Jul 16 11:47:36 2010 -0400
1679.2 +++ b/visualweb.outline/src/org/netbeans/modules/visualweb/outline/OutlineUtilities.java Fri Jul 16 14:21:50 2010 -0400
1679.3 @@ -1,7 +1,10 @@
1679.4 /*
1679.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1679.6 *
1679.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1679.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1679.9 + *
1679.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1679.11 + * Other names may be trademarks of their respective owners.
1679.12 *
1679.13 * The contents of this file are subject to the terms of either the GNU
1679.14 * General Public License Version 2 only ("GPL") or the Common
1679.15 @@ -13,9 +16,9 @@
1679.16 * specific language governing permissions and limitations under the
1679.17 * License. When distributing the software, include this License Header
1679.18 * Notice in each file and include the License file at
1679.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1679.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1679.21 * particular file as subject to the "Classpath" exception as provided
1679.22 - * by Sun in the GPL Version 2 section of the License file that
1679.23 + * by Oracle in the GPL Version 2 section of the License file that
1679.24 * accompanied this code. If applicable, add the following below the
1679.25 * License Header, with the fields enclosed by brackets [] replaced by
1679.26 * your own identifying information:
1680.1 --- a/visualweb.outline/src/org/netbeans/modules/visualweb/outline/api/OutlineSelector.java Fri Jul 16 11:47:36 2010 -0400
1680.2 +++ b/visualweb.outline/src/org/netbeans/modules/visualweb/outline/api/OutlineSelector.java Fri Jul 16 14:21:50 2010 -0400
1680.3 @@ -1,8 +1,11 @@
1680.4 /*
1680.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1680.6 - *
1680.7 - * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
1680.8 - *
1680.9 + *
1680.10 + * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
1680.11 + *
1680.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1680.13 + * Other names may be trademarks of their respective owners.
1680.14 + *
1680.15 * The contents of this file are subject to the terms of either the GNU
1680.16 * General Public License Version 2 only ("GPL") or the Common
1680.17 * Development and Distribution License("CDDL") (collectively, the
1680.18 @@ -13,9 +16,9 @@
1680.19 * specific language governing permissions and limitations under the
1680.20 * License. When distributing the software, include this License Header
1680.21 * Notice in each file and include the License file at
1680.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1680.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1680.24 * particular file as subject to the "Classpath" exception as provided
1680.25 - * by Sun in the GPL Version 2 section of the License file that
1680.26 + * by Oracle in the GPL Version 2 section of the License file that
1680.27 * accompanied this code. If applicable, add the following below the
1680.28 * License Header, with the fields enclosed by brackets [] replaced by
1680.29 * your own identifying information:
1681.1 --- a/visualweb.outline/src/org/netbeans/modules/visualweb/outline/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1681.2 +++ b/visualweb.outline/src/org/netbeans/modules/visualweb/outline/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1681.3 @@ -1,7 +1,10 @@
1681.4 #
1681.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1681.6 #
1681.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1681.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1681.9 +#
1681.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1681.11 +# Other names may be trademarks of their respective owners.
1681.12 #
1681.13 # The contents of this file are subject to the terms of either the GNU
1681.14 # General Public License Version 2 only ("GPL") or the Common
1681.15 @@ -13,9 +16,9 @@
1681.16 # specific language governing permissions and limitations under the
1681.17 # License. When distributing the software, include this License Header
1681.18 # Notice in each file and include the License file at
1681.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1681.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1681.21 # particular file as subject to the "Classpath" exception as provided
1681.22 -# by Sun in the GPL Version 2 section of the License file that
1681.23 +# by Oracle in the GPL Version 2 section of the License file that
1681.24 # accompanied this code. If applicable, add the following below the
1681.25 # License Header, with the fields enclosed by brackets [] replaced by
1681.26 # your own identifying information:
1682.1 --- a/visualweb.outline/src/org/netbeans/modules/visualweb/outline/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
1682.2 +++ b/visualweb.outline/src/org/netbeans/modules/visualweb/outline/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
1682.3 @@ -2,7 +2,10 @@
1682.4 <!--
1682.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1682.6
1682.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1682.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1682.9 +
1682.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1682.11 +Other names may be trademarks of their respective owners.
1682.12
1682.13
1682.14 The contents of this file are subject to the terms of either the GNU
1682.15 @@ -15,9 +18,9 @@
1682.16 specific language governing permissions and limitations under the
1682.17 License. When distributing the software, include this License Header
1682.18 Notice in each file and include the License file at
1682.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1682.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1682.21 particular file as subject to the "Classpath" exception as provided
1682.22 -by Sun in the GPL Version 2 section of the License file that
1682.23 +by Oracle in the GPL Version 2 section of the License file that
1682.24 accompanied this code. If applicable, add the following below the
1682.25 License Header, with the fields enclosed by brackets [] replaced by
1682.26 your own identifying information:
1683.1 --- a/visualweb.palette/build.xml Fri Jul 16 11:47:36 2010 -0400
1683.2 +++ b/visualweb.palette/build.xml Fri Jul 16 14:21:50 2010 -0400
1683.3 @@ -2,7 +2,10 @@
1683.4 <!--
1683.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1683.6
1683.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1683.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1683.9 +
1683.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1683.11 +Other names may be trademarks of their respective owners.
1683.12
1683.13
1683.14 The contents of this file are subject to the terms of either the GNU
1683.15 @@ -15,9 +18,9 @@
1683.16 specific language governing permissions and limitations under the
1683.17 License. When distributing the software, include this License Header
1683.18 Notice in each file and include the License file at
1683.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1683.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1683.21 particular file as subject to the "Classpath" exception as provided
1683.22 -by Sun in the GPL Version 2 section of the License file that
1683.23 +by Oracle in the GPL Version 2 section of the License file that
1683.24 accompanied this code. If applicable, add the following below the
1683.25 License Header, with the fields enclosed by brackets [] replaced by
1683.26 your own identifying information:
1684.1 --- a/visualweb.palette/manifest.mf Fri Jul 16 11:47:36 2010 -0400
1684.2 +++ b/visualweb.palette/manifest.mf Fri Jul 16 14:21:50 2010 -0400
1684.3 @@ -2,5 +2,5 @@
1684.4 OpenIDE-Module: org.netbeans.modules.visualweb.palette
1684.5 OpenIDE-Module-Layer: org/netbeans/modules/visualweb/palette/layer.xml
1684.6 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/visualweb/palette/Bundle.properties
1684.7 -OpenIDE-Module-Specification-Version: 2.6
1684.8 +OpenIDE-Module-Specification-Version: 2.7
1684.9 AutoUpdate-Show-In-Client: false
1685.1 --- a/visualweb.palette/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1685.2 +++ b/visualweb.palette/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1685.3 @@ -1,6 +1,9 @@
1685.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1685.5 #
1685.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1685.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1685.8 +#
1685.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1685.10 +# Other names may be trademarks of their respective owners.
1685.11 #
1685.12 # The contents of this file are subject to the terms of either the GNU
1685.13 # General Public License Version 2 only ("GPL") or the Common
1685.14 @@ -12,9 +15,9 @@
1685.15 # specific language governing permissions and limitations under the
1685.16 # License. When distributing the software, include this License Header
1685.17 # Notice in each file and include the License file at
1685.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1685.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1685.20 # particular file as subject to the "Classpath" exception as provided
1685.21 -# by Sun in the GPL Version 2 section of the License file that
1685.22 +# by Oracle in the GPL Version 2 section of the License file that
1685.23 # accompanied this code. If applicable, add the following below the
1685.24 # License Header, with the fields enclosed by brackets [] replaced by
1685.25 # your own identifying information:
1685.26 @@ -38,4 +41,4 @@
1685.27 # made subject to such option by the copyright holder.
1685.28
1685.29 javac.compilerargs=-Xlint:unchecked
1685.30 -javac.source=1.5
1685.31 +javac.source=1.6
1686.1 --- a/visualweb.palette/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1686.2 +++ b/visualweb.palette/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1686.3 @@ -2,7 +2,10 @@
1686.4 <!--
1686.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1686.6
1686.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1686.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1686.9 +
1686.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1686.11 +Other names may be trademarks of their respective owners.
1686.12
1686.13
1686.14 The contents of this file are subject to the terms of either the GNU
1686.15 @@ -15,9 +18,9 @@
1686.16 specific language governing permissions and limitations under the
1686.17 License. When distributing the software, include this License Header
1686.18 Notice in each file and include the License file at
1686.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1686.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1686.21 particular file as subject to the "Classpath" exception as provided
1686.22 -by Sun in the GPL Version 2 section of the License file that
1686.23 +by Oracle in the GPL Version 2 section of the License file that
1686.24 accompanied this code. If applicable, add the following below the
1686.25 License Header, with the fields enclosed by brackets [] replaced by
1686.26 your own identifying information:
1686.27 @@ -60,8 +63,8 @@
1686.28 <build-prerequisite/>
1686.29 <compile-dependency/>
1686.30 <run-dependency>
1686.31 - <release-version>1</release-version>
1686.32 - <specification-version>1.27</specification-version>
1686.33 + <release-version>2</release-version>
1686.34 + <specification-version>2.1</specification-version>
1686.35 </run-dependency>
1686.36 </dependency>
1686.37 <dependency>
1686.38 @@ -143,7 +146,15 @@
1686.39 <build-prerequisite/>
1686.40 <compile-dependency/>
1686.41 <run-dependency>
1686.42 - <specification-version>7.15</specification-version>
1686.43 + <specification-version>8.0</specification-version>
1686.44 + </run-dependency>
1686.45 + </dependency>
1686.46 + <dependency>
1686.47 + <code-name-base>org.openide.util.lookup</code-name-base>
1686.48 + <build-prerequisite/>
1686.49 + <compile-dependency/>
1686.50 + <run-dependency>
1686.51 + <specification-version>8.0</specification-version>
1686.52 </run-dependency>
1686.53 </dependency>
1686.54 <dependency>
1687.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1687.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1687.3 @@ -1,6 +1,9 @@
1687.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1687.5 #
1687.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1687.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1687.8 +#
1687.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1687.10 +# Other names may be trademarks of their respective owners.
1687.11 #
1687.12 # The contents of this file are subject to the terms of either the GNU
1687.13 # General Public License Version 2 only ("GPL") or the Common
1687.14 @@ -12,9 +15,9 @@
1687.15 # specific language governing permissions and limitations under the
1687.16 # License. When distributing the software, include this License Header
1687.17 # Notice in each file and include the License file at
1687.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1687.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1687.20 # particular file as subject to the "Classpath" exception as provided
1687.21 -# by Sun in the GPL Version 2 section of the License file that
1687.22 +# by Oracle in the GPL Version 2 section of the License file that
1687.23 # accompanied this code. If applicable, add the following below the
1687.24 # License Header, with the fields enclosed by brackets [] replaced by
1687.25 # your own identifying information:
1688.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/PaletteItemDataObject.java Fri Jul 16 11:47:36 2010 -0400
1688.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/PaletteItemDataObject.java Fri Jul 16 14:21:50 2010 -0400
1688.3 @@ -1,7 +1,10 @@
1688.4 /*
1688.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1688.6 *
1688.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1688.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1688.9 + *
1688.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1688.11 + * Other names may be trademarks of their respective owners.
1688.12 *
1688.13 * The contents of this file are subject to the terms of either the GNU
1688.14 * General Public License Version 2 only ("GPL") or the Common
1688.15 @@ -13,9 +16,9 @@
1688.16 * specific language governing permissions and limitations under the
1688.17 * License. When distributing the software, include this License Header
1688.18 * Notice in each file and include the License file at
1688.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1688.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1688.21 * particular file as subject to the "Classpath" exception as provided
1688.22 - * by Sun in the GPL Version 2 section of the License file that
1688.23 + * by Oracle in the GPL Version 2 section of the License file that
1688.24 * accompanied this code. If applicable, add the following below the
1688.25 * License Header, with the fields enclosed by brackets [] replaced by
1688.26 * your own identifying information:
1689.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/api/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1689.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/api/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1689.3 @@ -1,6 +1,9 @@
1689.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1689.5 #
1689.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1689.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1689.8 +#
1689.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1689.10 +# Other names may be trademarks of their respective owners.
1689.11 #
1689.12 # The contents of this file are subject to the terms of either the GNU
1689.13 # General Public License Version 2 only ("GPL") or the Common
1689.14 @@ -12,9 +15,9 @@
1689.15 # specific language governing permissions and limitations under the
1689.16 # License. When distributing the software, include this License Header
1689.17 # Notice in each file and include the License file at
1689.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1689.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1689.20 # particular file as subject to the "Classpath" exception as provided
1689.21 -# by Sun in the GPL Version 2 section of the License file that
1689.22 +# by Oracle in the GPL Version 2 section of the License file that
1689.23 # accompanied this code. If applicable, add the following below the
1689.24 # License Header, with the fields enclosed by brackets [] replaced by
1689.25 # your own identifying information:
1690.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/api/CodeClipDragAndDropHandler.java Fri Jul 16 11:47:36 2010 -0400
1690.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/api/CodeClipDragAndDropHandler.java Fri Jul 16 14:21:50 2010 -0400
1690.3 @@ -1,7 +1,10 @@
1690.4 /*
1690.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1690.6 *
1690.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1690.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1690.9 + *
1690.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1690.11 + * Other names may be trademarks of their respective owners.
1690.12 *
1690.13 * The contents of this file are subject to the terms of either the GNU
1690.14 * General Public License Version 2 only ("GPL") or the Common
1690.15 @@ -13,9 +16,9 @@
1690.16 * specific language governing permissions and limitations under the
1690.17 * License. When distributing the software, include this License Header
1690.18 * Notice in each file and include the License file at
1690.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1690.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1690.21 * particular file as subject to the "Classpath" exception as provided
1690.22 - * by Sun in the GPL Version 2 section of the License file that
1690.23 + * by Oracle in the GPL Version 2 section of the License file that
1690.24 * accompanied this code. If applicable, add the following below the
1690.25 * License Header, with the fields enclosed by brackets [] replaced by
1690.26 * your own identifying information:
1691.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/api/CodeClipPaletteActions.java Fri Jul 16 11:47:36 2010 -0400
1691.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/api/CodeClipPaletteActions.java Fri Jul 16 14:21:50 2010 -0400
1691.3 @@ -1,7 +1,10 @@
1691.4 /*
1691.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1691.6 *
1691.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1691.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1691.9 + *
1691.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1691.11 + * Other names may be trademarks of their respective owners.
1691.12 *
1691.13 * The contents of this file are subject to the terms of either the GNU
1691.14 * General Public License Version 2 only ("GPL") or the Common
1691.15 @@ -13,9 +16,9 @@
1691.16 * specific language governing permissions and limitations under the
1691.17 * License. When distributing the software, include this License Header
1691.18 * Notice in each file and include the License file at
1691.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1691.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1691.21 * particular file as subject to the "Classpath" exception as provided
1691.22 - * by Sun in the GPL Version 2 section of the License file that
1691.23 + * by Oracle in the GPL Version 2 section of the License file that
1691.24 * accompanied this code. If applicable, add the following below the
1691.25 * License Header, with the fields enclosed by brackets [] replaced by
1691.26 * your own identifying information:
1692.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/api/PaletteItemInfoCookie.java Fri Jul 16 11:47:36 2010 -0400
1692.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/api/PaletteItemInfoCookie.java Fri Jul 16 14:21:50 2010 -0400
1692.3 @@ -1,7 +1,10 @@
1692.4 /*
1692.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1692.6 *
1692.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1692.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1692.9 + *
1692.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1692.11 + * Other names may be trademarks of their respective owners.
1692.12 *
1692.13 * The contents of this file are subject to the terms of either the GNU
1692.14 * General Public License Version 2 only ("GPL") or the Common
1692.15 @@ -13,9 +16,9 @@
1692.16 * specific language governing permissions and limitations under the
1692.17 * License. When distributing the software, include this License Header
1692.18 * Notice in each file and include the License file at
1692.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1692.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1692.21 * particular file as subject to the "Classpath" exception as provided
1692.22 - * by Sun in the GPL Version 2 section of the License file that
1692.23 + * by Oracle in the GPL Version 2 section of the License file that
1692.24 * accompanied this code. If applicable, add the following below the
1692.25 * License Header, with the fields enclosed by brackets [] replaced by
1692.26 * your own identifying information:
1693.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/ActiveEditorDropCodeClipProvider.java Fri Jul 16 11:47:36 2010 -0400
1693.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/ActiveEditorDropCodeClipProvider.java Fri Jul 16 14:21:50 2010 -0400
1693.3 @@ -1,7 +1,10 @@
1693.4 /*
1693.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1693.6 *
1693.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1693.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1693.9 + *
1693.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1693.11 + * Other names may be trademarks of their respective owners.
1693.12 *
1693.13 * The contents of this file are subject to the terms of either the GNU
1693.14 * General Public License Version 2 only ("GPL") or the Common
1693.15 @@ -13,9 +16,9 @@
1693.16 * specific language governing permissions and limitations under the
1693.17 * License. When distributing the software, include this License Header
1693.18 * Notice in each file and include the License file at
1693.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1693.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1693.21 * particular file as subject to the "Classpath" exception as provided
1693.22 - * by Sun in the GPL Version 2 section of the License file that
1693.23 + * by Oracle in the GPL Version 2 section of the License file that
1693.24 * accompanied this code. If applicable, add the following below the
1693.25 * License Header, with the fields enclosed by brackets [] replaced by
1693.26 * your own identifying information:
1694.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1694.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1694.3 @@ -1,7 +1,10 @@
1694.4
1694.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1694.6 #
1694.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1694.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1694.9 +#
1694.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1694.11 +# Other names may be trademarks of their respective owners.
1694.12 #
1694.13 # The contents of this file are subject to the terms of either the GNU
1694.14 # General Public License Version 2 only ("GPL") or the Common
1694.15 @@ -13,9 +16,9 @@
1694.16 # specific language governing permissions and limitations under the
1694.17 # License. When distributing the software, include this License Header
1694.18 # Notice in each file and include the License file at
1694.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1694.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1694.21 # particular file as subject to the "Classpath" exception as provided
1694.22 -# by Sun in the GPL Version 2 section of the License file that
1694.23 +# by Oracle in the GPL Version 2 section of the License file that
1694.24 # accompanied this code. If applicable, add the following below the
1694.25 # License Header, with the fields enclosed by brackets [] replaced by
1694.26 # your own identifying information:
1695.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipEnvironmentProvider.java Fri Jul 16 11:47:36 2010 -0400
1695.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipEnvironmentProvider.java Fri Jul 16 14:21:50 2010 -0400
1695.3 @@ -1,7 +1,10 @@
1695.4 /*
1695.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1695.6 *
1695.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1695.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1695.9 + *
1695.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1695.11 + * Other names may be trademarks of their respective owners.
1695.12 *
1695.13 * The contents of this file are subject to the terms of either the GNU
1695.14 * General Public License Version 2 only ("GPL") or the Common
1695.15 @@ -13,9 +16,9 @@
1695.16 * specific language governing permissions and limitations under the
1695.17 * License. When distributing the software, include this License Header
1695.18 * Notice in each file and include the License file at
1695.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1695.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1695.21 * particular file as subject to the "Classpath" exception as provided
1695.22 - * by Sun in the GPL Version 2 section of the License file that
1695.23 + * by Oracle in the GPL Version 2 section of the License file that
1695.24 * accompanied this code. If applicable, add the following below the
1695.25 * License Header, with the fields enclosed by brackets [] replaced by
1695.26 * your own identifying information:
1696.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipHandler.java Fri Jul 16 11:47:36 2010 -0400
1696.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipHandler.java Fri Jul 16 14:21:50 2010 -0400
1696.3 @@ -1,7 +1,10 @@
1696.4 /*
1696.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1696.6 *
1696.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1696.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1696.9 + *
1696.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1696.11 + * Other names may be trademarks of their respective owners.
1696.12 *
1696.13 * The contents of this file are subject to the terms of either the GNU
1696.14 * General Public License Version 2 only ("GPL") or the Common
1696.15 @@ -13,9 +16,9 @@
1696.16 * specific language governing permissions and limitations under the
1696.17 * License. When distributing the software, include this License Header
1696.18 * Notice in each file and include the License file at
1696.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1696.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1696.21 * particular file as subject to the "Classpath" exception as provided
1696.22 - * by Sun in the GPL Version 2 section of the License file that
1696.23 + * by Oracle in the GPL Version 2 section of the License file that
1696.24 * accompanied this code. If applicable, add the following below the
1696.25 * License Header, with the fields enclosed by brackets [] replaced by
1696.26 * your own identifying information:
1697.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipItemNode.java Fri Jul 16 11:47:36 2010 -0400
1697.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipItemNode.java Fri Jul 16 14:21:50 2010 -0400
1697.3 @@ -1,7 +1,10 @@
1697.4 /*
1697.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1697.6 *
1697.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1697.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1697.9 + *
1697.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1697.11 + * Other names may be trademarks of their respective owners.
1697.12 *
1697.13 * The contents of this file are subject to the terms of either the GNU
1697.14 * General Public License Version 2 only ("GPL") or the Common
1697.15 @@ -13,9 +16,9 @@
1697.16 * specific language governing permissions and limitations under the
1697.17 * License. When distributing the software, include this License Header
1697.18 * Notice in each file and include the License file at
1697.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1697.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1697.21 * particular file as subject to the "Classpath" exception as provided
1697.22 - * by Sun in the GPL Version 2 section of the License file that
1697.23 + * by Oracle in the GPL Version 2 section of the License file that
1697.24 * accompanied this code. If applicable, add the following below the
1697.25 * License Header, with the fields enclosed by brackets [] replaced by
1697.26 * your own identifying information:
1698.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipUtilities.java Fri Jul 16 11:47:36 2010 -0400
1698.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipUtilities.java Fri Jul 16 14:21:50 2010 -0400
1698.3 @@ -1,7 +1,10 @@
1698.4 /*
1698.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1698.6 *
1698.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1698.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1698.9 + *
1698.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1698.11 + * Other names may be trademarks of their respective owners.
1698.12 *
1698.13 * The contents of this file are subject to the terms of either the GNU
1698.14 * General Public License Version 2 only ("GPL") or the Common
1698.15 @@ -13,9 +16,9 @@
1698.16 * specific language governing permissions and limitations under the
1698.17 * License. When distributing the software, include this License Header
1698.18 * Notice in each file and include the License file at
1698.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1698.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1698.21 * particular file as subject to the "Classpath" exception as provided
1698.22 - * by Sun in the GPL Version 2 section of the License file that
1698.23 + * by Oracle in the GPL Version 2 section of the License file that
1698.24 * accompanied this code. If applicable, add the following below the
1698.25 * License Header, with the fields enclosed by brackets [] replaced by
1698.26 * your own identifying information:
1699.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipViewerPanel.java Fri Jul 16 11:47:36 2010 -0400
1699.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipViewerPanel.java Fri Jul 16 14:21:50 2010 -0400
1699.3 @@ -1,7 +1,10 @@
1699.4 /*
1699.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1699.6 *
1699.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1699.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1699.9 + *
1699.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1699.11 + * Other names may be trademarks of their respective owners.
1699.12 *
1699.13 * The contents of this file are subject to the terms of either the GNU
1699.14 * General Public License Version 2 only ("GPL") or the Common
1699.15 @@ -13,9 +16,9 @@
1699.16 * specific language governing permissions and limitations under the
1699.17 * License. When distributing the software, include this License Header
1699.18 * Notice in each file and include the License file at
1699.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1699.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1699.21 * particular file as subject to the "Classpath" exception as provided
1699.22 - * by Sun in the GPL Version 2 section of the License file that
1699.23 + * by Oracle in the GPL Version 2 section of the License file that
1699.24 * accompanied this code. If applicable, add the following below the
1699.25 * License Header, with the fields enclosed by brackets [] replaced by
1699.26 * your own identifying information:
1700.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipsParametersDialog.java Fri Jul 16 11:47:36 2010 -0400
1700.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/CodeClipsParametersDialog.java Fri Jul 16 14:21:50 2010 -0400
1700.3 @@ -1,7 +1,10 @@
1700.4 /*
1700.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1700.6 *
1700.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1700.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1700.9 + *
1700.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1700.11 + * Other names may be trademarks of their respective owners.
1700.12 *
1700.13 * The contents of this file are subject to the terms of either the GNU
1700.14 * General Public License Version 2 only ("GPL") or the Common
1700.15 @@ -13,9 +16,9 @@
1700.16 * specific language governing permissions and limitations under the
1700.17 * License. When distributing the software, include this License Header
1700.18 * Notice in each file and include the License file at
1700.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1700.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1700.21 * particular file as subject to the "Classpath" exception as provided
1700.22 - * by Sun in the GPL Version 2 section of the License file that
1700.23 + * by Oracle in the GPL Version 2 section of the License file that
1700.24 * accompanied this code. If applicable, add the following below the
1700.25 * License Header, with the fields enclosed by brackets [] replaced by
1700.26 * your own identifying information:
1701.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1701.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1701.3 @@ -1,6 +1,9 @@
1701.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1701.5 #
1701.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1701.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1701.8 +#
1701.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1701.10 +# Other names may be trademarks of their respective owners.
1701.11 #
1701.12 # The contents of this file are subject to the terms of either the GNU
1701.13 # General Public License Version 2 only ("GPL") or the Common
1701.14 @@ -12,9 +15,9 @@
1701.15 # specific language governing permissions and limitations under the
1701.16 # License. When distributing the software, include this License Header
1701.17 # Notice in each file and include the License file at
1701.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1701.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1701.20 # particular file as subject to the "Classpath" exception as provided
1701.21 -# by Sun in the GPL Version 2 section of the License file that
1701.22 +# by Oracle in the GPL Version 2 section of the License file that
1701.23 # accompanied this code. If applicable, add the following below the
1701.24 # License Header, with the fields enclosed by brackets [] replaced by
1701.25 # your own identifying information:
1702.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/resources/TestingClip.xml Fri Jul 16 11:47:36 2010 -0400
1702.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/resources/TestingClip.xml Fri Jul 16 14:21:50 2010 -0400
1702.3 @@ -2,7 +2,10 @@
1702.4 <!--
1702.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1702.6
1702.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1702.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1702.9 +
1702.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1702.11 +Other names may be trademarks of their respective owners.
1702.12
1702.13
1702.14 The contents of this file are subject to the terms of either the GNU
1702.15 @@ -15,9 +18,9 @@
1702.16 specific language governing permissions and limitations under the
1702.17 License. When distributing the software, include this License Header
1702.18 Notice in each file and include the License file at
1702.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1702.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1702.21 particular file as subject to the "Classpath" exception as provided
1702.22 -by Sun in the GPL Version 2 section of the License file that
1702.23 +by Oracle in the GPL Version 2 section of the License file that
1702.24 accompanied this code. If applicable, add the following below the
1702.25 License Header, with the fields enclosed by brackets [] replaced by
1702.26 your own identifying information:
1703.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/resources/codeclip-palette-item-1_0.dtd Fri Jul 16 11:47:36 2010 -0400
1703.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/codeclips/resources/codeclip-palette-item-1_0.dtd Fri Jul 16 14:21:50 2010 -0400
1703.3 @@ -2,7 +2,10 @@
1703.4 <!--
1703.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1703.6
1703.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
1703.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1703.9 +
1703.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1703.11 +Other names may be trademarks of their respective owners.
1703.12
1703.13
1703.14 The contents of this file are subject to the terms of either the GNU
1703.15 @@ -15,9 +18,9 @@
1703.16 specific language governing permissions and limitations under the
1703.17 License. When distributing the software, include this License Header
1703.18 Notice in each file and include the License file at
1703.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1703.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1703.21 particular file as subject to the "Classpath" exception as provided
1703.22 -by Sun in the GPL Version 2 section of the License file that
1703.23 +by Oracle in the GPL Version 2 section of the License file that
1703.24 accompanied this code. If applicable, add the following below the
1703.25 License Header, with the fields enclosed by brackets [] replaced by
1703.26 your own identifying information:
1704.1 --- a/visualweb.palette/src/org/netbeans/modules/visualweb/palette/layer.xml Fri Jul 16 11:47:36 2010 -0400
1704.2 +++ b/visualweb.palette/src/org/netbeans/modules/visualweb/palette/layer.xml Fri Jul 16 14:21:50 2010 -0400
1704.3 @@ -2,7 +2,10 @@
1704.4 <!--
1704.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1704.6
1704.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1704.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1704.9 +
1704.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1704.11 +Other names may be trademarks of their respective owners.
1704.12
1704.13
1704.14 The contents of this file are subject to the terms of either the GNU
1704.15 @@ -15,9 +18,9 @@
1704.16 specific language governing permissions and limitations under the
1704.17 License. When distributing the software, include this License Header
1704.18 Notice in each file and include the License file at
1704.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1704.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1704.21 particular file as subject to the "Classpath" exception as provided
1704.22 -by Sun in the GPL Version 2 section of the License file that
1704.23 +by Oracle in the GPL Version 2 section of the License file that
1704.24 accompanied this code. If applicable, add the following below the
1704.25 License Header, with the fields enclosed by brackets [] replaced by
1704.26 your own identifying information:
1705.1 --- a/visualweb.project.jsf/build.xml Fri Jul 16 11:47:36 2010 -0400
1705.2 +++ b/visualweb.project.jsf/build.xml Fri Jul 16 14:21:50 2010 -0400
1705.3 @@ -2,7 +2,10 @@
1705.4 <!--
1705.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1705.6
1705.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1705.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1705.9 +
1705.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1705.11 +Other names may be trademarks of their respective owners.
1705.12
1705.13
1705.14 The contents of this file are subject to the terms of either the GNU
1705.15 @@ -15,9 +18,9 @@
1705.16 specific language governing permissions and limitations under the
1705.17 License. When distributing the software, include this License Header
1705.18 Notice in each file and include the License file at
1705.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1705.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1705.21 particular file as subject to the "Classpath" exception as provided
1705.22 -by Sun in the GPL Version 2 section of the License file that
1705.23 +by Oracle in the GPL Version 2 section of the License file that
1705.24 accompanied this code. If applicable, add the following below the
1705.25 License Header, with the fields enclosed by brackets [] replaced by
1705.26 your own identifying information:
1706.1 --- a/visualweb.project.jsf/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1706.2 +++ b/visualweb.project.jsf/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1706.3 @@ -1,6 +1,9 @@
1706.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1706.5 #
1706.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1706.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1706.8 +#
1706.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1706.10 +# Other names may be trademarks of their respective owners.
1706.11 #
1706.12 # The contents of this file are subject to the terms of either the GNU
1706.13 # General Public License Version 2 only ("GPL") or the Common
1706.14 @@ -12,9 +15,9 @@
1706.15 # specific language governing permissions and limitations under the
1706.16 # License. When distributing the software, include this License Header
1706.17 # Notice in each file and include the License file at
1706.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1706.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1706.20 # particular file as subject to the "Classpath" exception as provided
1706.21 -# by Sun in the GPL Version 2 section of the License file that
1706.22 +# by Oracle in the GPL Version 2 section of the License file that
1706.23 # accompanied this code. If applicable, add the following below the
1706.24 # License Header, with the fields enclosed by brackets [] replaced by
1706.25 # your own identifying information:
1706.26 @@ -37,7 +40,7 @@
1706.27 # Version 2 license, then the option applies only if the new code is
1706.28 # made subject to such option by the copyright holder.
1706.29
1706.30 -javac.source=1.5
1706.31 +javac.source=1.6
1706.32 extra.module.files=\
1706.33 modules/ext/jsf/commons-beanutils.jar,\
1706.34 modules/ext/jsf/commons-collections.jar,\
1707.1 --- a/visualweb.project.jsf/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1707.2 +++ b/visualweb.project.jsf/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1707.3 @@ -2,7 +2,10 @@
1707.4 <!--
1707.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1707.6
1707.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1707.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1707.9 +
1707.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1707.11 +Other names may be trademarks of their respective owners.
1707.12
1707.13
1707.14 The contents of this file are subject to the terms of either the GNU
1707.15 @@ -15,9 +18,9 @@
1707.16 specific language governing permissions and limitations under the
1707.17 License. When distributing the software, include this License Header
1707.18 Notice in each file and include the License file at
1707.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1707.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1707.21 particular file as subject to the "Classpath" exception as provided
1707.22 -by Sun in the GPL Version 2 section of the License file that
1707.23 +by Oracle in the GPL Version 2 section of the License file that
1707.24 accompanied this code. If applicable, add the following below the
1707.25 License Header, with the fields enclosed by brackets [] replaced by
1707.26 your own identifying information:
1707.27 @@ -167,12 +170,6 @@
1707.28 </run-dependency>
1707.29 </dependency>
1707.30 <dependency>
1707.31 - <code-name-base>org.netbeans.modules.templates</code-name-base>
1707.32 - <run-dependency>
1707.33 - <specification-version>1.0</specification-version>
1707.34 - </run-dependency>
1707.35 - </dependency>
1707.36 - <dependency>
1707.37 <code-name-base>org.netbeans.modules.visualweb.api.j2ee</code-name-base>
1707.38 <build-prerequisite/>
1707.39 <compile-dependency/>
1707.40 @@ -299,7 +296,15 @@
1707.41 <build-prerequisite/>
1707.42 <compile-dependency/>
1707.43 <run-dependency>
1707.44 - <specification-version>6.2</specification-version>
1707.45 + <specification-version>8.0</specification-version>
1707.46 + </run-dependency>
1707.47 + </dependency>
1707.48 + <dependency>
1707.49 + <code-name-base>org.openide.util.lookup</code-name-base>
1707.50 + <build-prerequisite/>
1707.51 + <compile-dependency/>
1707.52 + <run-dependency>
1707.53 + <specification-version>8.0</specification-version>
1707.54 </run-dependency>
1707.55 </dependency>
1707.56 <dependency>
1708.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1708.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1708.3 @@ -1,7 +1,10 @@
1708.4 #
1708.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1708.6 #
1708.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1708.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1708.9 +#
1708.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1708.11 +# Other names may be trademarks of their respective owners.
1708.12 #
1708.13 # The contents of this file are subject to the terms of either the GNU
1708.14 # General Public License Version 2 only ("GPL") or the Common
1708.15 @@ -13,9 +16,9 @@
1708.16 # specific language governing permissions and limitations under the
1708.17 # License. When distributing the software, include this License Header
1708.18 # Notice in each file and include the License file at
1708.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1708.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1708.21 # particular file as subject to the "Classpath" exception as provided
1708.22 -# by Sun in the GPL Version 2 section of the License file that
1708.23 +# by Oracle in the GPL Version 2 section of the License file that
1708.24 # accompanied this code. If applicable, add the following below the
1708.25 # License Header, with the fields enclosed by brackets [] replaced by
1708.26 # your own identifying information:
1709.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/Install.java Fri Jul 16 11:47:36 2010 -0400
1709.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/Install.java Fri Jul 16 14:21:50 2010 -0400
1709.3 @@ -1,7 +1,10 @@
1709.4 /*
1709.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1709.6 *
1709.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1709.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1709.9 + *
1709.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1709.11 + * Other names may be trademarks of their respective owners.
1709.12 *
1709.13 * The contents of this file are subject to the terms of either the GNU
1709.14 * General Public License Version 2 only ("GPL") or the Common
1709.15 @@ -13,9 +16,9 @@
1709.16 * specific language governing permissions and limitations under the
1709.17 * License. When distributing the software, include this License Header
1709.18 * Notice in each file and include the License file at
1709.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1709.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1709.21 * particular file as subject to the "Classpath" exception as provided
1709.22 - * by Sun in the GPL Version 2 section of the License file that
1709.23 + * by Oracle in the GPL Version 2 section of the License file that
1709.24 * accompanied this code. If applicable, add the following below the
1709.25 * License Header, with the fields enclosed by brackets [] replaced by
1709.26 * your own identifying information:
1710.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1710.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1710.3 @@ -1,6 +1,9 @@
1710.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1710.5 #
1710.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1710.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1710.8 +#
1710.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1710.10 +# Other names may be trademarks of their respective owners.
1710.11 #
1710.12 # The contents of this file are subject to the terms of either the GNU
1710.13 # General Public License Version 2 only ("GPL") or the Common
1710.14 @@ -12,9 +15,9 @@
1710.15 # specific language governing permissions and limitations under the
1710.16 # License. When distributing the software, include this License Header
1710.17 # Notice in each file and include the License file at
1710.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1710.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1710.20 # particular file as subject to the "Classpath" exception as provided
1710.21 -# by Sun in the GPL Version 2 section of the License file that
1710.22 +# by Oracle in the GPL Version 2 section of the License file that
1710.23 # accompanied this code. If applicable, add the following below the
1710.24 # License Header, with the fields enclosed by brackets [] replaced by
1710.25 # your own identifying information:
1711.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/ImportAction.java Fri Jul 16 11:47:36 2010 -0400
1711.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/ImportAction.java Fri Jul 16 14:21:50 2010 -0400
1711.3 @@ -1,7 +1,10 @@
1711.4 /*
1711.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1711.6 *
1711.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1711.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1711.9 + *
1711.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1711.11 + * Other names may be trademarks of their respective owners.
1711.12 *
1711.13 * The contents of this file are subject to the terms of either the GNU
1711.14 * General Public License Version 2 only ("GPL") or the Common
1711.15 @@ -13,9 +16,9 @@
1711.16 * specific language governing permissions and limitations under the
1711.17 * License. When distributing the software, include this License Header
1711.18 * Notice in each file and include the License file at
1711.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1711.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1711.21 * particular file as subject to the "Classpath" exception as provided
1711.22 - * by Sun in the GPL Version 2 section of the License file that
1711.23 + * by Oracle in the GPL Version 2 section of the License file that
1711.24 * accompanied this code. If applicable, add the following below the
1711.25 * License Header, with the fields enclosed by brackets [] replaced by
1711.26 * your own identifying information:
1712.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/ImportFileAction.java Fri Jul 16 11:47:36 2010 -0400
1712.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/ImportFileAction.java Fri Jul 16 14:21:50 2010 -0400
1712.3 @@ -1,7 +1,10 @@
1712.4 /*
1712.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1712.6 *
1712.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1712.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1712.9 + *
1712.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1712.11 + * Other names may be trademarks of their respective owners.
1712.12 *
1712.13 * The contents of this file are subject to the terms of either the GNU
1712.14 * General Public License Version 2 only ("GPL") or the Common
1712.15 @@ -13,9 +16,9 @@
1712.16 * specific language governing permissions and limitations under the
1712.17 * License. When distributing the software, include this License Header
1712.18 * Notice in each file and include the License file at
1712.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1712.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1712.21 * particular file as subject to the "Classpath" exception as provided
1712.22 - * by Sun in the GPL Version 2 section of the License file that
1712.23 + * by Oracle in the GPL Version 2 section of the License file that
1712.24 * accompanied this code. If applicable, add the following below the
1712.25 * License Header, with the fields enclosed by brackets [] replaced by
1712.26 * your own identifying information:
1713.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/SetStartPageAction.java Fri Jul 16 11:47:36 2010 -0400
1713.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/SetStartPageAction.java Fri Jul 16 14:21:50 2010 -0400
1713.3 @@ -1,7 +1,10 @@
1713.4 /*
1713.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1713.6 *
1713.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1713.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1713.9 + *
1713.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1713.11 + * Other names may be trademarks of their respective owners.
1713.12 *
1713.13 * The contents of this file are subject to the terms of either the GNU
1713.14 * General Public License Version 2 only ("GPL") or the Common
1713.15 @@ -13,9 +16,9 @@
1713.16 * specific language governing permissions and limitations under the
1713.17 * License. When distributing the software, include this License Header
1713.18 * Notice in each file and include the License file at
1713.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1713.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1713.21 * particular file as subject to the "Classpath" exception as provided
1713.22 - * by Sun in the GPL Version 2 section of the License file that
1713.23 + * by Oracle in the GPL Version 2 section of the License file that
1713.24 * accompanied this code. If applicable, add the following below the
1713.25 * License Header, with the fields enclosed by brackets [] replaced by
1713.26 * your own identifying information:
1714.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/AddResourceOverwriteDialog.java Fri Jul 16 11:47:36 2010 -0400
1714.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/AddResourceOverwriteDialog.java Fri Jul 16 14:21:50 2010 -0400
1714.3 @@ -1,7 +1,10 @@
1714.4 /*
1714.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1714.6 *
1714.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1714.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1714.9 + *
1714.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1714.11 + * Other names may be trademarks of their respective owners.
1714.12 *
1714.13 * The contents of this file are subject to the terms of either the GNU
1714.14 * General Public License Version 2 only ("GPL") or the Common
1714.15 @@ -13,9 +16,9 @@
1714.16 * specific language governing permissions and limitations under the
1714.17 * License. When distributing the software, include this License Header
1714.18 * Notice in each file and include the License file at
1714.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1714.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1714.21 * particular file as subject to the "Classpath" exception as provided
1714.22 - * by Sun in the GPL Version 2 section of the License file that
1714.23 + * by Oracle in the GPL Version 2 section of the License file that
1714.24 * accompanied this code. If applicable, add the following below the
1714.25 * License Header, with the fields enclosed by brackets [] replaced by
1714.26 * your own identifying information:
1715.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1715.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1715.3 @@ -1,6 +1,9 @@
1715.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1715.5 #
1715.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1715.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1715.8 +#
1715.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1715.10 +# Other names may be trademarks of their respective owners.
1715.11 #
1715.12 # The contents of this file are subject to the terms of either the GNU
1715.13 # General Public License Version 2 only ("GPL") or the Common
1715.14 @@ -12,9 +15,9 @@
1715.15 # specific language governing permissions and limitations under the
1715.16 # License. When distributing the software, include this License Header
1715.17 # Notice in each file and include the License file at
1715.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1715.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1715.20 # particular file as subject to the "Classpath" exception as provided
1715.21 -# by Sun in the GPL Version 2 section of the License file that
1715.22 +# by Oracle in the GPL Version 2 section of the License file that
1715.23 # accompanied this code. If applicable, add the following below the
1715.24 # License Header, with the fields enclosed by brackets [] replaced by
1715.25 # your own identifying information:
1716.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/Importable.java Fri Jul 16 11:47:36 2010 -0400
1716.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/Importable.java Fri Jul 16 14:21:50 2010 -0400
1716.3 @@ -1,7 +1,10 @@
1716.4 /*
1716.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1716.6 *
1716.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1716.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1716.9 + *
1716.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1716.11 + * Other names may be trademarks of their respective owners.
1716.12 *
1716.13 * The contents of this file are subject to the terms of either the GNU
1716.14 * General Public License Version 2 only ("GPL") or the Common
1716.15 @@ -13,9 +16,9 @@
1716.16 * specific language governing permissions and limitations under the
1716.17 * License. When distributing the software, include this License Header
1716.18 * Notice in each file and include the License file at
1716.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1716.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1716.21 * particular file as subject to the "Classpath" exception as provided
1716.22 - * by Sun in the GPL Version 2 section of the License file that
1716.23 + * by Oracle in the GPL Version 2 section of the License file that
1716.24 * accompanied this code. If applicable, add the following below the
1716.25 * License Header, with the fields enclosed by brackets [] replaced by
1716.26 * your own identifying information:
1717.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfDataObjectException.java Fri Jul 16 11:47:36 2010 -0400
1717.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfDataObjectException.java Fri Jul 16 14:21:50 2010 -0400
1717.3 @@ -1,7 +1,10 @@
1717.4 /*
1717.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1717.6 *
1717.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1717.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1717.9 + *
1717.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1717.11 + * Other names may be trademarks of their respective owners.
1717.12 *
1717.13 * The contents of this file are subject to the terms of either the GNU
1717.14 * General Public License Version 2 only ("GPL") or the Common
1717.15 @@ -13,9 +16,9 @@
1717.16 * specific language governing permissions and limitations under the
1717.17 * License. When distributing the software, include this License Header
1717.18 * Notice in each file and include the License file at
1717.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1717.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1717.21 * particular file as subject to the "Classpath" exception as provided
1717.22 - * by Sun in the GPL Version 2 section of the License file that
1717.23 + * by Oracle in the GPL Version 2 section of the License file that
1717.24 * accompanied this code. If applicable, add the following below the
1717.25 * License Header, with the fields enclosed by brackets [] replaced by
1717.26 * your own identifying information:
1718.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfPortletSupport.java Fri Jul 16 11:47:36 2010 -0400
1718.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfPortletSupport.java Fri Jul 16 14:21:50 2010 -0400
1718.3 @@ -1,7 +1,10 @@
1718.4 /*
1718.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1718.6 *
1718.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1718.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1718.9 + *
1718.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1718.11 + * Other names may be trademarks of their respective owners.
1718.12 *
1718.13 * The contents of this file are subject to the terms of either the GNU
1718.14 * General Public License Version 2 only ("GPL") or the Common
1718.15 @@ -13,9 +16,9 @@
1718.16 * specific language governing permissions and limitations under the
1718.17 * License. When distributing the software, include this License Header
1718.18 * Notice in each file and include the License file at
1718.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1718.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1718.21 * particular file as subject to the "Classpath" exception as provided
1718.22 - * by Sun in the GPL Version 2 section of the License file that
1718.23 + * by Oracle in the GPL Version 2 section of the License file that
1718.24 * accompanied this code. If applicable, add the following below the
1718.25 * License Header, with the fields enclosed by brackets [] replaced by
1718.26 * your own identifying information:
1719.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfPortletSupportException.java Fri Jul 16 11:47:36 2010 -0400
1719.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfPortletSupportException.java Fri Jul 16 14:21:50 2010 -0400
1719.3 @@ -1,7 +1,10 @@
1719.4 /*
1719.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1719.6 *
1719.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1719.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1719.9 + *
1719.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1719.11 + * Other names may be trademarks of their respective owners.
1719.12 *
1719.13 * The contents of this file are subject to the terms of either the GNU
1719.14 * General Public License Version 2 only ("GPL") or the Common
1719.15 @@ -13,9 +16,9 @@
1719.16 * specific language governing permissions and limitations under the
1719.17 * License. When distributing the software, include this License Header
1719.18 * Notice in each file and include the License file at
1719.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1719.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1719.21 * particular file as subject to the "Classpath" exception as provided
1719.22 - * by Sun in the GPL Version 2 section of the License file that
1719.23 + * by Oracle in the GPL Version 2 section of the License file that
1719.24 * accompanied this code. If applicable, add the following below the
1719.25 * License Header, with the fields enclosed by brackets [] replaced by
1719.26 * your own identifying information:
1720.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfPortletSupportImpl.java Fri Jul 16 11:47:36 2010 -0400
1720.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfPortletSupportImpl.java Fri Jul 16 14:21:50 2010 -0400
1720.3 @@ -1,7 +1,10 @@
1720.4 /*
1720.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1720.6 *
1720.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1720.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1720.9 + *
1720.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1720.11 + * Other names may be trademarks of their respective owners.
1720.12 *
1720.13 * The contents of this file are subject to the terms of either the GNU
1720.14 * General Public License Version 2 only ("GPL") or the Common
1720.15 @@ -13,9 +16,9 @@
1720.16 * specific language governing permissions and limitations under the
1720.17 * License. When distributing the software, include this License Header
1720.18 * Notice in each file and include the License file at
1720.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1720.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1720.21 * particular file as subject to the "Classpath" exception as provided
1720.22 - * by Sun in the GPL Version 2 section of the License file that
1720.23 + * by Oracle in the GPL Version 2 section of the License file that
1720.24 * accompanied this code. If applicable, add the following below the
1720.25 * License Header, with the fields enclosed by brackets [] replaced by
1720.26 * your own identifying information:
1721.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfProjectConstants.java Fri Jul 16 11:47:36 2010 -0400
1721.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfProjectConstants.java Fri Jul 16 14:21:50 2010 -0400
1721.3 @@ -1,7 +1,10 @@
1721.4 /*
1721.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1721.6 *
1721.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1721.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1721.9 + *
1721.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1721.11 + * Other names may be trademarks of their respective owners.
1721.12 *
1721.13 * The contents of this file are subject to the terms of either the GNU
1721.14 * General Public License Version 2 only ("GPL") or the Common
1721.15 @@ -13,9 +16,9 @@
1721.16 * specific language governing permissions and limitations under the
1721.17 * License. When distributing the software, include this License Header
1721.18 * Notice in each file and include the License file at
1721.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1721.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1721.21 * particular file as subject to the "Classpath" exception as provided
1721.22 - * by Sun in the GPL Version 2 section of the License file that
1721.23 + * by Oracle in the GPL Version 2 section of the License file that
1721.24 * accompanied this code. If applicable, add the following below the
1721.25 * License Header, with the fields enclosed by brackets [] replaced by
1721.26 * your own identifying information:
1722.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfProjectUtils.java Fri Jul 16 11:47:36 2010 -0400
1722.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/JsfProjectUtils.java Fri Jul 16 14:21:50 2010 -0400
1722.3 @@ -1,7 +1,10 @@
1722.4 /*
1722.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1722.6 *
1722.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1722.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1722.9 + *
1722.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1722.11 + * Other names may be trademarks of their respective owners.
1722.12 *
1722.13 * The contents of this file are subject to the terms of either the GNU
1722.14 * General Public License Version 2 only ("GPL") or the Common
1722.15 @@ -13,9 +16,9 @@
1722.16 * specific language governing permissions and limitations under the
1722.17 * License. When distributing the software, include this License Header
1722.18 * Notice in each file and include the License file at
1722.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1722.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1722.21 * particular file as subject to the "Classpath" exception as provided
1722.22 - * by Sun in the GPL Version 2 section of the License file that
1722.23 + * by Oracle in the GPL Version 2 section of the License file that
1722.24 * accompanied this code. If applicable, add the following below the
1722.25 * License Header, with the fields enclosed by brackets [] replaced by
1722.26 * your own identifying information:
1723.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/ProjectTemplate.java Fri Jul 16 11:47:36 2010 -0400
1723.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/api/ProjectTemplate.java Fri Jul 16 14:21:50 2010 -0400
1723.3 @@ -1,7 +1,10 @@
1723.4 /*
1723.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1723.6 *
1723.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1723.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1723.9 + *
1723.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1723.11 + * Other names may be trademarks of their respective owners.
1723.12 *
1723.13 * The contents of this file are subject to the terms of either the GNU
1723.14 * General Public License Version 2 only ("GPL") or the Common
1723.15 @@ -13,9 +16,9 @@
1723.16 * specific language governing permissions and limitations under the
1723.17 * License. When distributing the software, include this License Header
1723.18 * Notice in each file and include the License file at
1723.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1723.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1723.21 * particular file as subject to the "Classpath" exception as provided
1723.22 - * by Sun in the GPL Version 2 section of the License file that
1723.23 + * by Oracle in the GPL Version 2 section of the License file that
1723.24 * accompanied this code. If applicable, add the following below the
1723.25 * License Header, with the fields enclosed by brackets [] replaced by
1723.26 * your own identifying information:
1724.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1724.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1724.3 @@ -1,7 +1,10 @@
1724.4 #
1724.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1724.6 #
1724.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1724.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1724.9 +#
1724.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1724.11 +# Other names may be trademarks of their respective owners.
1724.12 #
1724.13 # The contents of this file are subject to the terms of either the GNU
1724.14 # General Public License Version 2 only ("GPL") or the Common
1724.15 @@ -13,9 +16,9 @@
1724.16 # specific language governing permissions and limitations under the
1724.17 # License. When distributing the software, include this License Header
1724.18 # Notice in each file and include the License file at
1724.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1724.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1724.21 # particular file as subject to the "Classpath" exception as provided
1724.22 -# by Sun in the GPL Version 2 section of the License file that
1724.23 +# by Oracle in the GPL Version 2 section of the License file that
1724.24 # accompanied this code. If applicable, add the following below the
1724.25 # License Header, with the fields enclosed by brackets [] replaced by
1724.26 # your own identifying information:
1725.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFConfigUtilities.java Fri Jul 16 11:47:36 2010 -0400
1725.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFConfigUtilities.java Fri Jul 16 14:21:50 2010 -0400
1725.3 @@ -1,7 +1,10 @@
1725.4 /*
1725.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1725.6 *
1725.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1725.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1725.9 + *
1725.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1725.11 + * Other names may be trademarks of their respective owners.
1725.12 *
1725.13 * The contents of this file are subject to the terms of either the GNU
1725.14 * General Public License Version 2 only ("GPL") or the Common
1725.15 @@ -13,9 +16,9 @@
1725.16 * specific language governing permissions and limitations under the
1725.17 * License. When distributing the software, include this License Header
1725.18 * Notice in each file and include the License file at
1725.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1725.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1725.21 * particular file as subject to the "Classpath" exception as provided
1725.22 - * by Sun in the GPL Version 2 section of the License file that
1725.23 + * by Oracle in the GPL Version 2 section of the License file that
1725.24 * accompanied this code. If applicable, add the following below the
1725.25 * License Header, with the fields enclosed by brackets [] replaced by
1725.26 * your own identifying information:
1726.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFConfigurationPanel.java Fri Jul 16 11:47:36 2010 -0400
1726.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFConfigurationPanel.java Fri Jul 16 14:21:50 2010 -0400
1726.3 @@ -1,7 +1,10 @@
1726.4 /*
1726.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1726.6 *
1726.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1726.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1726.9 + *
1726.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1726.11 + * Other names may be trademarks of their respective owners.
1726.12 *
1726.13 * The contents of this file are subject to the terms of either the GNU
1726.14 * General Public License Version 2 only ("GPL") or the Common
1726.15 @@ -13,9 +16,9 @@
1726.16 * specific language governing permissions and limitations under the
1726.17 * License. When distributing the software, include this License Header
1726.18 * Notice in each file and include the License file at
1726.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1726.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1726.21 * particular file as subject to the "Classpath" exception as provided
1726.22 - * by Sun in the GPL Version 2 section of the License file that
1726.23 + * by Oracle in the GPL Version 2 section of the License file that
1726.24 * accompanied this code. If applicable, add the following below the
1726.25 * License Header, with the fields enclosed by brackets [] replaced by
1726.26 * your own identifying information:
1727.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFConfigurationPanelVisual.java Fri Jul 16 11:47:36 2010 -0400
1727.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFConfigurationPanelVisual.java Fri Jul 16 14:21:50 2010 -0400
1727.3 @@ -1,7 +1,10 @@
1727.4 /*
1727.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1727.6 *
1727.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1727.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1727.9 + *
1727.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1727.11 + * Other names may be trademarks of their respective owners.
1727.12 *
1727.13 * The contents of this file are subject to the terms of either the GNU
1727.14 * General Public License Version 2 only ("GPL") or the Common
1727.15 @@ -13,9 +16,9 @@
1727.16 * specific language governing permissions and limitations under the
1727.17 * License. When distributing the software, include this License Header
1727.18 * Notice in each file and include the License file at
1727.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1727.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1727.21 * particular file as subject to the "Classpath" exception as provided
1727.22 - * by Sun in the GPL Version 2 section of the License file that
1727.23 + * by Oracle in the GPL Version 2 section of the License file that
1727.24 * accompanied this code. If applicable, add the following below the
1727.25 * License Header, with the fields enclosed by brackets [] replaced by
1727.26 * your own identifying information:
1728.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFFrameworkProvider.java Fri Jul 16 11:47:36 2010 -0400
1728.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFFrameworkProvider.java Fri Jul 16 14:21:50 2010 -0400
1728.3 @@ -1,7 +1,10 @@
1728.4 /*
1728.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1728.6 *
1728.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1728.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1728.9 + *
1728.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1728.11 + * Other names may be trademarks of their respective owners.
1728.12 *
1728.13 * The contents of this file are subject to the terms of either the GNU
1728.14 * General Public License Version 2 only ("GPL") or the Common
1728.15 @@ -13,9 +16,9 @@
1728.16 * specific language governing permissions and limitations under the
1728.17 * License. When distributing the software, include this License Header
1728.18 * Notice in each file and include the License file at
1728.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1728.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1728.21 * particular file as subject to the "Classpath" exception as provided
1728.22 - * by Sun in the GPL Version 2 section of the License file that
1728.23 + * by Oracle in the GPL Version 2 section of the License file that
1728.24 * accompanied this code. If applicable, add the following below the
1728.25 * License Header, with the fields enclosed by brackets [] replaced by
1728.26 * your own identifying information:
1729.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFPrivilegedTemplates.java Fri Jul 16 11:47:36 2010 -0400
1729.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFPrivilegedTemplates.java Fri Jul 16 14:21:50 2010 -0400
1729.3 @@ -1,7 +1,10 @@
1729.4 /*
1729.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1729.6 *
1729.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1729.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1729.9 + *
1729.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1729.11 + * Other names may be trademarks of their respective owners.
1729.12 *
1729.13 * The contents of this file are subject to the terms of either the GNU
1729.14 * General Public License Version 2 only ("GPL") or the Common
1729.15 @@ -13,9 +16,9 @@
1729.16 * specific language governing permissions and limitations under the
1729.17 * License. When distributing the software, include this License Header
1729.18 * Notice in each file and include the License file at
1729.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1729.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1729.21 * particular file as subject to the "Classpath" exception as provided
1729.22 - * by Sun in the GPL Version 2 section of the License file that
1729.23 + * by Oracle in the GPL Version 2 section of the License file that
1729.24 * accompanied this code. If applicable, add the following below the
1729.25 * License Header, with the fields enclosed by brackets [] replaced by
1729.26 * your own identifying information:
1730.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFUtils.java Fri Jul 16 11:47:36 2010 -0400
1730.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JSFUtils.java Fri Jul 16 14:21:50 2010 -0400
1730.3 @@ -1,7 +1,10 @@
1730.4 /*
1730.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1730.6 *
1730.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1730.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1730.9 + *
1730.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1730.11 + * Other names may be trademarks of their respective owners.
1730.12 *
1730.13 * The contents of this file are subject to the terms of either the GNU
1730.14 * General Public License Version 2 only ("GPL") or the Common
1730.15 @@ -13,9 +16,9 @@
1730.16 * specific language governing permissions and limitations under the
1730.17 * License. When distributing the software, include this License Header
1730.18 * Notice in each file and include the License file at
1730.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1730.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1730.21 * particular file as subject to the "Classpath" exception as provided
1730.22 - * by Sun in the GPL Version 2 section of the License file that
1730.23 + * by Oracle in the GPL Version 2 section of the License file that
1730.24 * accompanied this code. If applicable, add the following below the
1730.25 * License Header, with the fields enclosed by brackets [] replaced by
1730.26 * your own identifying information:
1731.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JsfProjectTemplate.java Fri Jul 16 11:47:36 2010 -0400
1731.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JsfProjectTemplate.java Fri Jul 16 14:21:50 2010 -0400
1731.3 @@ -1,7 +1,10 @@
1731.4 /*
1731.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1731.6 *
1731.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1731.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1731.9 + *
1731.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1731.11 + * Other names may be trademarks of their respective owners.
1731.12 *
1731.13 * The contents of this file are subject to the terms of either the GNU
1731.14 * General Public License Version 2 only ("GPL") or the Common
1731.15 @@ -13,9 +16,9 @@
1731.16 * specific language governing permissions and limitations under the
1731.17 * License. When distributing the software, include this License Header
1731.18 * Notice in each file and include the License file at
1731.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1731.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1731.21 * particular file as subject to the "Classpath" exception as provided
1731.22 - * by Sun in the GPL Version 2 section of the License file that
1731.23 + * by Oracle in the GPL Version 2 section of the License file that
1731.24 * accompanied this code. If applicable, add the following below the
1731.25 * License Header, with the fields enclosed by brackets [] replaced by
1731.26 * your own identifying information:
1732.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JsfProjectTemplate.xml Fri Jul 16 11:47:36 2010 -0400
1732.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/JsfProjectTemplate.xml Fri Jul 16 14:21:50 2010 -0400
1732.3 @@ -2,7 +2,10 @@
1732.4 <!--
1732.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1732.6
1732.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1732.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1732.9 +
1732.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1732.11 +Other names may be trademarks of their respective owners.
1732.12
1732.13
1732.14 The contents of this file are subject to the terms of either the GNU
1732.15 @@ -15,9 +18,9 @@
1732.16 specific language governing permissions and limitations under the
1732.17 License. When distributing the software, include this License Header
1732.18 Notice in each file and include the License file at
1732.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1732.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1732.21 particular file as subject to the "Classpath" exception as provided
1732.22 -by Sun in the GPL Version 2 section of the License file that
1732.23 +by Oracle in the GPL Version 2 section of the License file that
1732.24 accompanied this code. If applicable, add the following below the
1732.25 License Header, with the fields enclosed by brackets [] replaced by
1732.26 your own identifying information:
1733.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/WizardProperties.java Fri Jul 16 11:47:36 2010 -0400
1733.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/framework/WizardProperties.java Fri Jul 16 14:21:50 2010 -0400
1733.3 @@ -1,7 +1,10 @@
1733.4 /*
1733.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1733.6 *
1733.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1733.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1733.9 + *
1733.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1733.11 + * Other names may be trademarks of their respective owners.
1733.12 *
1733.13 * The contents of this file are subject to the terms of either the GNU
1733.14 * General Public License Version 2 only ("GPL") or the Common
1733.15 @@ -13,9 +16,9 @@
1733.16 * specific language governing permissions and limitations under the
1733.17 * License. When distributing the software, include this License Header
1733.18 * Notice in each file and include the License file at
1733.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1733.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1733.21 * particular file as subject to the "Classpath" exception as provided
1733.22 - * by Sun in the GPL Version 2 section of the License file that
1733.23 + * by Oracle in the GPL Version 2 section of the License file that
1733.24 * accompanied this code. If applicable, add the following below the
1733.25 * License Header, with the fields enclosed by brackets [] replaced by
1733.26 * your own identifying information:
1734.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1734.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1734.3 @@ -1,6 +1,9 @@
1734.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1734.5 #
1734.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1734.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1734.8 +#
1734.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1734.10 +# Other names may be trademarks of their respective owners.
1734.11 #
1734.12 # The contents of this file are subject to the terms of either the GNU
1734.13 # General Public License Version 2 only ("GPL") or the Common
1734.14 @@ -12,9 +15,9 @@
1734.15 # specific language governing permissions and limitations under the
1734.16 # License. When distributing the software, include this License Header
1734.17 # Notice in each file and include the License file at
1734.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1734.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1734.20 # particular file as subject to the "Classpath" exception as provided
1734.21 -# by Sun in the GPL Version 2 section of the License file that
1734.22 +# by Oracle in the GPL Version 2 section of the License file that
1734.23 # accompanied this code. If applicable, add the following below the
1734.24 # License Header, with the fields enclosed by brackets [] replaced by
1734.25 # your own identifying information:
1735.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ComplibBrokenLibraryRefFilterProvider.java Fri Jul 16 11:47:36 2010 -0400
1735.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ComplibBrokenLibraryRefFilterProvider.java Fri Jul 16 14:21:50 2010 -0400
1735.3 @@ -1,6 +1,9 @@
1735.4 /*
1735.5 * {START_JAVA_COPYRIGHT_NOTICE
1735.6 - * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
1735.7 + * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
1735.8 +
1735.9 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1735.10 +Other names may be trademarks of their respective owners.
1735.11 * Use is subject to license terms.
1735.12 * END_COPYRIGHT_NOTICE}
1735.13 */
1735.14 @@ -17,7 +20,7 @@
1735.15
1735.16 /**
1735.17 * Hook used to remove broken library references for complib project migration. See issue 110040.
1735.18 - *
1735.19 + *
1735.20 * @author Edwin Goei
1735.21 */
1735.22 public class ComplibBrokenLibraryRefFilterProvider implements BrokenLibraryRefFilterProvider {
1736.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ComplibProjectOpenedHook.java Fri Jul 16 11:47:36 2010 -0400
1736.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ComplibProjectOpenedHook.java Fri Jul 16 14:21:50 2010 -0400
1736.3 @@ -1,6 +1,9 @@
1736.4 /*
1736.5 * {START_JAVA_COPYRIGHT_NOTICE
1736.6 - * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
1736.7 + * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
1736.8 +
1736.9 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1736.10 +Other names may be trademarks of their respective owners.
1736.11 * Use is subject to license terms.
1736.12 * END_COPYRIGHT_NOTICE}
1736.13 */
1736.14 @@ -15,7 +18,7 @@
1736.15
1736.16 /**
1736.17 * Code used to initialize and clean up complibs associated with a project.
1736.18 - *
1736.19 + *
1736.20 * @author Edwin Goei
1736.21 */
1736.22 @ProjectServiceProvider(service=ProjectOpenedHook.class, projectType="org-netbeans-modules-web-project")
1737.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ComponentLibraryDefinition.java Fri Jul 16 11:47:36 2010 -0400
1737.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ComponentLibraryDefinition.java Fri Jul 16 14:21:50 2010 -0400
1737.3 @@ -1,7 +1,10 @@
1737.4 /*
1737.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1737.6 *
1737.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1737.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1737.9 + *
1737.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1737.11 + * Other names may be trademarks of their respective owners.
1737.12 *
1737.13 * The contents of this file are subject to the terms of either the GNU
1737.14 * General Public License Version 2 only ("GPL") or the Common
1737.15 @@ -13,9 +16,9 @@
1737.16 * specific language governing permissions and limitations under the
1737.17 * License. When distributing the software, include this License Header
1737.18 * Notice in each file and include the License file at
1737.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1737.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1737.21 * particular file as subject to the "Classpath" exception as provided
1737.22 - * by Sun in the GPL Version 2 section of the License file that
1737.23 + * by Oracle in the GPL Version 2 section of the License file that
1737.24 * accompanied this code. If applicable, add the following below the
1737.25 * License Header, with the fields enclosed by brackets [] replaced by
1737.26 * your own identifying information:
1738.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/J2SELibraryDefinition.java Fri Jul 16 11:47:36 2010 -0400
1738.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/J2SELibraryDefinition.java Fri Jul 16 14:21:50 2010 -0400
1738.3 @@ -1,7 +1,10 @@
1738.4 /*
1738.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1738.6 *
1738.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1738.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1738.9 + *
1738.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1738.11 + * Other names may be trademarks of their respective owners.
1738.12 *
1738.13 * The contents of this file are subject to the terms of either the GNU
1738.14 * General Public License Version 2 only ("GPL") or the Common
1738.15 @@ -13,9 +16,9 @@
1738.16 * specific language governing permissions and limitations under the
1738.17 * License. When distributing the software, include this License Header
1738.18 * Notice in each file and include the License file at
1738.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1738.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1738.21 * particular file as subject to the "Classpath" exception as provided
1738.22 - * by Sun in the GPL Version 2 section of the License file that
1738.23 + * by Oracle in the GPL Version 2 section of the License file that
1738.24 * accompanied this code. If applicable, add the following below the
1738.25 * License Header, with the fields enclosed by brackets [] replaced by
1738.26 * your own identifying information:
1739.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/JsfProjectLibrary.java Fri Jul 16 11:47:36 2010 -0400
1739.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/JsfProjectLibrary.java Fri Jul 16 14:21:50 2010 -0400
1739.3 @@ -1,7 +1,10 @@
1739.4 /*
1739.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1739.6 *
1739.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1739.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1739.9 + *
1739.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1739.11 + * Other names may be trademarks of their respective owners.
1739.12 *
1739.13 * The contents of this file are subject to the terms of either the GNU
1739.14 * General Public License Version 2 only ("GPL") or the Common
1739.15 @@ -13,9 +16,9 @@
1739.16 * specific language governing permissions and limitations under the
1739.17 * License. When distributing the software, include this License Header
1739.18 * Notice in each file and include the License file at
1739.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1739.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1739.21 * particular file as subject to the "Classpath" exception as provided
1739.22 - * by Sun in the GPL Version 2 section of the License file that
1739.23 + * by Oracle in the GPL Version 2 section of the License file that
1739.24 * accompanied this code. If applicable, add the following below the
1739.25 * License Header, with the fields enclosed by brackets [] replaced by
1739.26 * your own identifying information:
1740.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/LibraryDefinition.java Fri Jul 16 11:47:36 2010 -0400
1740.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/LibraryDefinition.java Fri Jul 16 14:21:50 2010 -0400
1740.3 @@ -1,7 +1,10 @@
1740.4 /*
1740.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1740.6 *
1740.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1740.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1740.9 + *
1740.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1740.11 + * Other names may be trademarks of their respective owners.
1740.12 *
1740.13 * The contents of this file are subject to the terms of either the GNU
1740.14 * General Public License Version 2 only ("GPL") or the Common
1740.15 @@ -13,9 +16,9 @@
1740.16 * specific language governing permissions and limitations under the
1740.17 * License. When distributing the software, include this License Header
1740.18 * Notice in each file and include the License file at
1740.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1740.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1740.21 * particular file as subject to the "Classpath" exception as provided
1740.22 - * by Sun in the GPL Version 2 section of the License file that
1740.23 + * by Oracle in the GPL Version 2 section of the License file that
1740.24 * accompanied this code. If applicable, add the following below the
1740.25 * License Header, with the fields enclosed by brackets [] replaced by
1740.26 * your own identifying information:
1741.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/SourceForBinaryQueryLibraryImpl.java Fri Jul 16 11:47:36 2010 -0400
1741.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/SourceForBinaryQueryLibraryImpl.java Fri Jul 16 14:21:50 2010 -0400
1741.3 @@ -1,7 +1,10 @@
1741.4 /*
1741.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1741.6 *
1741.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1741.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1741.9 + *
1741.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1741.11 + * Other names may be trademarks of their respective owners.
1741.12 *
1741.13 * The contents of this file are subject to the terms of either the GNU
1741.14 * General Public License Version 2 only ("GPL") or the Common
1741.15 @@ -13,9 +16,9 @@
1741.16 * specific language governing permissions and limitations under the
1741.17 * License. When distributing the software, include this License Header
1741.18 * Notice in each file and include the License file at
1741.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1741.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1741.21 * particular file as subject to the "Classpath" exception as provided
1741.22 - * by Sun in the GPL Version 2 section of the License file that
1741.23 + * by Oracle in the GPL Version 2 section of the License file that
1741.24 * accompanied this code. If applicable, add the following below the
1741.25 * License Header, with the fields enclosed by brackets [] replaced by
1741.26 * your own identifying information:
1742.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ThemeLibraryDefinition.java Fri Jul 16 11:47:36 2010 -0400
1742.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/ThemeLibraryDefinition.java Fri Jul 16 14:21:50 2010 -0400
1742.3 @@ -1,7 +1,10 @@
1742.4 /*
1742.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1742.6 *
1742.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1742.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1742.9 + *
1742.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1742.11 + * Other names may be trademarks of their respective owners.
1742.12 *
1742.13 * The contents of this file are subject to the terms of either the GNU
1742.14 * General Public License Version 2 only ("GPL") or the Common
1742.15 @@ -13,9 +16,9 @@
1742.16 * specific language governing permissions and limitations under the
1742.17 * License. When distributing the software, include this License Header
1742.18 * Notice in each file and include the License file at
1742.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1742.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1742.21 * particular file as subject to the "Classpath" exception as provided
1742.22 - * by Sun in the GPL Version 2 section of the License file that
1742.23 + * by Oracle in the GPL Version 2 section of the License file that
1742.24 * accompanied this code. If applicable, add the following below the
1742.25 * License Header, with the fields enclosed by brackets [] replaced by
1742.26 * your own identifying information:
1743.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/WebServicesBrokenLibraryRefFilterProvider.java Fri Jul 16 11:47:36 2010 -0400
1743.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/libraries/WebServicesBrokenLibraryRefFilterProvider.java Fri Jul 16 14:21:50 2010 -0400
1743.3 @@ -1,8 +1,11 @@
1743.4 /*
1743.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1743.6 - *
1743.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1743.8 - *
1743.9 + *
1743.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1743.11 + *
1743.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1743.13 + * Other names may be trademarks of their respective owners.
1743.14 + *
1743.15 * The contents of this file are subject to the terms of either the GNU
1743.16 * General Public License Version 2 only ("GPL") or the Common
1743.17 * Development and Distribution License("CDDL") (collectively, the
1743.18 @@ -13,9 +16,9 @@
1743.19 * specific language governing permissions and limitations under the
1743.20 * License. When distributing the software, include this License Header
1743.21 * Notice in each file and include the License file at
1743.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1743.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1743.24 * particular file as subject to the "Classpath" exception as provided
1743.25 - * by Sun in the GPL Version 2 section of the License file that
1743.26 + * by Oracle in the GPL Version 2 section of the License file that
1743.27 * accompanied this code. If applicable, add the following below the
1743.28 * License Header, with the fields enclosed by brackets [] replaced by
1743.29 * your own identifying information:
1744.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1744.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1744.3 @@ -1,6 +1,9 @@
1744.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1744.5 #
1744.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1744.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1744.8 +#
1744.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1744.10 +# Other names may be trademarks of their respective owners.
1744.11 #
1744.12 # The contents of this file are subject to the terms of either the GNU
1744.13 # General Public License Version 2 only ("GPL") or the Common
1744.14 @@ -12,9 +15,9 @@
1744.15 # specific language governing permissions and limitations under the
1744.16 # License. When distributing the software, include this License Header
1744.17 # Notice in each file and include the License file at
1744.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1744.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1744.20 # particular file as subject to the "Classpath" exception as provided
1744.21 -# by Sun in the GPL Version 2 section of the License file that
1744.22 +# by Oracle in the GPL Version 2 section of the License file that
1744.23 # accompanied this code. If applicable, add the following below the
1744.24 # License Header, with the fields enclosed by brackets [] replaced by
1744.25 # your own identifying information:
1745.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
1745.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
1745.3 @@ -2,7 +2,10 @@
1745.4 <!--
1745.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1745.6
1745.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1745.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1745.9 +
1745.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1745.11 +Other names may be trademarks of their respective owners.
1745.12
1745.13
1745.14 The contents of this file are subject to the terms of either the GNU
1745.15 @@ -15,9 +18,9 @@
1745.16 specific language governing permissions and limitations under the
1745.17 License. When distributing the software, include this License Header
1745.18 Notice in each file and include the License file at
1745.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1745.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1745.21 particular file as subject to the "Classpath" exception as provided
1745.22 -by Sun in the GPL Version 2 section of the License file that
1745.23 +by Oracle in the GPL Version 2 section of the License file that
1745.24 accompanied this code. If applicable, add the following below the
1745.25 License Header, with the fields enclosed by brackets [] replaced by
1745.26 your own identifying information:
1746.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/DataSourceService.java Fri Jul 16 11:47:36 2010 -0400
1746.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/DataSourceService.java Fri Jul 16 14:21:50 2010 -0400
1746.3 @@ -1,7 +1,10 @@
1746.4 /*
1746.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1746.6 *
1746.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1746.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1746.9 + *
1746.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1746.11 + * Other names may be trademarks of their respective owners.
1746.12 *
1746.13 * The contents of this file are subject to the terms of either the GNU
1746.14 * General Public License Version 2 only ("GPL") or the Common
1746.15 @@ -13,9 +16,9 @@
1746.16 * specific language governing permissions and limitations under the
1746.17 * License. When distributing the software, include this License Header
1746.18 * Notice in each file and include the License file at
1746.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1746.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1746.21 * particular file as subject to the "Classpath" exception as provided
1746.22 - * by Sun in the GPL Version 2 section of the License file that
1746.23 + * by Oracle in the GPL Version 2 section of the License file that
1746.24 * accompanied this code. If applicable, add the following below the
1746.25 * License Header, with the fields enclosed by brackets [] replaced by
1746.26 * your own identifying information:
1747.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/DesignTimeDataSourceService.java Fri Jul 16 11:47:36 2010 -0400
1747.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/DesignTimeDataSourceService.java Fri Jul 16 14:21:50 2010 -0400
1747.3 @@ -1,7 +1,10 @@
1747.4 /*
1747.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1747.6 *
1747.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1747.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1747.9 + *
1747.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1747.11 + * Other names may be trademarks of their respective owners.
1747.12 *
1747.13 * The contents of this file are subject to the terms of either the GNU
1747.14 * General Public License Version 2 only ("GPL") or the Common
1747.15 @@ -13,9 +16,9 @@
1747.16 * specific language governing permissions and limitations under the
1747.17 * License. When distributing the software, include this License Header
1747.18 * Notice in each file and include the License file at
1747.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1747.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1747.21 * particular file as subject to the "Classpath" exception as provided
1747.22 - * by Sun in the GPL Version 2 section of the License file that
1747.23 + * by Oracle in the GPL Version 2 section of the License file that
1747.24 * accompanied this code. If applicable, add the following below the
1747.25 * License Header, with the fields enclosed by brackets [] replaced by
1747.26 * your own identifying information:
1748.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/DesignTimeDataSourceServiceImpl.java Fri Jul 16 11:47:36 2010 -0400
1748.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/DesignTimeDataSourceServiceImpl.java Fri Jul 16 14:21:50 2010 -0400
1748.3 @@ -1,7 +1,10 @@
1748.4 /*
1748.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1748.6 *
1748.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1748.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1748.9 + *
1748.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1748.11 + * Other names may be trademarks of their respective owners.
1748.12 *
1748.13 * The contents of this file are subject to the terms of either the GNU
1748.14 * General Public License Version 2 only ("GPL") or the Common
1748.15 @@ -13,9 +16,9 @@
1748.16 * specific language governing permissions and limitations under the
1748.17 * License. When distributing the software, include this License Header
1748.18 * Notice in each file and include the License file at
1748.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1748.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1748.21 * particular file as subject to the "Classpath" exception as provided
1748.22 - * by Sun in the GPL Version 2 section of the License file that
1748.23 + * by Oracle in the GPL Version 2 section of the License file that
1748.24 * accompanied this code. If applicable, add the following below the
1748.25 * License Header, with the fields enclosed by brackets [] replaced by
1748.26 * your own identifying information:
1749.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/RefreshService.java Fri Jul 16 11:47:36 2010 -0400
1749.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/RefreshService.java Fri Jul 16 14:21:50 2010 -0400
1749.3 @@ -1,7 +1,10 @@
1749.4 /*
1749.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1749.6 *
1749.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1749.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1749.9 + *
1749.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1749.11 + * Other names may be trademarks of their respective owners.
1749.12 *
1749.13 * The contents of this file are subject to the terms of either the GNU
1749.14 * General Public License Version 2 only ("GPL") or the Common
1749.15 @@ -13,9 +16,9 @@
1749.16 * specific language governing permissions and limitations under the
1749.17 * License. When distributing the software, include this License Header
1749.18 * Notice in each file and include the License file at
1749.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1749.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1749.21 * particular file as subject to the "Classpath" exception as provided
1749.22 - * by Sun in the GPL Version 2 section of the License file that
1749.23 + * by Oracle in the GPL Version 2 section of the License file that
1749.24 * accompanied this code. If applicable, add the following below the
1749.25 * License Header, with the fields enclosed by brackets [] replaced by
1749.26 * your own identifying information:
1750.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/ThemeNodeService.java Fri Jul 16 11:47:36 2010 -0400
1750.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/ThemeNodeService.java Fri Jul 16 14:21:50 2010 -0400
1750.3 @@ -1,7 +1,10 @@
1750.4 /*
1750.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1750.6 *
1750.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1750.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1750.9 + *
1750.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1750.11 + * Other names may be trademarks of their respective owners.
1750.12 *
1750.13 * The contents of this file are subject to the terms of either the GNU
1750.14 * General Public License Version 2 only ("GPL") or the Common
1750.15 @@ -13,9 +16,9 @@
1750.16 * specific language governing permissions and limitations under the
1750.17 * License. When distributing the software, include this License Header
1750.18 * Notice in each file and include the License file at
1750.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1750.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1750.21 * particular file as subject to the "Classpath" exception as provided
1750.22 - * by Sun in the GPL Version 2 section of the License file that
1750.23 + * by Oracle in the GPL Version 2 section of the License file that
1750.24 * accompanied this code. If applicable, add the following below the
1750.25 * License Header, with the fields enclosed by brackets [] replaced by
1750.26 * your own identifying information:
1751.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/themenodes/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1751.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/themenodes/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1751.3 @@ -1,6 +1,9 @@
1751.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1751.5 #
1751.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1751.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1751.8 +#
1751.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1751.10 +# Other names may be trademarks of their respective owners.
1751.11 #
1751.12 # The contents of this file are subject to the terms of either the GNU
1751.13 # General Public License Version 2 only ("GPL") or the Common
1751.14 @@ -12,9 +15,9 @@
1751.15 # specific language governing permissions and limitations under the
1751.16 # License. When distributing the software, include this License Header
1751.17 # Notice in each file and include the License file at
1751.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1751.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1751.20 # particular file as subject to the "Classpath" exception as provided
1751.21 -# by Sun in the GPL Version 2 section of the License file that
1751.22 +# by Oracle in the GPL Version 2 section of the License file that
1751.23 # accompanied this code. If applicable, add the following below the
1751.24 # License Header, with the fields enclosed by brackets [] replaced by
1751.25 # your own identifying information:
1752.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/themenodes/ThemeNodeServiceImpl.java Fri Jul 16 11:47:36 2010 -0400
1752.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/themenodes/ThemeNodeServiceImpl.java Fri Jul 16 14:21:50 2010 -0400
1752.3 @@ -1,7 +1,10 @@
1752.4 /*
1752.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1752.6 *
1752.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1752.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1752.9 + *
1752.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1752.11 + * Other names may be trademarks of their respective owners.
1752.12 *
1752.13 * The contents of this file are subject to the terms of either the GNU
1752.14 * General Public License Version 2 only ("GPL") or the Common
1752.15 @@ -13,9 +16,9 @@
1752.16 * specific language governing permissions and limitations under the
1752.17 * License. When distributing the software, include this License Header
1752.18 * Notice in each file and include the License file at
1752.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1752.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1752.21 * particular file as subject to the "Classpath" exception as provided
1752.22 - * by Sun in the GPL Version 2 section of the License file that
1752.23 + * by Oracle in the GPL Version 2 section of the License file that
1752.24 * accompanied this code. If applicable, add the following below the
1752.25 * License Header, with the fields enclosed by brackets [] replaced by
1752.26 * your own identifying information:
1753.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/themenodes/ThemesJ2ee14FolderNode.java Fri Jul 16 11:47:36 2010 -0400
1753.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/themenodes/ThemesJ2ee14FolderNode.java Fri Jul 16 14:21:50 2010 -0400
1753.3 @@ -1,7 +1,10 @@
1753.4 /*
1753.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1753.6 *
1753.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1753.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1753.9 + *
1753.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1753.11 + * Other names may be trademarks of their respective owners.
1753.12 *
1753.13 * The contents of this file are subject to the terms of either the GNU
1753.14 * General Public License Version 2 only ("GPL") or the Common
1753.15 @@ -13,9 +16,9 @@
1753.16 * specific language governing permissions and limitations under the
1753.17 * License. When distributing the software, include this License Header
1753.18 * Notice in each file and include the License file at
1753.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1753.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1753.21 * particular file as subject to the "Classpath" exception as provided
1753.22 - * by Sun in the GPL Version 2 section of the License file that
1753.23 + * by Oracle in the GPL Version 2 section of the License file that
1753.24 * accompanied this code. If applicable, add the following below the
1753.25 * License Header, with the fields enclosed by brackets [] replaced by
1753.26 * your own identifying information:
1754.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/themenodes/ThemesJ2ee5FolderNode.java Fri Jul 16 11:47:36 2010 -0400
1754.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/themenodes/ThemesJ2ee5FolderNode.java Fri Jul 16 14:21:50 2010 -0400
1754.3 @@ -1,7 +1,10 @@
1754.4 /*
1754.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1754.6 *
1754.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1754.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1754.9 + *
1754.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1754.11 + * Other names may be trademarks of their respective owners.
1754.12 *
1754.13 * The contents of this file are subject to the terms of either the GNU
1754.14 * General Public License Version 2 only ("GPL") or the Common
1754.15 @@ -13,9 +16,9 @@
1754.16 * specific language governing permissions and limitations under the
1754.17 * License. When distributing the software, include this License Header
1754.18 * Notice in each file and include the License file at
1754.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1754.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1754.21 * particular file as subject to the "Classpath" exception as provided
1754.22 - * by Sun in the GPL Version 2 section of the License file that
1754.23 + * by Oracle in the GPL Version 2 section of the License file that
1754.24 * accompanied this code. If applicable, add the following below the
1754.25 * License Header, with the fields enclosed by brackets [] replaced by
1754.26 * your own identifying information:
1755.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/BrowseFolders.java Fri Jul 16 11:47:36 2010 -0400
1755.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/BrowseFolders.java Fri Jul 16 14:21:50 2010 -0400
1755.3 @@ -1,7 +1,10 @@
1755.4 /*
1755.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1755.6 *
1755.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1755.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1755.9 + *
1755.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1755.11 + * Other names may be trademarks of their respective owners.
1755.12 *
1755.13 * The contents of this file are subject to the terms of either the GNU
1755.14 * General Public License Version 2 only ("GPL") or the Common
1755.15 @@ -13,9 +16,9 @@
1755.16 * specific language governing permissions and limitations under the
1755.17 * License. When distributing the software, include this License Header
1755.18 * Notice in each file and include the License file at
1755.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1755.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1755.21 * particular file as subject to the "Classpath" exception as provided
1755.22 - * by Sun in the GPL Version 2 section of the License file that
1755.23 + * by Oracle in the GPL Version 2 section of the License file that
1755.24 * accompanied this code. If applicable, add the following below the
1755.25 * License Header, with the fields enclosed by brackets [] replaced by
1755.26 * your own identifying information:
1756.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1756.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1756.3 @@ -1,6 +1,9 @@
1756.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1756.5 #
1756.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1756.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1756.8 +#
1756.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1756.10 +# Other names may be trademarks of their respective owners.
1756.11 #
1756.12 # The contents of this file are subject to the terms of either the GNU
1756.13 # General Public License Version 2 only ("GPL") or the Common
1756.14 @@ -12,9 +15,9 @@
1756.15 # specific language governing permissions and limitations under the
1756.16 # License. When distributing the software, include this License Header
1756.17 # Notice in each file and include the License file at
1756.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1756.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1756.20 # particular file as subject to the "Classpath" exception as provided
1756.21 -# by Sun in the GPL Version 2 section of the License file that
1756.22 +# by Oracle in the GPL Version 2 section of the License file that
1756.23 # accompanied this code. If applicable, add the following below the
1756.24 # License Header, with the fields enclosed by brackets [] replaced by
1756.25 # your own identifying information:
1757.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/JSFNodeFactory.java Fri Jul 16 11:47:36 2010 -0400
1757.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/JSFNodeFactory.java Fri Jul 16 14:21:50 2010 -0400
1757.3 @@ -1,7 +1,10 @@
1757.4 /*
1757.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1757.6 *
1757.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1757.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1757.9 + *
1757.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1757.11 + * Other names may be trademarks of their respective owners.
1757.12 *
1757.13 * The contents of this file are subject to the terms of either the GNU
1757.14 * General Public License Version 2 only ("GPL") or the Common
1757.15 @@ -13,9 +16,9 @@
1757.16 * specific language governing permissions and limitations under the
1757.17 * License. When distributing the software, include this License Header
1757.18 * Notice in each file and include the License file at
1757.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1757.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1757.21 * particular file as subject to the "Classpath" exception as provided
1757.22 - * by Sun in the GPL Version 2 section of the License file that
1757.23 + * by Oracle in the GPL Version 2 section of the License file that
1757.24 * accompanied this code. If applicable, add the following below the
1757.25 * License Header, with the fields enclosed by brackets [] replaced by
1757.26 * your own identifying information:
1758.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/PageIterator.java Fri Jul 16 11:47:36 2010 -0400
1758.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/PageIterator.java Fri Jul 16 14:21:50 2010 -0400
1758.3 @@ -1,7 +1,10 @@
1758.4 /*
1758.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1758.6 *
1758.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1758.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1758.9 + *
1758.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1758.11 + * Other names may be trademarks of their respective owners.
1758.12 *
1758.13 * The contents of this file are subject to the terms of either the GNU
1758.14 * General Public License Version 2 only ("GPL") or the Common
1758.15 @@ -13,9 +16,9 @@
1758.16 * specific language governing permissions and limitations under the
1758.17 * License. When distributing the software, include this License Header
1758.18 * Notice in each file and include the License file at
1758.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1758.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1758.21 * particular file as subject to the "Classpath" exception as provided
1758.22 - * by Sun in the GPL Version 2 section of the License file that
1758.23 + * by Oracle in the GPL Version 2 section of the License file that
1758.24 * accompanied this code. If applicable, add the following below the
1758.25 * License Header, with the fields enclosed by brackets [] replaced by
1758.26 * your own identifying information:
1759.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/PagebeanPackagePanel.java Fri Jul 16 11:47:36 2010 -0400
1759.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/PagebeanPackagePanel.java Fri Jul 16 14:21:50 2010 -0400
1759.3 @@ -1,7 +1,10 @@
1759.4 /*
1759.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1759.6 *
1759.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1759.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1759.9 + *
1759.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1759.11 + * Other names may be trademarks of their respective owners.
1759.12 *
1759.13 * The contents of this file are subject to the terms of either the GNU
1759.14 * General Public License Version 2 only ("GPL") or the Common
1759.15 @@ -13,9 +16,9 @@
1759.16 * specific language governing permissions and limitations under the
1759.17 * License. When distributing the software, include this License Header
1759.18 * Notice in each file and include the License file at
1759.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1759.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1759.21 * particular file as subject to the "Classpath" exception as provided
1759.22 - * by Sun in the GPL Version 2 section of the License file that
1759.23 + * by Oracle in the GPL Version 2 section of the License file that
1759.24 * accompanied this code. If applicable, add the following below the
1759.25 * License Header, with the fields enclosed by brackets [] replaced by
1759.26 * your own identifying information:
1760.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/PagebeanPackagePanelGUI.java Fri Jul 16 11:47:36 2010 -0400
1760.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/PagebeanPackagePanelGUI.java Fri Jul 16 14:21:50 2010 -0400
1760.3 @@ -1,7 +1,10 @@
1760.4 /*
1760.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1760.6 *
1760.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1760.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1760.9 + *
1760.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1760.11 + * Other names may be trademarks of their respective owners.
1760.12 *
1760.13 * The contents of this file are subject to the terms of either the GNU
1760.14 * General Public License Version 2 only ("GPL") or the Common
1760.15 @@ -13,9 +16,9 @@
1760.16 * specific language governing permissions and limitations under the
1760.17 * License. When distributing the software, include this License Header
1760.18 * Notice in each file and include the License file at
1760.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1760.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1760.21 * particular file as subject to the "Classpath" exception as provided
1760.22 - * by Sun in the GPL Version 2 section of the License file that
1760.23 + * by Oracle in the GPL Version 2 section of the License file that
1760.24 * accompanied this code. If applicable, add the following below the
1760.25 * License Header, with the fields enclosed by brackets [] replaced by
1760.26 * your own identifying information:
1761.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/PhysicalView.java Fri Jul 16 11:47:36 2010 -0400
1761.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/PhysicalView.java Fri Jul 16 14:21:50 2010 -0400
1761.3 @@ -1,7 +1,10 @@
1761.4 /*
1761.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1761.6 *
1761.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1761.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1761.9 + *
1761.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1761.11 + * Other names may be trademarks of their respective owners.
1761.12 *
1761.13 * The contents of this file are subject to the terms of either the GNU
1761.14 * General Public License Version 2 only ("GPL") or the Common
1761.15 @@ -13,9 +16,9 @@
1761.16 * specific language governing permissions and limitations under the
1761.17 * License. When distributing the software, include this License Header
1761.18 * Notice in each file and include the License file at
1761.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1761.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1761.21 * particular file as subject to the "Classpath" exception as provided
1761.22 - * by Sun in the GPL Version 2 section of the License file that
1761.23 + * by Oracle in the GPL Version 2 section of the License file that
1761.24 * accompanied this code. If applicable, add the following below the
1761.25 * License Header, with the fields enclosed by brackets [] replaced by
1761.26 * your own identifying information:
1762.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/SimpleTargetChooserPanel.java Fri Jul 16 11:47:36 2010 -0400
1762.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/SimpleTargetChooserPanel.java Fri Jul 16 14:21:50 2010 -0400
1762.3 @@ -1,7 +1,10 @@
1762.4 /*
1762.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1762.6 *
1762.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1762.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1762.9 + *
1762.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1762.11 + * Other names may be trademarks of their respective owners.
1762.12 *
1762.13 * The contents of this file are subject to the terms of either the GNU
1762.14 * General Public License Version 2 only ("GPL") or the Common
1762.15 @@ -13,9 +16,9 @@
1762.16 * specific language governing permissions and limitations under the
1762.17 * License. When distributing the software, include this License Header
1762.18 * Notice in each file and include the License file at
1762.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1762.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1762.21 * particular file as subject to the "Classpath" exception as provided
1762.22 - * by Sun in the GPL Version 2 section of the License file that
1762.23 + * by Oracle in the GPL Version 2 section of the License file that
1762.24 * accompanied this code. If applicable, add the following below the
1762.25 * License Header, with the fields enclosed by brackets [] replaced by
1762.26 * your own identifying information:
1763.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/SimpleTargetChooserPanelGUI.java Fri Jul 16 11:47:36 2010 -0400
1763.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/SimpleTargetChooserPanelGUI.java Fri Jul 16 14:21:50 2010 -0400
1763.3 @@ -1,7 +1,10 @@
1763.4 /*
1763.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1763.6 *
1763.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1763.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1763.9 + *
1763.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1763.11 + * Other names may be trademarks of their respective owners.
1763.12 *
1763.13 * The contents of this file are subject to the terms of either the GNU
1763.14 * General Public License Version 2 only ("GPL") or the Common
1763.15 @@ -13,9 +16,9 @@
1763.16 * specific language governing permissions and limitations under the
1763.17 * License. When distributing the software, include this License Header
1763.18 * Notice in each file and include the License file at
1763.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1763.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1763.21 * particular file as subject to the "Classpath" exception as provided
1763.22 - * by Sun in the GPL Version 2 section of the License file that
1763.23 + * by Oracle in the GPL Version 2 section of the License file that
1763.24 * accompanied this code. If applicable, add the following below the
1763.25 * License Header, with the fields enclosed by brackets [] replaced by
1763.26 * your own identifying information:
1764.1 --- a/visualweb.project.jsfloader/build.xml Fri Jul 16 11:47:36 2010 -0400
1764.2 +++ b/visualweb.project.jsfloader/build.xml Fri Jul 16 14:21:50 2010 -0400
1764.3 @@ -2,7 +2,10 @@
1764.4 <!--
1764.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1764.6
1764.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1764.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1764.9 +
1764.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1764.11 +Other names may be trademarks of their respective owners.
1764.12
1764.13
1764.14 The contents of this file are subject to the terms of either the GNU
1764.15 @@ -15,9 +18,9 @@
1764.16 specific language governing permissions and limitations under the
1764.17 License. When distributing the software, include this License Header
1764.18 Notice in each file and include the License file at
1764.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1764.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1764.21 particular file as subject to the "Classpath" exception as provided
1764.22 -by Sun in the GPL Version 2 section of the License file that
1764.23 +by Oracle in the GPL Version 2 section of the License file that
1764.24 accompanied this code. If applicable, add the following below the
1764.25 License Header, with the fields enclosed by brackets [] replaced by
1764.26 your own identifying information:
1765.1 --- a/visualweb.project.jsfloader/manifest.mf Fri Jul 16 11:47:36 2010 -0400
1765.2 +++ b/visualweb.project.jsfloader/manifest.mf Fri Jul 16 14:21:50 2010 -0400
1765.3 @@ -1,6 +1,6 @@
1765.4 Manifest-Version: 1.0
1765.5 OpenIDE-Module: org.netbeans.modules.visualweb.project.jsfloader/1
1765.6 -OpenIDE-Module-Specification-Version: 2.6
1765.7 +OpenIDE-Module-Specification-Version: 2.7
1765.8 OpenIDE-Module-Layer: org/netbeans/modules/visualweb/project/jsfloader/layer.xml
1765.9 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/visualweb/project/jsfloader/Bundle.properties
1765.10 AutoUpdate-Show-In-Client: false
1766.1 --- a/visualweb.project.jsfloader/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1766.2 +++ b/visualweb.project.jsfloader/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1766.3 @@ -1,6 +1,9 @@
1766.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1766.5 #
1766.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1766.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1766.8 +#
1766.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1766.10 +# Other names may be trademarks of their respective owners.
1766.11 #
1766.12 # The contents of this file are subject to the terms of either the GNU
1766.13 # General Public License Version 2 only ("GPL") or the Common
1766.14 @@ -12,9 +15,9 @@
1766.15 # specific language governing permissions and limitations under the
1766.16 # License. When distributing the software, include this License Header
1766.17 # Notice in each file and include the License file at
1766.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1766.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1766.20 # particular file as subject to the "Classpath" exception as provided
1766.21 -# by Sun in the GPL Version 2 section of the License file that
1766.22 +# by Oracle in the GPL Version 2 section of the License file that
1766.23 # accompanied this code. If applicable, add the following below the
1766.24 # License Header, with the fields enclosed by brackets [] replaced by
1766.25 # your own identifying information:
1766.26 @@ -37,4 +40,4 @@
1766.27 # Version 2 license, then the option applies only if the new code is
1766.28 # made subject to such option by the copyright holder.
1766.29 javac.compilerargs=-Xlint:unchecked
1766.30 -javac.source=1.5
1766.31 +javac.source=1.6
1767.1 --- a/visualweb.project.jsfloader/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1767.2 +++ b/visualweb.project.jsfloader/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1767.3 @@ -2,7 +2,10 @@
1767.4 <!--
1767.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1767.6
1767.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1767.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1767.9 +
1767.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1767.11 +Other names may be trademarks of their respective owners.
1767.12
1767.13
1767.14 The contents of this file are subject to the terms of either the GNU
1767.15 @@ -15,9 +18,9 @@
1767.16 specific language governing permissions and limitations under the
1767.17 License. When distributing the software, include this License Header
1767.18 Notice in each file and include the License file at
1767.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1767.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1767.21 particular file as subject to the "Classpath" exception as provided
1767.22 -by Sun in the GPL Version 2 section of the License file that
1767.23 +by Oracle in the GPL Version 2 section of the License file that
1767.24 accompanied this code. If applicable, add the following below the
1767.25 License Header, with the fields enclosed by brackets [] replaced by
1767.26 your own identifying information:
1767.27 @@ -60,8 +63,8 @@
1767.28 <build-prerequisite/>
1767.29 <compile-dependency/>
1767.30 <run-dependency>
1767.31 - <release-version>1</release-version>
1767.32 - <specification-version>1.27</specification-version>
1767.33 + <release-version>2</release-version>
1767.34 + <specification-version>2.1</specification-version>
1767.35 </run-dependency>
1767.36 </dependency>
1767.37 <dependency>
1767.38 @@ -238,7 +241,15 @@
1767.39 <build-prerequisite/>
1767.40 <compile-dependency/>
1767.41 <run-dependency>
1767.42 - <specification-version>7.15</specification-version>
1767.43 + <specification-version>8.0</specification-version>
1767.44 + </run-dependency>
1767.45 + </dependency>
1767.46 + <dependency>
1767.47 + <code-name-base>org.openide.util.lookup</code-name-base>
1767.48 + <build-prerequisite/>
1767.49 + <compile-dependency/>
1767.50 + <run-dependency>
1767.51 + <specification-version>8.0</specification-version>
1767.52 </run-dependency>
1767.53 </dependency>
1767.54 <dependency>
1768.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1768.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1768.3 @@ -1,6 +1,9 @@
1768.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1768.5 #
1768.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1768.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1768.8 +#
1768.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1768.10 +# Other names may be trademarks of their respective owners.
1768.11 #
1768.12 # The contents of this file are subject to the terms of either the GNU
1768.13 # General Public License Version 2 only ("GPL") or the Common
1768.14 @@ -12,9 +15,9 @@
1768.15 # specific language governing permissions and limitations under the
1768.16 # License. When distributing the software, include this License Header
1768.17 # Notice in each file and include the License file at
1768.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1768.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1768.20 # particular file as subject to the "Classpath" exception as provided
1768.21 -# by Sun in the GPL Version 2 section of the License file that
1768.22 +# by Oracle in the GPL Version 2 section of the License file that
1768.23 # accompanied this code. If applicable, add the following below the
1768.24 # License Header, with the fields enclosed by brackets [] replaced by
1768.25 # your own identifying information:
1769.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/CompoundSaveCookie.java Fri Jul 16 11:47:36 2010 -0400
1769.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/CompoundSaveCookie.java Fri Jul 16 14:21:50 2010 -0400
1769.3 @@ -1,7 +1,10 @@
1769.4 /*
1769.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1769.6 *
1769.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1769.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1769.9 + *
1769.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1769.11 + * Other names may be trademarks of their respective owners.
1769.12 *
1769.13 * The contents of this file are subject to the terms of either the GNU
1769.14 * General Public License Version 2 only ("GPL") or the Common
1769.15 @@ -13,9 +16,9 @@
1769.16 * specific language governing permissions and limitations under the
1769.17 * License. When distributing the software, include this License Header
1769.18 * Notice in each file and include the License file at
1769.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1769.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1769.21 * particular file as subject to the "Classpath" exception as provided
1769.22 - * by Sun in the GPL Version 2 section of the License file that
1769.23 + * by Oracle in the GPL Version 2 section of the License file that
1769.24 * accompanied this code. If applicable, add the following below the
1769.25 * License Header, with the fields enclosed by brackets [] replaced by
1769.26 * your own identifying information:
1770.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataLoader.java Fri Jul 16 11:47:36 2010 -0400
1770.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataLoader.java Fri Jul 16 14:21:50 2010 -0400
1770.3 @@ -1,7 +1,10 @@
1770.4 /*
1770.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1770.6 *
1770.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1770.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1770.9 + *
1770.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1770.11 + * Other names may be trademarks of their respective owners.
1770.12 *
1770.13 * The contents of this file are subject to the terms of either the GNU
1770.14 * General Public License Version 2 only ("GPL") or the Common
1770.15 @@ -13,9 +16,9 @@
1770.16 * specific language governing permissions and limitations under the
1770.17 * License. When distributing the software, include this License Header
1770.18 * Notice in each file and include the License file at
1770.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1770.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1770.21 * particular file as subject to the "Classpath" exception as provided
1770.22 - * by Sun in the GPL Version 2 section of the License file that
1770.23 + * by Oracle in the GPL Version 2 section of the License file that
1770.24 * accompanied this code. If applicable, add the following below the
1770.25 * License Header, with the fields enclosed by brackets [] replaced by
1770.26 * your own identifying information:
1771.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataLoaderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1771.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataLoaderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1771.3 @@ -1,7 +1,10 @@
1771.4 /*
1771.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1771.6 *
1771.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1771.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1771.9 + *
1771.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1771.11 + * Other names may be trademarks of their respective owners.
1771.12 *
1771.13 * The contents of this file are subject to the terms of either the GNU
1771.14 * General Public License Version 2 only ("GPL") or the Common
1771.15 @@ -13,9 +16,9 @@
1771.16 * specific language governing permissions and limitations under the
1771.17 * License. When distributing the software, include this License Header
1771.18 * Notice in each file and include the License file at
1771.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1771.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1771.21 * particular file as subject to the "Classpath" exception as provided
1771.22 - * by Sun in the GPL Version 2 section of the License file that
1771.23 + * by Oracle in the GPL Version 2 section of the License file that
1771.24 * accompanied this code. If applicable, add the following below the
1771.25 * License Header, with the fields enclosed by brackets [] replaced by
1771.26 * your own identifying information:
1772.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataNode.java Fri Jul 16 11:47:36 2010 -0400
1772.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataNode.java Fri Jul 16 14:21:50 2010 -0400
1772.3 @@ -1,7 +1,10 @@
1772.4 /*
1772.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1772.6 *
1772.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1772.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1772.9 + *
1772.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1772.11 + * Other names may be trademarks of their respective owners.
1772.12 *
1772.13 * The contents of this file are subject to the terms of either the GNU
1772.14 * General Public License Version 2 only ("GPL") or the Common
1772.15 @@ -13,9 +16,9 @@
1772.16 * specific language governing permissions and limitations under the
1772.17 * License. When distributing the software, include this License Header
1772.18 * Notice in each file and include the License file at
1772.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1772.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1772.21 * particular file as subject to the "Classpath" exception as provided
1772.22 - * by Sun in the GPL Version 2 section of the License file that
1772.23 + * by Oracle in the GPL Version 2 section of the License file that
1772.24 * accompanied this code. If applicable, add the following below the
1772.25 * License Header, with the fields enclosed by brackets [] replaced by
1772.26 * your own identifying information:
1773.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObject.java Fri Jul 16 11:47:36 2010 -0400
1773.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObject.java Fri Jul 16 14:21:50 2010 -0400
1773.3 @@ -1,7 +1,10 @@
1773.4 /*
1773.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1773.6 *
1773.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1773.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1773.9 + *
1773.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1773.11 + * Other names may be trademarks of their respective owners.
1773.12 *
1773.13 * The contents of this file are subject to the terms of either the GNU
1773.14 * General Public License Version 2 only ("GPL") or the Common
1773.15 @@ -13,9 +16,9 @@
1773.16 * specific language governing permissions and limitations under the
1773.17 * License. When distributing the software, include this License Header
1773.18 * Notice in each file and include the License file at
1773.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1773.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1773.21 * particular file as subject to the "Classpath" exception as provided
1773.22 - * by Sun in the GPL Version 2 section of the License file that
1773.23 + * by Oracle in the GPL Version 2 section of the License file that
1773.24 * accompanied this code. If applicable, add the following below the
1773.25 * License Header, with the fields enclosed by brackets [] replaced by
1773.26 * your own identifying information:
1774.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaEditorSupport.java Fri Jul 16 11:47:36 2010 -0400
1774.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaEditorSupport.java Fri Jul 16 14:21:50 2010 -0400
1774.3 @@ -1,7 +1,10 @@
1774.4 /*
1774.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1774.6 *
1774.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1774.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1774.9 + *
1774.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1774.11 + * Other names may be trademarks of their respective owners.
1774.12 *
1774.13 * The contents of this file are subject to the terms of either the GNU
1774.14 * General Public License Version 2 only ("GPL") or the Common
1774.15 @@ -13,9 +16,9 @@
1774.16 * specific language governing permissions and limitations under the
1774.17 * License. When distributing the software, include this License Header
1774.18 * Notice in each file and include the License file at
1774.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1774.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1774.21 * particular file as subject to the "Classpath" exception as provided
1774.22 - * by Sun in the GPL Version 2 section of the License file that
1774.23 + * by Oracle in the GPL Version 2 section of the License file that
1774.24 * accompanied this code. If applicable, add the following below the
1774.25 * License Header, with the fields enclosed by brackets [] replaced by
1774.26 * your own identifying information:
1775.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataLoader.java Fri Jul 16 11:47:36 2010 -0400
1775.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataLoader.java Fri Jul 16 14:21:50 2010 -0400
1775.3 @@ -1,7 +1,10 @@
1775.4 /*
1775.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1775.6 *
1775.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1775.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1775.9 + *
1775.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1775.11 + * Other names may be trademarks of their respective owners.
1775.12 *
1775.13 * The contents of this file are subject to the terms of either the GNU
1775.14 * General Public License Version 2 only ("GPL") or the Common
1775.15 @@ -13,9 +16,9 @@
1775.16 * specific language governing permissions and limitations under the
1775.17 * License. When distributing the software, include this License Header
1775.18 * Notice in each file and include the License file at
1775.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1775.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1775.21 * particular file as subject to the "Classpath" exception as provided
1775.22 - * by Sun in the GPL Version 2 section of the License file that
1775.23 + * by Oracle in the GPL Version 2 section of the License file that
1775.24 * accompanied this code. If applicable, add the following below the
1775.25 * License Header, with the fields enclosed by brackets [] replaced by
1775.26 * your own identifying information:
1776.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataLoaderBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
1776.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataLoaderBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
1776.3 @@ -1,7 +1,10 @@
1776.4 /*
1776.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1776.6 *
1776.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1776.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1776.9 + *
1776.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1776.11 + * Other names may be trademarks of their respective owners.
1776.12 *
1776.13 * The contents of this file are subject to the terms of either the GNU
1776.14 * General Public License Version 2 only ("GPL") or the Common
1776.15 @@ -13,9 +16,9 @@
1776.16 * specific language governing permissions and limitations under the
1776.17 * License. When distributing the software, include this License Header
1776.18 * Notice in each file and include the License file at
1776.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1776.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1776.21 * particular file as subject to the "Classpath" exception as provided
1776.22 - * by Sun in the GPL Version 2 section of the License file that
1776.23 + * by Oracle in the GPL Version 2 section of the License file that
1776.24 * accompanied this code. If applicable, add the following below the
1776.25 * License Header, with the fields enclosed by brackets [] replaced by
1776.26 * your own identifying information:
1777.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataNode.java Fri Jul 16 11:47:36 2010 -0400
1777.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataNode.java Fri Jul 16 14:21:50 2010 -0400
1777.3 @@ -1,7 +1,10 @@
1777.4 /*
1777.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1777.6 *
1777.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1777.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1777.9 + *
1777.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1777.11 + * Other names may be trademarks of their respective owners.
1777.12 *
1777.13 * The contents of this file are subject to the terms of either the GNU
1777.14 * General Public License Version 2 only ("GPL") or the Common
1777.15 @@ -13,9 +16,9 @@
1777.16 * specific language governing permissions and limitations under the
1777.17 * License. When distributing the software, include this License Header
1777.18 * Notice in each file and include the License file at
1777.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1777.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1777.21 * particular file as subject to the "Classpath" exception as provided
1777.22 - * by Sun in the GPL Version 2 section of the License file that
1777.23 + * by Oracle in the GPL Version 2 section of the License file that
1777.24 * accompanied this code. If applicable, add the following below the
1777.25 * License Header, with the fields enclosed by brackets [] replaced by
1777.26 * your own identifying information:
1778.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObject.java Fri Jul 16 11:47:36 2010 -0400
1778.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObject.java Fri Jul 16 14:21:50 2010 -0400
1778.3 @@ -1,7 +1,10 @@
1778.4 /*
1778.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1778.6 *
1778.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1778.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1778.9 + *
1778.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1778.11 + * Other names may be trademarks of their respective owners.
1778.12 *
1778.13 * The contents of this file are subject to the terms of either the GNU
1778.14 * General Public License Version 2 only ("GPL") or the Common
1778.15 @@ -13,9 +16,9 @@
1778.16 * specific language governing permissions and limitations under the
1778.17 * License. When distributing the software, include this License Header
1778.18 * Notice in each file and include the License file at
1778.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1778.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1778.21 * particular file as subject to the "Classpath" exception as provided
1778.22 - * by Sun in the GPL Version 2 section of the License file that
1778.23 + * by Oracle in the GPL Version 2 section of the License file that
1778.24 * accompanied this code. If applicable, add the following below the
1778.25 * License Header, with the fields enclosed by brackets [] replaced by
1778.26 * your own identifying information:
1779.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspEditorSupport.java Fri Jul 16 11:47:36 2010 -0400
1779.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspEditorSupport.java Fri Jul 16 14:21:50 2010 -0400
1779.3 @@ -1,7 +1,10 @@
1779.4 /*
1779.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1779.6 *
1779.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1779.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1779.9 + *
1779.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1779.11 + * Other names may be trademarks of their respective owners.
1779.12 *
1779.13 * The contents of this file are subject to the terms of either the GNU
1779.14 * General Public License Version 2 only ("GPL") or the Common
1779.15 @@ -13,9 +16,9 @@
1779.16 * specific language governing permissions and limitations under the
1779.17 * License. When distributing the software, include this License Header
1779.18 * Notice in each file and include the License file at
1779.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1779.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1779.21 * particular file as subject to the "Classpath" exception as provided
1779.22 - * by Sun in the GPL Version 2 section of the License file that
1779.23 + * by Oracle in the GPL Version 2 section of the License file that
1779.24 * accompanied this code. If applicable, add the following below the
1779.25 * License Header, with the fields enclosed by brackets [] replaced by
1779.26 * your own identifying information:
1780.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspTemplateEncodingQueryImplementation.java Fri Jul 16 11:47:36 2010 -0400
1780.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspTemplateEncodingQueryImplementation.java Fri Jul 16 14:21:50 2010 -0400
1780.3 @@ -1,8 +1,11 @@
1780.4 /*
1780.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1780.6 - *
1780.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1780.8 - *
1780.9 + *
1780.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1780.11 + *
1780.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1780.13 + * Other names may be trademarks of their respective owners.
1780.14 + *
1780.15 * The contents of this file are subject to the terms of either the GNU
1780.16 * General Public License Version 2 only ("GPL") or the Common
1780.17 * Development and Distribution License("CDDL") (collectively, the
1780.18 @@ -13,9 +16,9 @@
1780.19 * specific language governing permissions and limitations under the
1780.20 * License. When distributing the software, include this License Header
1780.21 * Notice in each file and include the License file at
1780.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1780.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1780.24 * particular file as subject to the "Classpath" exception as provided
1780.25 - * by Sun in the GPL Version 2 section of the License file that
1780.26 + * by Oracle in the GPL Version 2 section of the License file that
1780.27 * accompanied this code. If applicable, add the following below the
1780.28 * License Header, with the fields enclosed by brackets [] replaced by
1780.29 * your own identifying information:
1781.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/OpenEditOverride.java Fri Jul 16 11:47:36 2010 -0400
1781.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/OpenEditOverride.java Fri Jul 16 14:21:50 2010 -0400
1781.3 @@ -1,7 +1,10 @@
1781.4 /*
1781.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1781.6 *
1781.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1781.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1781.9 + *
1781.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1781.11 + * Other names may be trademarks of their respective owners.
1781.12 *
1781.13 * The contents of this file are subject to the terms of either the GNU
1781.14 * General Public License Version 2 only ("GPL") or the Common
1781.15 @@ -13,9 +16,9 @@
1781.16 * specific language governing permissions and limitations under the
1781.17 * License. When distributing the software, include this License Header
1781.18 * Notice in each file and include the License file at
1781.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1781.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1781.21 * particular file as subject to the "Classpath" exception as provided
1781.22 - * by Sun in the GPL Version 2 section of the License file that
1781.23 + * by Oracle in the GPL Version 2 section of the License file that
1781.24 * accompanied this code. If applicable, add the following below the
1781.25 * License Header, with the fields enclosed by brackets [] replaced by
1781.26 * your own identifying information:
1782.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/Utils.java Fri Jul 16 11:47:36 2010 -0400
1782.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/Utils.java Fri Jul 16 14:21:50 2010 -0400
1782.3 @@ -1,7 +1,10 @@
1782.4 /*
1782.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1782.6 *
1782.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1782.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1782.9 + *
1782.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1782.11 + * Other names may be trademarks of their respective owners.
1782.12 *
1782.13 * The contents of this file are subject to the terms of either the GNU
1782.14 * General Public License Version 2 only ("GPL") or the Common
1782.15 @@ -13,9 +16,9 @@
1782.16 * specific language governing permissions and limitations under the
1782.17 * License. When distributing the software, include this License Header
1782.18 * Notice in each file and include the License file at
1782.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1782.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1782.21 * particular file as subject to the "Classpath" exception as provided
1782.22 - * by Sun in the GPL Version 2 section of the License file that
1782.23 + * by Oracle in the GPL Version 2 section of the License file that
1782.24 * accompanied this code. If applicable, add the following below the
1782.25 * License Header, with the fields enclosed by brackets [] replaced by
1782.26 * your own identifying information:
1783.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/AccessJavaBean.xml Fri Jul 16 11:47:36 2010 -0400
1783.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/AccessJavaBean.xml Fri Jul 16 14:21:50 2010 -0400
1783.3 @@ -2,7 +2,10 @@
1783.4 <!--
1783.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1783.6
1783.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1783.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1783.9 +
1783.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1783.11 +Other names may be trademarks of their respective owners.
1783.12
1783.13
1783.14 The contents of this file are subject to the terms of either the GNU
1783.15 @@ -15,9 +18,9 @@
1783.16 specific language governing permissions and limitations under the
1783.17 License. When distributing the software, include this License Header
1783.18 Notice in each file and include the License file at
1783.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1783.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1783.21 particular file as subject to the "Classpath" exception as provided
1783.22 -by Sun in the GPL Version 2 section of the License file that
1783.23 +by Oracle in the GPL Version 2 section of the License file that
1783.24 accompanied this code. If applicable, add the following below the
1783.25 License Header, with the fields enclosed by brackets [] replaced by
1783.26 your own identifying information:
1784.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1784.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1784.3 @@ -1,6 +1,9 @@
1784.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1784.5 #
1784.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1784.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1784.8 +#
1784.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1784.10 +# Other names may be trademarks of their respective owners.
1784.11 #
1784.12 # The contents of this file are subject to the terms of either the GNU
1784.13 # General Public License Version 2 only ("GPL") or the Common
1784.14 @@ -12,9 +15,9 @@
1784.15 # specific language governing permissions and limitations under the
1784.16 # License. When distributing the software, include this License Header
1784.17 # Notice in each file and include the License file at
1784.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1784.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1784.20 # particular file as subject to the "Classpath" exception as provided
1784.21 -# by Sun in the GPL Version 2 section of the License file that
1784.22 +# by Oracle in the GPL Version 2 section of the License file that
1784.23 # accompanied this code. If applicable, add the following below the
1784.24 # License Header, with the fields enclosed by brackets [] replaced by
1784.25 # your own identifying information:
1785.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/CompareSubStrings.xml Fri Jul 16 11:47:36 2010 -0400
1785.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/CompareSubStrings.xml Fri Jul 16 14:21:50 2010 -0400
1785.3 @@ -2,7 +2,10 @@
1785.4 <!--
1785.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1785.6
1785.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1785.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1785.9 +
1785.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1785.11 +Other names may be trademarks of their respective owners.
1785.12
1785.13
1785.14 The contents of this file are subject to the terms of either the GNU
1785.15 @@ -15,9 +18,9 @@
1785.16 specific language governing permissions and limitations under the
1785.17 License. When distributing the software, include this License Header
1785.18 Notice in each file and include the License file at
1785.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1785.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1785.21 particular file as subject to the "Classpath" exception as provided
1785.22 -by Sun in the GPL Version 2 section of the License file that
1785.23 +by Oracle in the GPL Version 2 section of the License file that
1785.24 accompanied this code. If applicable, add the following below the
1785.25 License Header, with the fields enclosed by brackets [] replaced by
1785.26 your own identifying information:
1786.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ConcatenateStrings.xml Fri Jul 16 11:47:36 2010 -0400
1786.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ConcatenateStrings.xml Fri Jul 16 14:21:50 2010 -0400
1786.3 @@ -2,7 +2,10 @@
1786.4 <!--
1786.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1786.6
1786.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1786.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1786.9 +
1786.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1786.11 +Other names may be trademarks of their respective owners.
1786.12
1786.13
1786.14 The contents of this file are subject to the terms of either the GNU
1786.15 @@ -15,9 +18,9 @@
1786.16 specific language governing permissions and limitations under the
1786.17 License. When distributing the software, include this License Header
1786.18 Notice in each file and include the License file at
1786.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1786.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1786.21 particular file as subject to the "Classpath" exception as provided
1786.22 -by Sun in the GPL Version 2 section of the License file that
1786.23 +by Oracle in the GPL Version 2 section of the License file that
1786.24 accompanied this code. If applicable, add the following below the
1786.25 License Header, with the fields enclosed by brackets [] replaced by
1786.26 your own identifying information:
1787.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ConvertIntegerString.xml Fri Jul 16 11:47:36 2010 -0400
1787.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ConvertIntegerString.xml Fri Jul 16 14:21:50 2010 -0400
1787.3 @@ -2,7 +2,10 @@
1787.4 <!--
1787.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1787.6
1787.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1787.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1787.9 +
1787.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1787.11 +Other names may be trademarks of their respective owners.
1787.12
1787.13
1787.14 The contents of this file are subject to the terms of either the GNU
1787.15 @@ -15,9 +18,9 @@
1787.16 specific language governing permissions and limitations under the
1787.17 License. When distributing the software, include this License Header
1787.18 Notice in each file and include the License file at
1787.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1787.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1787.21 particular file as subject to the "Classpath" exception as provided
1787.22 -by Sun in the GPL Version 2 section of the License file that
1787.23 +by Oracle in the GPL Version 2 section of the License file that
1787.24 accompanied this code. If applicable, add the following below the
1787.25 License Header, with the fields enclosed by brackets [] replaced by
1787.26 your own identifying information:
1788.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ConvertStringInteger.xml Fri Jul 16 11:47:36 2010 -0400
1788.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ConvertStringInteger.xml Fri Jul 16 14:21:50 2010 -0400
1788.3 @@ -2,7 +2,10 @@
1788.4 <!--
1788.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1788.6
1788.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1788.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1788.9 +
1788.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1788.11 +Other names may be trademarks of their respective owners.
1788.12
1788.13
1788.14 The contents of this file are subject to the terms of either the GNU
1788.15 @@ -15,9 +18,9 @@
1788.16 specific language governing permissions and limitations under the
1788.17 License. When distributing the software, include this License Header
1788.18 Notice in each file and include the License file at
1788.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1788.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1788.21 particular file as subject to the "Classpath" exception as provided
1788.22 -by Sun in the GPL Version 2 section of the License file that
1788.23 +by Oracle in the GPL Version 2 section of the License file that
1788.24 accompanied this code. If applicable, add the following below the
1788.25 License Header, with the fields enclosed by brackets [] replaced by
1788.26 your own identifying information:
1789.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/CurrentDate.xml Fri Jul 16 11:47:36 2010 -0400
1789.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/CurrentDate.xml Fri Jul 16 14:21:50 2010 -0400
1789.3 @@ -2,7 +2,10 @@
1789.4 <!--
1789.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1789.6
1789.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1789.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1789.9 +
1789.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1789.11 +Other names may be trademarks of their respective owners.
1789.12
1789.13
1789.14 The contents of this file are subject to the terms of either the GNU
1789.15 @@ -15,9 +18,9 @@
1789.16 specific language governing permissions and limitations under the
1789.17 License. When distributing the software, include this License Header
1789.18 Notice in each file and include the License file at
1789.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1789.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1789.21 particular file as subject to the "Classpath" exception as provided
1789.22 -by Sun in the GPL Version 2 section of the License file that
1789.23 +by Oracle in the GPL Version 2 section of the License file that
1789.24 accompanied this code. If applicable, add the following below the
1789.25 License Header, with the fields enclosed by brackets [] replaced by
1789.26 your own identifying information:
1790.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ForLoop.xml Fri Jul 16 11:47:36 2010 -0400
1790.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ForLoop.xml Fri Jul 16 14:21:50 2010 -0400
1790.3 @@ -2,7 +2,10 @@
1790.4 <!--
1790.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1790.6
1790.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1790.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1790.9 +
1790.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1790.11 +Other names may be trademarks of their respective owners.
1790.12
1790.13
1790.14 The contents of this file are subject to the terms of either the GNU
1790.15 @@ -15,9 +18,9 @@
1790.16 specific language governing permissions and limitations under the
1790.17 License. When distributing the software, include this License Header
1790.18 Notice in each file and include the License file at
1790.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1790.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1790.21 particular file as subject to the "Classpath" exception as provided
1790.22 -by Sun in the GPL Version 2 section of the License file that
1790.23 +by Oracle in the GPL Version 2 section of the License file that
1790.24 accompanied this code. If applicable, add the following below the
1790.25 License Header, with the fields enclosed by brackets [] replaced by
1790.26 your own identifying information:
1791.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ForLoop5.xml Fri Jul 16 11:47:36 2010 -0400
1791.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/ForLoop5.xml Fri Jul 16 14:21:50 2010 -0400
1791.3 @@ -2,7 +2,10 @@
1791.4 <!--
1791.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1791.6
1791.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1791.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1791.9 +
1791.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1791.11 +Other names may be trademarks of their respective owners.
1791.12
1791.13
1791.14 The contents of this file are subject to the terms of either the GNU
1791.15 @@ -15,9 +18,9 @@
1791.16 specific language governing permissions and limitations under the
1791.17 License. When distributing the software, include this License Header
1791.18 Notice in each file and include the License file at
1791.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1791.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1791.21 particular file as subject to the "Classpath" exception as provided
1791.22 -by Sun in the GPL Version 2 section of the License file that
1791.23 +by Oracle in the GPL Version 2 section of the License file that
1791.24 accompanied this code. If applicable, add the following below the
1791.25 License Header, with the fields enclosed by brackets [] replaced by
1791.26 your own identifying information:
1792.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/GetCookie.xml Fri Jul 16 11:47:36 2010 -0400
1792.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/GetCookie.xml Fri Jul 16 14:21:50 2010 -0400
1792.3 @@ -2,7 +2,10 @@
1792.4 <!--
1792.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1792.6
1792.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1792.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1792.9 +
1792.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1792.11 +Other names may be trademarks of their respective owners.
1792.12
1792.13
1792.14 The contents of this file are subject to the terms of either the GNU
1792.15 @@ -15,9 +18,9 @@
1792.16 specific language governing permissions and limitations under the
1792.17 License. When distributing the software, include this License Header
1792.18 Notice in each file and include the License file at
1792.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1792.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1792.21 particular file as subject to the "Classpath" exception as provided
1792.22 -by Sun in the GPL Version 2 section of the License file that
1792.23 +by Oracle in the GPL Version 2 section of the License file that
1792.24 accompanied this code. If applicable, add the following below the
1792.25 License Header, with the fields enclosed by brackets [] replaced by
1792.26 your own identifying information:
1793.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/IfThenElse.xml Fri Jul 16 11:47:36 2010 -0400
1793.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/IfThenElse.xml Fri Jul 16 14:21:50 2010 -0400
1793.3 @@ -2,7 +2,10 @@
1793.4 <!--
1793.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1793.6
1793.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1793.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1793.9 +
1793.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1793.11 +Other names may be trademarks of their respective owners.
1793.12
1793.13
1793.14 The contents of this file are subject to the terms of either the GNU
1793.15 @@ -15,9 +18,9 @@
1793.16 specific language governing permissions and limitations under the
1793.17 License. When distributing the software, include this License Header
1793.18 Notice in each file and include the License file at
1793.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1793.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1793.21 particular file as subject to the "Classpath" exception as provided
1793.22 -by Sun in the GPL Version 2 section of the License file that
1793.23 +by Oracle in the GPL Version 2 section of the License file that
1793.24 accompanied this code. If applicable, add the following below the
1793.25 License Header, with the fields enclosed by brackets [] replaced by
1793.26 your own identifying information:
1794.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/Iterator.xml Fri Jul 16 11:47:36 2010 -0400
1794.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/Iterator.xml Fri Jul 16 14:21:50 2010 -0400
1794.3 @@ -2,7 +2,10 @@
1794.4 <!--
1794.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1794.6
1794.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1794.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1794.9 +
1794.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1794.11 +Other names may be trademarks of their respective owners.
1794.12
1794.13
1794.14 The contents of this file are subject to the terms of either the GNU
1794.15 @@ -15,9 +18,9 @@
1794.16 specific language governing permissions and limitations under the
1794.17 License. When distributing the software, include this License Header
1794.18 Notice in each file and include the License file at
1794.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1794.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1794.21 particular file as subject to the "Classpath" exception as provided
1794.22 -by Sun in the GPL Version 2 section of the License file that
1794.23 +by Oracle in the GPL Version 2 section of the License file that
1794.24 accompanied this code. If applicable, add the following below the
1794.25 License Header, with the fields enclosed by brackets [] replaced by
1794.26 your own identifying information:
1795.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/Iterator5.xml Fri Jul 16 11:47:36 2010 -0400
1795.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/Iterator5.xml Fri Jul 16 14:21:50 2010 -0400
1795.3 @@ -2,7 +2,10 @@
1795.4 <!--
1795.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1795.6
1795.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1795.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1795.9 +
1795.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1795.11 +Other names may be trademarks of their respective owners.
1795.12
1795.13
1795.14 The contents of this file are subject to the terms of either the GNU
1795.15 @@ -15,9 +18,9 @@
1795.16 specific language governing permissions and limitations under the
1795.17 License. When distributing the software, include this License Header
1795.18 Notice in each file and include the License file at
1795.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1795.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1795.21 particular file as subject to the "Classpath" exception as provided
1795.22 -by Sun in the GPL Version 2 section of the License file that
1795.23 +by Oracle in the GPL Version 2 section of the License file that
1795.24 accompanied this code. If applicable, add the following below the
1795.25 License Header, with the fields enclosed by brackets [] replaced by
1795.26 your own identifying information:
1796.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/LogMessages.xml Fri Jul 16 11:47:36 2010 -0400
1796.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/LogMessages.xml Fri Jul 16 14:21:50 2010 -0400
1796.3 @@ -2,7 +2,10 @@
1796.4 <!--
1796.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1796.6
1796.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1796.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1796.9 +
1796.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1796.11 +Other names may be trademarks of their respective owners.
1796.12
1796.13
1796.14 The contents of this file are subject to the terms of either the GNU
1796.15 @@ -15,9 +18,9 @@
1796.16 specific language governing permissions and limitations under the
1796.17 License. When distributing the software, include this License Header
1796.18 Notice in each file and include the License file at
1796.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1796.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1796.21 particular file as subject to the "Classpath" exception as provided
1796.22 -by Sun in the GPL Version 2 section of the License file that
1796.23 +by Oracle in the GPL Version 2 section of the License file that
1796.24 accompanied this code. If applicable, add the following below the
1796.25 License Header, with the fields enclosed by brackets [] replaced by
1796.26 your own identifying information:
1797.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/RetValFromApplication.xml Fri Jul 16 11:47:36 2010 -0400
1797.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/RetValFromApplication.xml Fri Jul 16 14:21:50 2010 -0400
1797.3 @@ -2,7 +2,10 @@
1797.4 <!--
1797.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1797.6
1797.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1797.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1797.9 +
1797.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1797.11 +Other names may be trademarks of their respective owners.
1797.12
1797.13
1797.14 The contents of this file are subject to the terms of either the GNU
1797.15 @@ -15,9 +18,9 @@
1797.16 specific language governing permissions and limitations under the
1797.17 License. When distributing the software, include this License Header
1797.18 Notice in each file and include the License file at
1797.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1797.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1797.21 particular file as subject to the "Classpath" exception as provided
1797.22 -by Sun in the GPL Version 2 section of the License file that
1797.23 +by Oracle in the GPL Version 2 section of the License file that
1797.24 accompanied this code. If applicable, add the following below the
1797.25 License Header, with the fields enclosed by brackets [] replaced by
1797.26 your own identifying information:
1798.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/RetValFromRequest.xml Fri Jul 16 11:47:36 2010 -0400
1798.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/RetValFromRequest.xml Fri Jul 16 14:21:50 2010 -0400
1798.3 @@ -2,7 +2,10 @@
1798.4 <!--
1798.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1798.6
1798.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1798.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1798.9 +
1798.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1798.11 +Other names may be trademarks of their respective owners.
1798.12
1798.13
1798.14 The contents of this file are subject to the terms of either the GNU
1798.15 @@ -15,9 +18,9 @@
1798.16 specific language governing permissions and limitations under the
1798.17 License. When distributing the software, include this License Header
1798.18 Notice in each file and include the License file at
1798.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1798.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1798.21 particular file as subject to the "Classpath" exception as provided
1798.22 -by Sun in the GPL Version 2 section of the License file that
1798.23 +by Oracle in the GPL Version 2 section of the License file that
1798.24 accompanied this code. If applicable, add the following below the
1798.25 License Header, with the fields enclosed by brackets [] replaced by
1798.26 your own identifying information:
1799.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/RetValFromSession.xml Fri Jul 16 11:47:36 2010 -0400
1799.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/RetValFromSession.xml Fri Jul 16 14:21:50 2010 -0400
1799.3 @@ -2,7 +2,10 @@
1799.4 <!--
1799.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1799.6
1799.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1799.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1799.9 +
1799.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1799.11 +Other names may be trademarks of their respective owners.
1799.12
1799.13
1799.14 The contents of this file are subject to the terms of either the GNU
1799.15 @@ -15,9 +18,9 @@
1799.16 specific language governing permissions and limitations under the
1799.17 License. When distributing the software, include this License Header
1799.18 Notice in each file and include the License file at
1799.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1799.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1799.21 particular file as subject to the "Classpath" exception as provided
1799.22 -by Sun in the GPL Version 2 section of the License file that
1799.23 +by Oracle in the GPL Version 2 section of the License file that
1799.24 accompanied this code. If applicable, add the following below the
1799.25 License Header, with the fields enclosed by brackets [] replaced by
1799.26 your own identifying information:
1800.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/SendEmail.xml Fri Jul 16 11:47:36 2010 -0400
1800.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/SendEmail.xml Fri Jul 16 14:21:50 2010 -0400
1800.3 @@ -2,7 +2,10 @@
1800.4 <!--
1800.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1800.6
1800.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1800.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1800.9 +
1800.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1800.11 +Other names may be trademarks of their respective owners.
1800.12
1800.13
1800.14 The contents of this file are subject to the terms of either the GNU
1800.15 @@ -15,9 +18,9 @@
1800.16 specific language governing permissions and limitations under the
1800.17 License. When distributing the software, include this License Header
1800.18 Notice in each file and include the License file at
1800.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1800.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1800.21 particular file as subject to the "Classpath" exception as provided
1800.22 -by Sun in the GPL Version 2 section of the License file that
1800.23 +by Oracle in the GPL Version 2 section of the License file that
1800.24 accompanied this code. If applicable, add the following below the
1800.25 License Header, with the fields enclosed by brackets [] replaced by
1800.26 your own identifying information:
1801.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/SetCookie.xml Fri Jul 16 11:47:36 2010 -0400
1801.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/SetCookie.xml Fri Jul 16 14:21:50 2010 -0400
1801.3 @@ -2,7 +2,10 @@
1801.4 <!--
1801.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1801.6
1801.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1801.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1801.9 +
1801.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1801.11 +Other names may be trademarks of their respective owners.
1801.12
1801.13
1801.14 The contents of this file are subject to the terms of either the GNU
1801.15 @@ -15,9 +18,9 @@
1801.16 specific language governing permissions and limitations under the
1801.17 License. When distributing the software, include this License Header
1801.18 Notice in each file and include the License file at
1801.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1801.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1801.21 particular file as subject to the "Classpath" exception as provided
1801.22 -by Sun in the GPL Version 2 section of the License file that
1801.23 +by Oracle in the GPL Version 2 section of the License file that
1801.24 accompanied this code. If applicable, add the following below the
1801.25 License Header, with the fields enclosed by brackets [] replaced by
1801.26 your own identifying information:
1802.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/StoreValInApplication.xml Fri Jul 16 11:47:36 2010 -0400
1802.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/StoreValInApplication.xml Fri Jul 16 14:21:50 2010 -0400
1802.3 @@ -2,7 +2,10 @@
1802.4 <!--
1802.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1802.6
1802.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1802.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1802.9 +
1802.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1802.11 +Other names may be trademarks of their respective owners.
1802.12
1802.13
1802.14 The contents of this file are subject to the terms of either the GNU
1802.15 @@ -15,9 +18,9 @@
1802.16 specific language governing permissions and limitations under the
1802.17 License. When distributing the software, include this License Header
1802.18 Notice in each file and include the License file at
1802.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1802.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1802.21 particular file as subject to the "Classpath" exception as provided
1802.22 -by Sun in the GPL Version 2 section of the License file that
1802.23 +by Oracle in the GPL Version 2 section of the License file that
1802.24 accompanied this code. If applicable, add the following below the
1802.25 License Header, with the fields enclosed by brackets [] replaced by
1802.26 your own identifying information:
1803.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/StoreValInRequest.xml Fri Jul 16 11:47:36 2010 -0400
1803.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/StoreValInRequest.xml Fri Jul 16 14:21:50 2010 -0400
1803.3 @@ -2,7 +2,10 @@
1803.4 <!--
1803.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1803.6
1803.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1803.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1803.9 +
1803.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1803.11 +Other names may be trademarks of their respective owners.
1803.12
1803.13
1803.14 The contents of this file are subject to the terms of either the GNU
1803.15 @@ -15,9 +18,9 @@
1803.16 specific language governing permissions and limitations under the
1803.17 License. When distributing the software, include this License Header
1803.18 Notice in each file and include the License file at
1803.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1803.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1803.21 particular file as subject to the "Classpath" exception as provided
1803.22 -by Sun in the GPL Version 2 section of the License file that
1803.23 +by Oracle in the GPL Version 2 section of the License file that
1803.24 accompanied this code. If applicable, add the following below the
1803.25 License Header, with the fields enclosed by brackets [] replaced by
1803.26 your own identifying information:
1804.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/StoreValInSession.xml Fri Jul 16 11:47:36 2010 -0400
1804.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/StoreValInSession.xml Fri Jul 16 14:21:50 2010 -0400
1804.3 @@ -2,7 +2,10 @@
1804.4 <!--
1804.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1804.6
1804.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1804.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1804.9 +
1804.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1804.11 +Other names may be trademarks of their respective owners.
1804.12
1804.13
1804.14 The contents of this file are subject to the terms of either the GNU
1804.15 @@ -15,9 +18,9 @@
1804.16 specific language governing permissions and limitations under the
1804.17 License. When distributing the software, include this License Header
1804.18 Notice in each file and include the License file at
1804.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1804.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1804.21 particular file as subject to the "Classpath" exception as provided
1804.22 -by Sun in the GPL Version 2 section of the License file that
1804.23 +by Oracle in the GPL Version 2 section of the License file that
1804.24 accompanied this code. If applicable, add the following below the
1804.25 License Header, with the fields enclosed by brackets [] replaced by
1804.26 your own identifying information:
1805.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/SwitchStatement.xml Fri Jul 16 11:47:36 2010 -0400
1805.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/SwitchStatement.xml Fri Jul 16 14:21:50 2010 -0400
1805.3 @@ -2,7 +2,10 @@
1805.4 <!--
1805.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1805.6
1805.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1805.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1805.9 +
1805.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1805.11 +Other names may be trademarks of their respective owners.
1805.12
1805.13
1805.14 The contents of this file are subject to the terms of either the GNU
1805.15 @@ -15,9 +18,9 @@
1805.16 specific language governing permissions and limitations under the
1805.17 License. When distributing the software, include this License Header
1805.18 Notice in each file and include the License file at
1805.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1805.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1805.21 particular file as subject to the "Classpath" exception as provided
1805.22 -by Sun in the GPL Version 2 section of the License file that
1805.23 +by Oracle in the GPL Version 2 section of the License file that
1805.24 accompanied this code. If applicable, add the following below the
1805.25 License Header, with the fields enclosed by brackets [] replaced by
1805.26 your own identifying information:
1806.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/TryCatchException.xml Fri Jul 16 11:47:36 2010 -0400
1806.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/TryCatchException.xml Fri Jul 16 14:21:50 2010 -0400
1806.3 @@ -2,7 +2,10 @@
1806.4 <!--
1806.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1806.6
1806.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1806.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1806.9 +
1806.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1806.11 +Other names may be trademarks of their respective owners.
1806.12
1806.13
1806.14 The contents of this file are subject to the terms of either the GNU
1806.15 @@ -15,9 +18,9 @@
1806.16 specific language governing permissions and limitations under the
1806.17 License. When distributing the software, include this License Header
1806.18 Notice in each file and include the License file at
1806.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1806.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1806.21 particular file as subject to the "Classpath" exception as provided
1806.22 -by Sun in the GPL Version 2 section of the License file that
1806.23 +by Oracle in the GPL Version 2 section of the License file that
1806.24 accompanied this code. If applicable, add the following below the
1806.25 License Header, with the fields enclosed by brackets [] replaced by
1806.26 your own identifying information:
1807.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/WhileLoop.xml Fri Jul 16 11:47:36 2010 -0400
1807.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/codeclips/WhileLoop.xml Fri Jul 16 14:21:50 2010 -0400
1807.3 @@ -2,7 +2,10 @@
1807.4 <!--
1807.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1807.6
1807.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1807.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1807.9 +
1807.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1807.11 +Other names may be trademarks of their respective owners.
1807.12
1807.13
1807.14 The contents of this file are subject to the terms of either the GNU
1807.15 @@ -15,9 +18,9 @@
1807.16 specific language governing permissions and limitations under the
1807.17 License. When distributing the software, include this License Header
1807.18 Notice in each file and include the License file at
1807.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1807.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1807.21 particular file as subject to the "Classpath" exception as provided
1807.22 -by Sun in the GPL Version 2 section of the License file that
1807.23 +by Oracle in the GPL Version 2 section of the License file that
1807.24 accompanied this code. If applicable, add the following below the
1807.25 License Header, with the fields enclosed by brackets [] replaced by
1807.26 your own identifying information:
1808.1 --- a/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/layer.xml Fri Jul 16 11:47:36 2010 -0400
1808.2 +++ b/visualweb.project.jsfloader/src/org/netbeans/modules/visualweb/project/jsfloader/layer.xml Fri Jul 16 14:21:50 2010 -0400
1808.3 @@ -2,7 +2,10 @@
1808.4 <!--
1808.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1808.6
1808.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1808.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1808.9 +
1808.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1808.11 +Other names may be trademarks of their respective owners.
1808.12
1808.13
1808.14 The contents of this file are subject to the terms of either the GNU
1808.15 @@ -15,9 +18,9 @@
1808.16 specific language governing permissions and limitations under the
1808.17 License. When distributing the software, include this License Header
1808.18 Notice in each file and include the License file at
1808.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1808.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1808.21 particular file as subject to the "Classpath" exception as provided
1808.22 -by Sun in the GPL Version 2 section of the License file that
1808.23 +by Oracle in the GPL Version 2 section of the License file that
1808.24 accompanied this code. If applicable, add the following below the
1808.25 License Header, with the fields enclosed by brackets [] replaced by
1808.26 your own identifying information:
1809.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObjectTest.java Fri Jul 16 11:47:36 2010 -0400
1809.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJavaDataObjectTest.java Fri Jul 16 14:21:50 2010 -0400
1809.3 @@ -1,8 +1,11 @@
1809.4 /*
1809.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1809.6 - *
1809.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1809.8 - *
1809.9 + *
1809.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1809.11 + *
1809.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1809.13 + * Other names may be trademarks of their respective owners.
1809.14 + *
1809.15 * The contents of this file are subject to the terms of either the GNU
1809.16 * General Public License Version 2 only ("GPL") or the Common
1809.17 * Development and Distribution License("CDDL") (collectively, the
1809.18 @@ -13,9 +16,9 @@
1809.19 * specific language governing permissions and limitations under the
1809.20 * License. When distributing the software, include this License Header
1809.21 * Notice in each file and include the License file at
1809.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1809.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1809.24 * particular file as subject to the "Classpath" exception as provided
1809.25 - * by Sun in the GPL Version 2 section of the License file that
1809.26 + * by Oracle in the GPL Version 2 section of the License file that
1809.27 * accompanied this code. If applicable, add the following below the
1809.28 * License Header, with the fields enclosed by brackets [] replaced by
1809.29 * your own identifying information:
1810.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObjectTest.java Fri Jul 16 11:47:36 2010 -0400
1810.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/JsfJspDataObjectTest.java Fri Jul 16 14:21:50 2010 -0400
1810.3 @@ -1,8 +1,11 @@
1810.4 /*
1810.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1810.6 - *
1810.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1810.8 - *
1810.9 + *
1810.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1810.11 + *
1810.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1810.13 + * Other names may be trademarks of their respective owners.
1810.14 + *
1810.15 * The contents of this file are subject to the terms of either the GNU
1810.16 * General Public License Version 2 only ("GPL") or the Common
1810.17 * Development and Distribution License("CDDL") (collectively, the
1810.18 @@ -13,9 +16,9 @@
1810.19 * specific language governing permissions and limitations under the
1810.20 * License. When distributing the software, include this License Header
1810.21 * Notice in each file and include the License file at
1810.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1810.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1810.24 * particular file as subject to the "Classpath" exception as provided
1810.25 - * by Sun in the GPL Version 2 section of the License file that
1810.26 + * by Oracle in the GPL Version 2 section of the License file that
1810.27 * accompanied this code. If applicable, add the following below the
1810.28 * License Header, with the fields enclosed by brackets [] replaced by
1810.29 * your own identifying information:
1811.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/JsfLoaderMimeResolver.java Fri Jul 16 11:47:36 2010 -0400
1811.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/JsfLoaderMimeResolver.java Fri Jul 16 14:21:50 2010 -0400
1811.3 @@ -1,7 +1,10 @@
1811.4 /*
1811.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1811.6 *
1811.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1811.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1811.9 + *
1811.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1811.11 + * Other names may be trademarks of their respective owners.
1811.12 *
1811.13 * The contents of this file are subject to the terms of either the GNU
1811.14 * General Public License Version 2 only ("GPL") or the Common
1811.15 @@ -13,9 +16,9 @@
1811.16 * specific language governing permissions and limitations under the
1811.17 * License. When distributing the software, include this License Header
1811.18 * Notice in each file and include the License file at
1811.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1811.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1811.21 * particular file as subject to the "Classpath" exception as provided
1811.22 - * by Sun in the GPL Version 2 section of the License file that
1811.23 + * by Oracle in the GPL Version 2 section of the License file that
1811.24 * accompanied this code. If applicable, add the following below the
1811.25 * License Header, with the fields enclosed by brackets [] replaced by
1811.26 * your own identifying information:
1812.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/MockOpenProjectsTrampoline.java Fri Jul 16 11:47:36 2010 -0400
1812.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/MockOpenProjectsTrampoline.java Fri Jul 16 14:21:50 2010 -0400
1812.3 @@ -1,7 +1,10 @@
1812.4 /*
1812.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1812.6 *
1812.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1812.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1812.9 + *
1812.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1812.11 + * Other names may be trademarks of their respective owners.
1812.12 *
1812.13 * The contents of this file are subject to the terms of either the GNU
1812.14 * General Public License Version 2 only ("GPL") or the Common
1812.15 @@ -13,9 +16,9 @@
1812.16 * specific language governing permissions and limitations under the
1812.17 * License. When distributing the software, include this License Header
1812.18 * Notice in each file and include the License file at
1812.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1812.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1812.21 * particular file as subject to the "Classpath" exception as provided
1812.22 - * by Sun in the GPL Version 2 section of the License file that
1812.23 + * by Oracle in the GPL Version 2 section of the License file that
1812.24 * accompanied this code. If applicable, add the following below the
1812.25 * License Header, with the fields enclosed by brackets [] replaced by
1812.26 * your own identifying information:
1813.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/SetupUtils.java Fri Jul 16 11:47:36 2010 -0400
1813.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/SetupUtils.java Fri Jul 16 14:21:50 2010 -0400
1813.3 @@ -1,8 +1,11 @@
1813.4 /*
1813.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1813.6 - *
1813.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1813.8 - *
1813.9 + *
1813.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1813.11 + *
1813.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1813.13 + * Other names may be trademarks of their respective owners.
1813.14 + *
1813.15 * The contents of this file are subject to the terms of either the GNU
1813.16 * General Public License Version 2 only ("GPL") or the Common
1813.17 * Development and Distribution License("CDDL") (collectively, the
1813.18 @@ -13,9 +16,9 @@
1813.19 * specific language governing permissions and limitations under the
1813.20 * License. When distributing the software, include this License Header
1813.21 * Notice in each file and include the License file at
1813.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1813.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1813.24 * particular file as subject to the "Classpath" exception as provided
1813.25 - * by Sun in the GPL Version 2 section of the License file that
1813.26 + * by Oracle in the GPL Version 2 section of the License file that
1813.27 * accompanied this code. If applicable, add the following below the
1813.28 * License Header, with the fields enclosed by brackets [] replaced by
1813.29 * your own identifying information:
1814.1 --- a/visualweb.propertyeditors.api/build.xml Fri Jul 16 11:47:36 2010 -0400
1814.2 +++ b/visualweb.propertyeditors.api/build.xml Fri Jul 16 14:21:50 2010 -0400
1814.3 @@ -2,7 +2,10 @@
1814.4 <!--
1814.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1814.6
1814.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1814.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1814.9 +
1814.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1814.11 +Other names may be trademarks of their respective owners.
1814.12
1814.13
1814.14 The contents of this file are subject to the terms of either the GNU
1814.15 @@ -15,9 +18,9 @@
1814.16 specific language governing permissions and limitations under the
1814.17 License. When distributing the software, include this License Header
1814.18 Notice in each file and include the License file at
1814.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1814.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1814.21 particular file as subject to the "Classpath" exception as provided
1814.22 -by Sun in the GPL Version 2 section of the License file that
1814.23 +by Oracle in the GPL Version 2 section of the License file that
1814.24 accompanied this code. If applicable, add the following below the
1814.25 License Header, with the fields enclosed by brackets [] replaced by
1814.26 your own identifying information:
1815.1 --- a/visualweb.propertyeditors.api/library/build.xml Fri Jul 16 11:47:36 2010 -0400
1815.2 +++ b/visualweb.propertyeditors.api/library/build.xml Fri Jul 16 14:21:50 2010 -0400
1815.3 @@ -2,7 +2,10 @@
1815.4 <!--
1815.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1815.6
1815.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1815.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1815.9 +
1815.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1815.11 +Other names may be trademarks of their respective owners.
1815.12
1815.13
1815.14 The contents of this file are subject to the terms of either the GNU
1815.15 @@ -15,9 +18,9 @@
1815.16 specific language governing permissions and limitations under the
1815.17 License. When distributing the software, include this License Header
1815.18 Notice in each file and include the License file at
1815.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1815.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1815.21 particular file as subject to the "Classpath" exception as provided
1815.22 -by Sun in the GPL Version 2 section of the License file that
1815.23 +by Oracle in the GPL Version 2 section of the License file that
1815.24 accompanied this code. If applicable, add the following below the
1815.25 License Header, with the fields enclosed by brackets [] replaced by
1815.26 your own identifying information:
1816.1 --- a/visualweb.propertyeditors.api/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1816.2 +++ b/visualweb.propertyeditors.api/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1816.3 @@ -1,6 +1,9 @@
1816.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1816.5 #
1816.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1816.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1816.8 +#
1816.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1816.10 +# Other names may be trademarks of their respective owners.
1816.11 #
1816.12 # The contents of this file are subject to the terms of either the GNU
1816.13 # General Public License Version 2 only ("GPL") or the Common
1816.14 @@ -12,9 +15,9 @@
1816.15 # specific language governing permissions and limitations under the
1816.16 # License. When distributing the software, include this License Header
1816.17 # Notice in each file and include the License file at
1816.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1816.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1816.20 # particular file as subject to the "Classpath" exception as provided
1816.21 -# by Sun in the GPL Version 2 section of the License file that
1816.22 +# by Oracle in the GPL Version 2 section of the License file that
1816.23 # accompanied this code. If applicable, add the following below the
1816.24 # License Header, with the fields enclosed by brackets [] replaced by
1816.25 # your own identifying information:
1816.26 @@ -58,7 +61,7 @@
1816.27 file.reference.dataprovider.jar=../../visualweb.dataprovider/library/dist/dataprovider.jar
1816.28 file.reference.designtime.jar=../../visualweb.designtime/library/dist/designtime.jar
1816.29 # Have JSF1.2 API, JSP & Servlet API
1816.30 -file.reference.servlet2.5-jsp2.1-api.jar=../../servletjspapi/external/servlet2.5-jsp2.1-api.jar
1816.31 +file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
1816.32 file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
1816.33
1816.34 includes=**
1816.35 @@ -66,7 +69,7 @@
1816.36 javac.classpath=\
1816.37 ${file.reference.designtime.jar}:\
1816.38 ${file.reference.dataprovider.jar}:\
1816.39 - ${file.reference.servlet2.5-jsp2.1-api.jar}:\
1816.40 + ${file.reference.servlet3.0-jsp2.2-api.jar}:\
1816.41 ${file.reference.jsf-api.jar}
1816.42 # Space-separated list of extra javac options
1816.43 javac.compilerargs=
1817.1 --- a/visualweb.propertyeditors.api/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1817.2 +++ b/visualweb.propertyeditors.api/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1817.3 @@ -2,7 +2,10 @@
1817.4 <!--
1817.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1817.6
1817.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1817.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1817.9 +
1817.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1817.11 +Other names may be trademarks of their respective owners.
1817.12
1817.13
1817.14 The contents of this file are subject to the terms of either the GNU
1817.15 @@ -15,9 +18,9 @@
1817.16 specific language governing permissions and limitations under the
1817.17 License. When distributing the software, include this License Header
1817.18 Notice in each file and include the License file at
1817.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1817.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1817.21 particular file as subject to the "Classpath" exception as provided
1817.22 -by Sun in the GPL Version 2 section of the License file that
1817.23 +by Oracle in the GPL Version 2 section of the License file that
1817.24 accompanied this code. If applicable, add the following below the
1817.25 License Header, with the fields enclosed by brackets [] replaced by
1817.26 your own identifying information:
1818.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/jsfcl/std/css/CssStylePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1818.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/jsfcl/std/css/CssStylePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1818.3 @@ -1,7 +1,10 @@
1818.4 /*
1818.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1818.6 *
1818.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1818.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1818.9 + *
1818.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1818.11 + * Other names may be trademarks of their respective owners.
1818.12 *
1818.13 * The contents of this file are subject to the terms of either the GNU
1818.14 * General Public License Version 2 only ("GPL") or the Common
1818.15 @@ -13,9 +16,9 @@
1818.16 * specific language governing permissions and limitations under the
1818.17 * License. When distributing the software, include this License Header
1818.18 * Notice in each file and include the License file at
1818.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1818.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1818.21 * particular file as subject to the "Classpath" exception as provided
1818.22 - * by Sun in the GPL Version 2 section of the License file that
1818.23 + * by Oracle in the GPL Version 2 section of the License file that
1818.24 * accompanied this code. If applicable, add the following below the
1818.25 * License Header, with the fields enclosed by brackets [] replaced by
1818.26 * your own identifying information:
1819.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/ConverterPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1819.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/ConverterPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1819.3 @@ -1,7 +1,10 @@
1819.4 /*
1819.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1819.6 *
1819.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1819.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1819.9 + *
1819.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1819.11 + * Other names may be trademarks of their respective owners.
1819.12 *
1819.13 * The contents of this file are subject to the terms of either the GNU
1819.14 * General Public License Version 2 only ("GPL") or the Common
1819.15 @@ -13,9 +16,9 @@
1819.16 * specific language governing permissions and limitations under the
1819.17 * License. When distributing the software, include this License Header
1819.18 * Notice in each file and include the License file at
1819.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1819.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1819.21 * particular file as subject to the "Classpath" exception as provided
1819.22 - * by Sun in the GPL Version 2 section of the License file that
1819.23 + * by Oracle in the GPL Version 2 section of the License file that
1819.24 * accompanied this code. If applicable, add the following below the
1819.25 * License Header, with the fields enclosed by brackets [] replaced by
1819.26 * your own identifying information:
1820.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/DateFormatPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1820.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/DateFormatPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1820.3 @@ -1,7 +1,10 @@
1820.4 /*
1820.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1820.6 *
1820.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1820.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1820.9 + *
1820.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1820.11 + * Other names may be trademarks of their respective owners.
1820.12 *
1820.13 * The contents of this file are subject to the terms of either the GNU
1820.14 * General Public License Version 2 only ("GPL") or the Common
1820.15 @@ -13,9 +16,9 @@
1820.16 * specific language governing permissions and limitations under the
1820.17 * License. When distributing the software, include this License Header
1820.18 * Notice in each file and include the License file at
1820.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1820.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1820.21 * particular file as subject to the "Classpath" exception as provided
1820.22 - * by Sun in the GPL Version 2 section of the License file that
1820.23 + * by Oracle in the GPL Version 2 section of the License file that
1820.24 * accompanied this code. If applicable, add the following below the
1820.25 * License Header, with the fields enclosed by brackets [] replaced by
1820.26 * your own identifying information:
1821.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/DatePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1821.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/DatePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1821.3 @@ -1,7 +1,10 @@
1821.4 /*
1821.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1821.6 *
1821.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1821.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1821.9 + *
1821.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1821.11 + * Other names may be trademarks of their respective owners.
1821.12 *
1821.13 * The contents of this file are subject to the terms of either the GNU
1821.14 * General Public License Version 2 only ("GPL") or the Common
1821.15 @@ -13,9 +16,9 @@
1821.16 * specific language governing permissions and limitations under the
1821.17 * License. When distributing the software, include this License Header
1821.18 * Notice in each file and include the License file at
1821.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1821.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1821.21 * particular file as subject to the "Classpath" exception as provided
1821.22 - * by Sun in the GPL Version 2 section of the License file that
1821.23 + * by Oracle in the GPL Version 2 section of the License file that
1821.24 * accompanied this code. If applicable, add the following below the
1821.25 * License Header, with the fields enclosed by brackets [] replaced by
1821.26 * your own identifying information:
1822.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/DomainPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1822.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/DomainPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1822.3 @@ -1,7 +1,10 @@
1822.4 /*
1822.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1822.6 *
1822.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1822.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1822.9 + *
1822.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1822.11 + * Other names may be trademarks of their respective owners.
1822.12 *
1822.13 * The contents of this file are subject to the terms of either the GNU
1822.14 * General Public License Version 2 only ("GPL") or the Common
1822.15 @@ -13,9 +16,9 @@
1822.16 * specific language governing permissions and limitations under the
1822.17 * License. When distributing the software, include this License Header
1822.18 * Notice in each file and include the License file at
1822.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1822.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1822.21 * particular file as subject to the "Classpath" exception as provided
1822.22 - * by Sun in the GPL Version 2 section of the License file that
1822.23 + * by Oracle in the GPL Version 2 section of the License file that
1822.24 * accompanied this code. If applicable, add the following below the
1822.25 * License Header, with the fields enclosed by brackets [] replaced by
1822.26 * your own identifying information:
1823.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/DoublePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1823.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/DoublePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1823.3 @@ -1,7 +1,10 @@
1823.4 /*
1823.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1823.6 *
1823.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1823.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1823.9 + *
1823.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1823.11 + * Other names may be trademarks of their respective owners.
1823.12 *
1823.13 * The contents of this file are subject to the terms of either the GNU
1823.14 * General Public License Version 2 only ("GPL") or the Common
1823.15 @@ -13,9 +16,9 @@
1823.16 * specific language governing permissions and limitations under the
1823.17 * License. When distributing the software, include this License Header
1823.18 * Notice in each file and include the License file at
1823.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1823.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1823.21 * particular file as subject to the "Classpath" exception as provided
1823.22 - * by Sun in the GPL Version 2 section of the License file that
1823.23 + * by Oracle in the GPL Version 2 section of the License file that
1823.24 * accompanied this code. If applicable, add the following below the
1823.25 * License Header, with the fields enclosed by brackets [] replaced by
1823.26 * your own identifying information:
1824.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/ImageUrlPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1824.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/ImageUrlPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1824.3 @@ -1,7 +1,10 @@
1824.4 /*
1824.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1824.6 *
1824.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1824.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1824.9 + *
1824.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1824.11 + * Other names may be trademarks of their respective owners.
1824.12 *
1824.13 * The contents of this file are subject to the terms of either the GNU
1824.14 * General Public License Version 2 only ("GPL") or the Common
1824.15 @@ -13,9 +16,9 @@
1824.16 * specific language governing permissions and limitations under the
1824.17 * License. When distributing the software, include this License Header
1824.18 * Notice in each file and include the License file at
1824.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1824.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1824.21 * particular file as subject to the "Classpath" exception as provided
1824.22 - * by Sun in the GPL Version 2 section of the License file that
1824.23 + * by Oracle in the GPL Version 2 section of the License file that
1824.24 * accompanied this code. If applicable, add the following below the
1824.25 * License Header, with the fields enclosed by brackets [] replaced by
1824.26 * your own identifying information:
1825.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/IntegerPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1825.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/IntegerPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1825.3 @@ -1,7 +1,10 @@
1825.4 /*
1825.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1825.6 *
1825.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1825.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1825.9 + *
1825.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1825.11 + * Other names may be trademarks of their respective owners.
1825.12 *
1825.13 * The contents of this file are subject to the terms of either the GNU
1825.14 * General Public License Version 2 only ("GPL") or the Common
1825.15 @@ -13,9 +16,9 @@
1825.16 * specific language governing permissions and limitations under the
1825.17 * License. When distributing the software, include this License Header
1825.18 * Notice in each file and include the License file at
1825.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1825.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1825.21 * particular file as subject to the "Classpath" exception as provided
1825.22 - * by Sun in the GPL Version 2 section of the License file that
1825.23 + * by Oracle in the GPL Version 2 section of the License file that
1825.24 * accompanied this code. If applicable, add the following below the
1825.25 * License Header, with the fields enclosed by brackets [] replaced by
1825.26 * your own identifying information:
1826.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/JavaScriptPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1826.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/JavaScriptPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1826.3 @@ -1,7 +1,10 @@
1826.4 /*
1826.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1826.6 *
1826.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1826.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1826.9 + *
1826.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1826.11 + * Other names may be trademarks of their respective owners.
1826.12 *
1826.13 * The contents of this file are subject to the terms of either the GNU
1826.14 * General Public License Version 2 only ("GPL") or the Common
1826.15 @@ -13,9 +16,9 @@
1826.16 * specific language governing permissions and limitations under the
1826.17 * License. When distributing the software, include this License Header
1826.18 * Notice in each file and include the License file at
1826.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1826.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1826.21 * particular file as subject to the "Classpath" exception as provided
1826.22 - * by Sun in the GPL Version 2 section of the License file that
1826.23 + * by Oracle in the GPL Version 2 section of the License file that
1826.24 * accompanied this code. If applicable, add the following below the
1826.25 * License Header, with the fields enclosed by brackets [] replaced by
1826.26 * your own identifying information:
1827.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/LengthPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1827.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/LengthPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1827.3 @@ -1,7 +1,10 @@
1827.4 /*
1827.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1827.6 *
1827.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1827.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1827.9 + *
1827.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1827.11 + * Other names may be trademarks of their respective owners.
1827.12 *
1827.13 * The contents of this file are subject to the terms of either the GNU
1827.14 * General Public License Version 2 only ("GPL") or the Common
1827.15 @@ -13,9 +16,9 @@
1827.16 * specific language governing permissions and limitations under the
1827.17 * License. When distributing the software, include this License Header
1827.18 * Notice in each file and include the License file at
1827.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1827.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1827.21 * particular file as subject to the "Classpath" exception as provided
1827.22 - * by Sun in the GPL Version 2 section of the License file that
1827.23 + * by Oracle in the GPL Version 2 section of the License file that
1827.24 * accompanied this code. If applicable, add the following below the
1827.25 * License Header, with the fields enclosed by brackets [] replaced by
1827.26 * your own identifying information:
1828.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/LongPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1828.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/LongPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1828.3 @@ -1,7 +1,10 @@
1828.4 /*
1828.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1828.6 *
1828.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1828.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1828.9 + *
1828.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1828.11 + * Other names may be trademarks of their respective owners.
1828.12 *
1828.13 * The contents of this file are subject to the terms of either the GNU
1828.14 * General Public License Version 2 only ("GPL") or the Common
1828.15 @@ -13,9 +16,9 @@
1828.16 * specific language governing permissions and limitations under the
1828.17 * License. When distributing the software, include this License Header
1828.18 * Notice in each file and include the License file at
1828.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1828.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1828.21 * particular file as subject to the "Classpath" exception as provided
1828.22 - * by Sun in the GPL Version 2 section of the License file that
1828.23 + * by Oracle in the GPL Version 2 section of the License file that
1828.24 * accompanied this code. If applicable, add the following below the
1828.25 * License Header, with the fields enclosed by brackets [] replaced by
1828.26 * your own identifying information:
1829.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/MethodBindingPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1829.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/MethodBindingPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1829.3 @@ -1,7 +1,10 @@
1829.4 /*
1829.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1829.6 *
1829.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1829.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1829.9 + *
1829.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1829.11 + * Other names may be trademarks of their respective owners.
1829.12 *
1829.13 * The contents of this file are subject to the terms of either the GNU
1829.14 * General Public License Version 2 only ("GPL") or the Common
1829.15 @@ -13,9 +16,9 @@
1829.16 * specific language governing permissions and limitations under the
1829.17 * License. When distributing the software, include this License Header
1829.18 * Notice in each file and include the License file at
1829.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1829.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1829.21 * particular file as subject to the "Classpath" exception as provided
1829.22 - * by Sun in the GPL Version 2 section of the License file that
1829.23 + * by Oracle in the GPL Version 2 section of the License file that
1829.24 * accompanied this code. If applicable, add the following below the
1829.25 * License Header, with the fields enclosed by brackets [] replaced by
1829.26 * your own identifying information:
1830.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/SelectOneDomainEditor.java Fri Jul 16 11:47:36 2010 -0400
1830.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/SelectOneDomainEditor.java Fri Jul 16 14:21:50 2010 -0400
1830.3 @@ -1,7 +1,10 @@
1830.4 /*
1830.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1830.6 *
1830.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1830.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1830.9 + *
1830.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1830.11 + * Other names may be trademarks of their respective owners.
1830.12 *
1830.13 * The contents of this file are subject to the terms of either the GNU
1830.14 * General Public License Version 2 only ("GPL") or the Common
1830.15 @@ -13,9 +16,9 @@
1830.16 * specific language governing permissions and limitations under the
1830.17 * License. When distributing the software, include this License Header
1830.18 * Notice in each file and include the License file at
1830.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1830.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1830.21 * particular file as subject to the "Classpath" exception as provided
1830.22 - * by Sun in the GPL Version 2 section of the License file that
1830.23 + * by Oracle in the GPL Version 2 section of the License file that
1830.24 * accompanied this code. If applicable, add the following below the
1830.25 * License Header, with the fields enclosed by brackets [] replaced by
1830.26 * your own identifying information:
1831.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/StringArrayPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1831.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/StringArrayPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1831.3 @@ -1,7 +1,10 @@
1831.4 /*
1831.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1831.6 *
1831.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1831.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1831.9 + *
1831.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1831.11 + * Other names may be trademarks of their respective owners.
1831.12 *
1831.13 * The contents of this file are subject to the terms of either the GNU
1831.14 * General Public License Version 2 only ("GPL") or the Common
1831.15 @@ -13,9 +16,9 @@
1831.16 * specific language governing permissions and limitations under the
1831.17 * License. When distributing the software, include this License Header
1831.18 * Notice in each file and include the License file at
1831.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1831.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1831.21 * particular file as subject to the "Classpath" exception as provided
1831.22 - * by Sun in the GPL Version 2 section of the License file that
1831.23 + * by Oracle in the GPL Version 2 section of the License file that
1831.24 * accompanied this code. If applicable, add the following below the
1831.25 * License Header, with the fields enclosed by brackets [] replaced by
1831.26 * your own identifying information:
1832.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/StringPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1832.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/StringPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1832.3 @@ -1,7 +1,10 @@
1832.4 /*
1832.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1832.6 *
1832.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1832.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1832.9 + *
1832.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1832.11 + * Other names may be trademarks of their respective owners.
1832.12 *
1832.13 * The contents of this file are subject to the terms of either the GNU
1832.14 * General Public License Version 2 only ("GPL") or the Common
1832.15 @@ -13,9 +16,9 @@
1832.16 * specific language governing permissions and limitations under the
1832.17 * License. When distributing the software, include this License Header
1832.18 * Notice in each file and include the License file at
1832.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1832.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1832.21 * particular file as subject to the "Classpath" exception as provided
1832.22 - * by Sun in the GPL Version 2 section of the License file that
1832.23 + * by Oracle in the GPL Version 2 section of the License file that
1832.24 * accompanied this code. If applicable, add the following below the
1832.25 * License Header, with the fields enclosed by brackets [] replaced by
1832.26 * your own identifying information:
1833.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/StyleClassPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1833.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/StyleClassPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1833.3 @@ -1,7 +1,10 @@
1833.4 /*
1833.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1833.6 *
1833.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1833.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1833.9 + *
1833.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1833.11 + * Other names may be trademarks of their respective owners.
1833.12 *
1833.13 * The contents of this file are subject to the terms of either the GNU
1833.14 * General Public License Version 2 only ("GPL") or the Common
1833.15 @@ -13,9 +16,9 @@
1833.16 * specific language governing permissions and limitations under the
1833.17 * License. When distributing the software, include this License Header
1833.18 * Notice in each file and include the License file at
1833.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1833.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1833.21 * particular file as subject to the "Classpath" exception as provided
1833.22 - * by Sun in the GPL Version 2 section of the License file that
1833.23 + * by Oracle in the GPL Version 2 section of the License file that
1833.24 * accompanied this code. If applicable, add the following below the
1833.25 * License Header, with the fields enclosed by brackets [] replaced by
1833.26 * your own identifying information:
1834.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/UrlPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1834.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/UrlPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1834.3 @@ -1,7 +1,10 @@
1834.4 /*
1834.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1834.6 *
1834.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1834.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1834.9 + *
1834.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1834.11 + * Other names may be trademarks of their respective owners.
1834.12 *
1834.13 * The contents of this file are subject to the terms of either the GNU
1834.14 * General Public License Version 2 only ("GPL") or the Common
1834.15 @@ -13,9 +16,9 @@
1834.16 * specific language governing permissions and limitations under the
1834.17 * License. When distributing the software, include this License Header
1834.18 * Notice in each file and include the License file at
1834.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1834.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1834.21 * particular file as subject to the "Classpath" exception as provided
1834.22 - * by Sun in the GPL Version 2 section of the License file that
1834.23 + * by Oracle in the GPL Version 2 section of the License file that
1834.24 * accompanied this code. If applicable, add the following below the
1834.25 * License Header, with the fields enclosed by brackets [] replaced by
1834.26 * your own identifying information:
1835.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/ValidatorPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1835.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/ValidatorPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1835.3 @@ -1,7 +1,10 @@
1835.4 /*
1835.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1835.6 *
1835.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1835.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1835.9 + *
1835.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1835.11 + * Other names may be trademarks of their respective owners.
1835.12 *
1835.13 * The contents of this file are subject to the terms of either the GNU
1835.14 * General Public License Version 2 only ("GPL") or the Common
1835.15 @@ -13,9 +16,9 @@
1835.16 * specific language governing permissions and limitations under the
1835.17 * License. When distributing the software, include this License Header
1835.18 * Notice in each file and include the License file at
1835.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1835.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1835.21 * particular file as subject to the "Classpath" exception as provided
1835.22 - * by Sun in the GPL Version 2 section of the License file that
1835.23 + * by Oracle in the GPL Version 2 section of the License file that
1835.24 * accompanied this code. If applicable, add the following below the
1835.25 * License Header, with the fields enclosed by brackets [] replaced by
1835.26 * your own identifying information:
1836.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/binding/DataBindingHelper.java Fri Jul 16 11:47:36 2010 -0400
1836.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/binding/DataBindingHelper.java Fri Jul 16 14:21:50 2010 -0400
1836.3 @@ -1,7 +1,10 @@
1836.4 /*
1836.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1836.6 *
1836.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1836.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1836.9 + *
1836.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1836.11 + * Other names may be trademarks of their respective owners.
1836.12 *
1836.13 * The contents of this file are subject to the terms of either the GNU
1836.14 * General Public License Version 2 only ("GPL") or the Common
1836.15 @@ -13,9 +16,9 @@
1836.16 * specific language governing permissions and limitations under the
1836.17 * License. When distributing the software, include this License Header
1836.18 * Notice in each file and include the License file at
1836.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1836.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1836.21 * particular file as subject to the "Classpath" exception as provided
1836.22 - * by Sun in the GPL Version 2 section of the License file that
1836.23 + * by Oracle in the GPL Version 2 section of the License file that
1836.24 * accompanied this code. If applicable, add the following below the
1836.25 * License Header, with the fields enclosed by brackets [] replaced by
1836.26 * your own identifying information:
1837.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/binding/DataBindingHelperRegistry.java Fri Jul 16 11:47:36 2010 -0400
1837.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/binding/DataBindingHelperRegistry.java Fri Jul 16 14:21:50 2010 -0400
1837.3 @@ -1,7 +1,10 @@
1837.4 /*
1837.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1837.6 *
1837.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1837.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1837.9 + *
1837.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1837.11 + * Other names may be trademarks of their respective owners.
1837.12 *
1837.13 * The contents of this file are subject to the terms of either the GNU
1837.14 * General Public License Version 2 only ("GPL") or the Common
1837.15 @@ -13,9 +16,9 @@
1837.16 * specific language governing permissions and limitations under the
1837.17 * License. When distributing the software, include this License Header
1837.18 * Notice in each file and include the License file at
1837.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1837.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1837.21 * particular file as subject to the "Classpath" exception as provided
1837.22 - * by Sun in the GPL Version 2 section of the License file that
1837.23 + * by Oracle in the GPL Version 2 section of the License file that
1837.24 * accompanied this code. If applicable, add the following below the
1837.25 * License Header, with the fields enclosed by brackets [] replaced by
1837.26 * your own identifying information:
1838.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/binding/ValueBindingPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1838.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/binding/ValueBindingPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1838.3 @@ -1,7 +1,10 @@
1838.4 /*
1838.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1838.6 *
1838.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1838.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1838.9 + *
1838.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1838.11 + * Other names may be trademarks of their respective owners.
1838.12 *
1838.13 * The contents of this file are subject to the terms of either the GNU
1838.14 * General Public License Version 2 only ("GPL") or the Common
1838.15 @@ -13,9 +16,9 @@
1838.16 * specific language governing permissions and limitations under the
1838.17 * License. When distributing the software, include this License Header
1838.18 * Notice in each file and include the License file at
1838.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1838.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1838.21 * particular file as subject to the "Classpath" exception as provided
1838.22 - * by Sun in the GPL Version 2 section of the License file that
1838.23 + * by Oracle in the GPL Version 2 section of the License file that
1838.24 * accompanied this code. If applicable, add the following below the
1838.25 * License Header, with the fields enclosed by brackets [] replaced by
1838.26 * your own identifying information:
1839.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/css/CssStylePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1839.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/css/CssStylePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1839.3 @@ -1,7 +1,10 @@
1839.4 /*
1839.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1839.6 *
1839.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1839.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1839.9 + *
1839.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1839.11 + * Other names may be trademarks of their respective owners.
1839.12 *
1839.13 * The contents of this file are subject to the terms of either the GNU
1839.14 * General Public License Version 2 only ("GPL") or the Common
1839.15 @@ -13,9 +16,9 @@
1839.16 * specific language governing permissions and limitations under the
1839.17 * License. When distributing the software, include this License Header
1839.18 * Notice in each file and include the License file at
1839.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1839.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1839.21 * particular file as subject to the "Classpath" exception as provided
1839.22 - * by Sun in the GPL Version 2 section of the License file that
1839.23 + * by Oracle in the GPL Version 2 section of the License file that
1839.24 * accompanied this code. If applicable, add the following below the
1839.25 * License Header, with the fields enclosed by brackets [] replaced by
1839.26 * your own identifying information:
1840.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/ActionComponentIdsDomain.java Fri Jul 16 11:47:36 2010 -0400
1840.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/ActionComponentIdsDomain.java Fri Jul 16 14:21:50 2010 -0400
1840.3 @@ -1,7 +1,10 @@
1840.4 /*
1840.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1840.6 *
1840.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1840.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1840.9 + *
1840.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1840.11 + * Other names may be trademarks of their respective owners.
1840.12 *
1840.13 * The contents of this file are subject to the terms of either the GNU
1840.14 * General Public License Version 2 only ("GPL") or the Common
1840.15 @@ -13,9 +16,9 @@
1840.16 * specific language governing permissions and limitations under the
1840.17 * License. When distributing the software, include this License Header
1840.18 * Notice in each file and include the License file at
1840.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1840.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1840.21 * particular file as subject to the "Classpath" exception as provided
1840.22 - * by Sun in the GPL Version 2 section of the License file that
1840.23 + * by Oracle in the GPL Version 2 section of the License file that
1840.24 * accompanied this code. If applicable, add the following below the
1840.25 * License Header, with the fields enclosed by brackets [] replaced by
1840.26 * your own identifying information:
1841.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/AttachedDomain.java Fri Jul 16 11:47:36 2010 -0400
1841.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/AttachedDomain.java Fri Jul 16 14:21:50 2010 -0400
1841.3 @@ -1,7 +1,10 @@
1841.4 /*
1841.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1841.6 *
1841.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1841.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1841.9 + *
1841.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1841.11 + * Other names may be trademarks of their respective owners.
1841.12 *
1841.13 * The contents of this file are subject to the terms of either the GNU
1841.14 * General Public License Version 2 only ("GPL") or the Common
1841.15 @@ -13,9 +16,9 @@
1841.16 * specific language governing permissions and limitations under the
1841.17 * License. When distributing the software, include this License Header
1841.18 * Notice in each file and include the License file at
1841.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1841.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1841.21 * particular file as subject to the "Classpath" exception as provided
1841.22 - * by Sun in the GPL Version 2 section of the License file that
1841.23 + * by Oracle in the GPL Version 2 section of the License file that
1841.24 * accompanied this code. If applicable, add the following below the
1841.25 * License Header, with the fields enclosed by brackets [] replaced by
1841.26 * your own identifying information:
1842.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1842.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1842.3 @@ -1,6 +1,9 @@
1842.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1842.5 #
1842.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1842.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1842.8 +#
1842.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1842.10 +# Other names may be trademarks of their respective owners.
1842.11 #
1842.12 # The contents of this file are subject to the terms of either the GNU
1842.13 # General Public License Version 2 only ("GPL") or the Common
1842.14 @@ -12,9 +15,9 @@
1842.15 # specific language governing permissions and limitations under the
1842.16 # License. When distributing the software, include this License Header
1842.17 # Notice in each file and include the License file at
1842.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1842.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1842.20 # particular file as subject to the "Classpath" exception as provided
1842.21 -# by Sun in the GPL Version 2 section of the License file that
1842.22 +# by Oracle in the GPL Version 2 section of the License file that
1842.23 # accompanied this code. If applicable, add the following below the
1842.24 # License Header, with the fields enclosed by brackets [] replaced by
1842.25 # your own identifying information:
1843.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/CharacterSetsDomain.java Fri Jul 16 11:47:36 2010 -0400
1843.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/CharacterSetsDomain.java Fri Jul 16 14:21:50 2010 -0400
1843.3 @@ -1,7 +1,10 @@
1843.4 /*
1843.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1843.6 *
1843.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1843.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1843.9 + *
1843.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1843.11 + * Other names may be trademarks of their respective owners.
1843.12 *
1843.13 * The contents of this file are subject to the terms of either the GNU
1843.14 * General Public License Version 2 only ("GPL") or the Common
1843.15 @@ -13,9 +16,9 @@
1843.16 * specific language governing permissions and limitations under the
1843.17 * License. When distributing the software, include this License Header
1843.18 * Notice in each file and include the License file at
1843.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1843.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1843.21 * particular file as subject to the "Classpath" exception as provided
1843.22 - * by Sun in the GPL Version 2 section of the License file that
1843.23 + * by Oracle in the GPL Version 2 section of the License file that
1843.24 * accompanied this code. If applicable, add the following below the
1843.25 * License Header, with the fields enclosed by brackets [] replaced by
1843.26 * your own identifying information:
1844.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/ComponentIdsDomain.java Fri Jul 16 11:47:36 2010 -0400
1844.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/ComponentIdsDomain.java Fri Jul 16 14:21:50 2010 -0400
1844.3 @@ -1,7 +1,10 @@
1844.4 /*
1844.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1844.6 *
1844.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1844.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1844.9 + *
1844.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1844.11 + * Other names may be trademarks of their respective owners.
1844.12 *
1844.13 * The contents of this file are subject to the terms of either the GNU
1844.14 * General Public License Version 2 only ("GPL") or the Common
1844.15 @@ -13,9 +16,9 @@
1844.16 * specific language governing permissions and limitations under the
1844.17 * License. When distributing the software, include this License Header
1844.18 * Notice in each file and include the License file at
1844.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1844.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1844.21 * particular file as subject to the "Classpath" exception as provided
1844.22 - * by Sun in the GPL Version 2 section of the License file that
1844.23 + * by Oracle in the GPL Version 2 section of the License file that
1844.24 * accompanied this code. If applicable, add the following below the
1844.25 * License Header, with the fields enclosed by brackets [] replaced by
1844.26 * your own identifying information:
1845.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/DateFormatPatternsDomain.java Fri Jul 16 11:47:36 2010 -0400
1845.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/DateFormatPatternsDomain.java Fri Jul 16 14:21:50 2010 -0400
1845.3 @@ -1,7 +1,10 @@
1845.4 /*
1845.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1845.6 *
1845.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1845.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1845.9 + *
1845.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1845.11 + * Other names may be trademarks of their respective owners.
1845.12 *
1845.13 * The contents of this file are subject to the terms of either the GNU
1845.14 * General Public License Version 2 only ("GPL") or the Common
1845.15 @@ -13,9 +16,9 @@
1845.16 * specific language governing permissions and limitations under the
1845.17 * License. When distributing the software, include this License Header
1845.18 * Notice in each file and include the License file at
1845.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1845.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1845.21 * particular file as subject to the "Classpath" exception as provided
1845.22 - * by Sun in the GPL Version 2 section of the License file that
1845.23 + * by Oracle in the GPL Version 2 section of the License file that
1845.24 * accompanied this code. If applicable, add the following below the
1845.25 * License Header, with the fields enclosed by brackets [] replaced by
1845.26 * your own identifying information:
1846.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/Domain.java Fri Jul 16 11:47:36 2010 -0400
1846.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/Domain.java Fri Jul 16 14:21:50 2010 -0400
1846.3 @@ -1,7 +1,10 @@
1846.4 /*
1846.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1846.6 *
1846.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1846.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1846.9 + *
1846.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1846.11 + * Other names may be trademarks of their respective owners.
1846.12 *
1846.13 * The contents of this file are subject to the terms of either the GNU
1846.14 * General Public License Version 2 only ("GPL") or the Common
1846.15 @@ -13,9 +16,9 @@
1846.16 * specific language governing permissions and limitations under the
1846.17 * License. When distributing the software, include this License Header
1846.18 * Notice in each file and include the License file at
1846.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1846.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1846.21 * particular file as subject to the "Classpath" exception as provided
1846.22 - * by Sun in the GPL Version 2 section of the License file that
1846.23 + * by Oracle in the GPL Version 2 section of the License file that
1846.24 * accompanied this code. If applicable, add the following below the
1846.25 * License Header, with the fields enclosed by brackets [] replaced by
1846.26 * your own identifying information:
1847.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/EditableDomain.java Fri Jul 16 11:47:36 2010 -0400
1847.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/EditableDomain.java Fri Jul 16 14:21:50 2010 -0400
1847.3 @@ -1,7 +1,10 @@
1847.4 /*
1847.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1847.6 *
1847.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1847.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1847.9 + *
1847.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1847.11 + * Other names may be trademarks of their respective owners.
1847.12 *
1847.13 * The contents of this file are subject to the terms of either the GNU
1847.14 * General Public License Version 2 only ("GPL") or the Common
1847.15 @@ -13,9 +16,9 @@
1847.16 * specific language governing permissions and limitations under the
1847.17 * License. When distributing the software, include this License Header
1847.18 * Notice in each file and include the License file at
1847.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1847.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1847.21 * particular file as subject to the "Classpath" exception as provided
1847.22 - * by Sun in the GPL Version 2 section of the License file that
1847.23 + * by Oracle in the GPL Version 2 section of the License file that
1847.24 * accompanied this code. If applicable, add the following below the
1847.25 * License Header, with the fields enclosed by brackets [] replaced by
1847.26 * your own identifying information:
1848.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/Element.java Fri Jul 16 11:47:36 2010 -0400
1848.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/Element.java Fri Jul 16 14:21:50 2010 -0400
1848.3 @@ -1,7 +1,10 @@
1848.4 /*
1848.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1848.6 *
1848.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1848.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1848.9 + *
1848.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1848.11 + * Other names may be trademarks of their respective owners.
1848.12 *
1848.13 * The contents of this file are subject to the terms of either the GNU
1848.14 * General Public License Version 2 only ("GPL") or the Common
1848.15 @@ -13,9 +16,9 @@
1848.16 * specific language governing permissions and limitations under the
1848.17 * License. When distributing the software, include this License Header
1848.18 * Notice in each file and include the License file at
1848.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1848.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1848.21 * particular file as subject to the "Classpath" exception as provided
1848.22 - * by Sun in the GPL Version 2 section of the License file that
1848.23 + * by Oracle in the GPL Version 2 section of the License file that
1848.24 * accompanied this code. If applicable, add the following below the
1848.25 * License Header, with the fields enclosed by brackets [] replaced by
1848.26 * your own identifying information:
1849.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/EventComponentIdsDomain.java Fri Jul 16 11:47:36 2010 -0400
1849.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/EventComponentIdsDomain.java Fri Jul 16 14:21:50 2010 -0400
1849.3 @@ -1,7 +1,10 @@
1849.4 /*
1849.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1849.6 *
1849.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1849.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1849.9 + *
1849.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1849.11 + * Other names may be trademarks of their respective owners.
1849.12 *
1849.13 * The contents of this file are subject to the terms of either the GNU
1849.14 * General Public License Version 2 only ("GPL") or the Common
1849.15 @@ -13,9 +16,9 @@
1849.16 * specific language governing permissions and limitations under the
1849.17 * License. When distributing the software, include this License Header
1849.18 * Notice in each file and include the License file at
1849.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1849.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1849.21 * particular file as subject to the "Classpath" exception as provided
1849.22 - * by Sun in the GPL Version 2 section of the License file that
1849.23 + * by Oracle in the GPL Version 2 section of the License file that
1849.24 * accompanied this code. If applicable, add the following below the
1849.25 * License Header, with the fields enclosed by brackets [] replaced by
1849.26 * your own identifying information:
1850.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/FieldKeyDomain.java Fri Jul 16 11:47:36 2010 -0400
1850.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/FieldKeyDomain.java Fri Jul 16 14:21:50 2010 -0400
1850.3 @@ -1,7 +1,10 @@
1850.4 /*
1850.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1850.6 *
1850.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1850.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1850.9 + *
1850.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1850.11 + * Other names may be trademarks of their respective owners.
1850.12 *
1850.13 * The contents of this file are subject to the terms of either the GNU
1850.14 * General Public License Version 2 only ("GPL") or the Common
1850.15 @@ -13,9 +16,9 @@
1850.16 * specific language governing permissions and limitations under the
1850.17 * License. When distributing the software, include this License Header
1850.18 * Notice in each file and include the License file at
1850.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1850.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1850.21 * particular file as subject to the "Classpath" exception as provided
1850.22 - * by Sun in the GPL Version 2 section of the License file that
1850.23 + * by Oracle in the GPL Version 2 section of the License file that
1850.24 * accompanied this code. If applicable, add the following below the
1850.25 * License Header, with the fields enclosed by brackets [] replaced by
1850.26 * your own identifying information:
1851.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/FrameTargetsDomain.java Fri Jul 16 11:47:36 2010 -0400
1851.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/FrameTargetsDomain.java Fri Jul 16 14:21:50 2010 -0400
1851.3 @@ -1,7 +1,10 @@
1851.4 /*
1851.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1851.6 *
1851.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1851.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1851.9 + *
1851.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1851.11 + * Other names may be trademarks of their respective owners.
1851.12 *
1851.13 * The contents of this file are subject to the terms of either the GNU
1851.14 * General Public License Version 2 only ("GPL") or the Common
1851.15 @@ -13,9 +16,9 @@
1851.16 * specific language governing permissions and limitations under the
1851.17 * License. When distributing the software, include this License Header
1851.18 * Notice in each file and include the License file at
1851.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1851.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1851.21 * particular file as subject to the "Classpath" exception as provided
1851.22 - * by Sun in the GPL Version 2 section of the License file that
1851.23 + * by Oracle in the GPL Version 2 section of the License file that
1851.24 * accompanied this code. If applicable, add the following below the
1851.25 * License Header, with the fields enclosed by brackets [] replaced by
1851.26 * your own identifying information:
1852.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlAlignDomain.java Fri Jul 16 11:47:36 2010 -0400
1852.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlAlignDomain.java Fri Jul 16 14:21:50 2010 -0400
1852.3 @@ -1,7 +1,10 @@
1852.4 /*
1852.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1852.6 *
1852.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1852.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1852.9 + *
1852.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1852.11 + * Other names may be trademarks of their respective owners.
1852.12 *
1852.13 * The contents of this file are subject to the terms of either the GNU
1852.14 * General Public License Version 2 only ("GPL") or the Common
1852.15 @@ -13,9 +16,9 @@
1852.16 * specific language governing permissions and limitations under the
1852.17 * License. When distributing the software, include this License Header
1852.18 * Notice in each file and include the License file at
1852.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1852.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1852.21 * particular file as subject to the "Classpath" exception as provided
1852.22 - * by Sun in the GPL Version 2 section of the License file that
1852.23 + * by Oracle in the GPL Version 2 section of the License file that
1852.24 * accompanied this code. If applicable, add the following below the
1852.25 * License Header, with the fields enclosed by brackets [] replaced by
1852.26 * your own identifying information:
1853.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlFrameTargetsDomain.java Fri Jul 16 11:47:36 2010 -0400
1853.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlFrameTargetsDomain.java Fri Jul 16 14:21:50 2010 -0400
1853.3 @@ -1,7 +1,10 @@
1853.4 /*
1853.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1853.6 *
1853.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1853.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1853.9 + *
1853.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1853.11 + * Other names may be trademarks of their respective owners.
1853.12 *
1853.13 * The contents of this file are subject to the terms of either the GNU
1853.14 * General Public License Version 2 only ("GPL") or the Common
1853.15 @@ -13,9 +16,9 @@
1853.16 * specific language governing permissions and limitations under the
1853.17 * License. When distributing the software, include this License Header
1853.18 * Notice in each file and include the License file at
1853.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1853.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1853.21 * particular file as subject to the "Classpath" exception as provided
1853.22 - * by Sun in the GPL Version 2 section of the License file that
1853.23 + * by Oracle in the GPL Version 2 section of the License file that
1853.24 * accompanied this code. If applicable, add the following below the
1853.25 * License Header, with the fields enclosed by brackets [] replaced by
1853.26 * your own identifying information:
1854.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlHorizontalAlignDomain.java Fri Jul 16 11:47:36 2010 -0400
1854.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlHorizontalAlignDomain.java Fri Jul 16 14:21:50 2010 -0400
1854.3 @@ -1,7 +1,10 @@
1854.4 /*
1854.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1854.6 *
1854.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1854.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1854.9 + *
1854.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1854.11 + * Other names may be trademarks of their respective owners.
1854.12 *
1854.13 * The contents of this file are subject to the terms of either the GNU
1854.14 * General Public License Version 2 only ("GPL") or the Common
1854.15 @@ -13,9 +16,9 @@
1854.16 * specific language governing permissions and limitations under the
1854.17 * License. When distributing the software, include this License Header
1854.18 * Notice in each file and include the License file at
1854.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1854.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1854.21 * particular file as subject to the "Classpath" exception as provided
1854.22 - * by Sun in the GPL Version 2 section of the License file that
1854.23 + * by Oracle in the GPL Version 2 section of the License file that
1854.24 * accompanied this code. If applicable, add the following below the
1854.25 * License Header, with the fields enclosed by brackets [] replaced by
1854.26 * your own identifying information:
1855.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlLinkTypesDomain.java Fri Jul 16 11:47:36 2010 -0400
1855.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlLinkTypesDomain.java Fri Jul 16 14:21:50 2010 -0400
1855.3 @@ -1,7 +1,10 @@
1855.4 /*
1855.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1855.6 *
1855.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1855.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1855.9 + *
1855.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1855.11 + * Other names may be trademarks of their respective owners.
1855.12 *
1855.13 * The contents of this file are subject to the terms of either the GNU
1855.14 * General Public License Version 2 only ("GPL") or the Common
1855.15 @@ -13,9 +16,9 @@
1855.16 * specific language governing permissions and limitations under the
1855.17 * License. When distributing the software, include this License Header
1855.18 * Notice in each file and include the License file at
1855.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1855.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1855.21 * particular file as subject to the "Classpath" exception as provided
1855.22 - * by Sun in the GPL Version 2 section of the License file that
1855.23 + * by Oracle in the GPL Version 2 section of the License file that
1855.24 * accompanied this code. If applicable, add the following below the
1855.25 * License Header, with the fields enclosed by brackets [] replaced by
1855.26 * your own identifying information:
1856.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlRegionShapesDomain.java Fri Jul 16 11:47:36 2010 -0400
1856.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlRegionShapesDomain.java Fri Jul 16 14:21:50 2010 -0400
1856.3 @@ -1,7 +1,10 @@
1856.4 /*
1856.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1856.6 *
1856.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1856.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1856.9 + *
1856.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1856.11 + * Other names may be trademarks of their respective owners.
1856.12 *
1856.13 * The contents of this file are subject to the terms of either the GNU
1856.14 * General Public License Version 2 only ("GPL") or the Common
1856.15 @@ -13,9 +16,9 @@
1856.16 * specific language governing permissions and limitations under the
1856.17 * License. When distributing the software, include this License Header
1856.18 * Notice in each file and include the License file at
1856.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1856.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1856.21 * particular file as subject to the "Classpath" exception as provided
1856.22 - * by Sun in the GPL Version 2 section of the License file that
1856.23 + * by Oracle in the GPL Version 2 section of the License file that
1856.24 * accompanied this code. If applicable, add the following below the
1856.25 * License Header, with the fields enclosed by brackets [] replaced by
1856.26 * your own identifying information:
1857.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlTableBordersDomain.java Fri Jul 16 11:47:36 2010 -0400
1857.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlTableBordersDomain.java Fri Jul 16 14:21:50 2010 -0400
1857.3 @@ -1,7 +1,10 @@
1857.4 /*
1857.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1857.6 *
1857.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1857.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1857.9 + *
1857.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1857.11 + * Other names may be trademarks of their respective owners.
1857.12 *
1857.13 * The contents of this file are subject to the terms of either the GNU
1857.14 * General Public License Version 2 only ("GPL") or the Common
1857.15 @@ -13,9 +16,9 @@
1857.16 * specific language governing permissions and limitations under the
1857.17 * License. When distributing the software, include this License Header
1857.18 * Notice in each file and include the License file at
1857.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1857.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1857.21 * particular file as subject to the "Classpath" exception as provided
1857.22 - * by Sun in the GPL Version 2 section of the License file that
1857.23 + * by Oracle in the GPL Version 2 section of the License file that
1857.24 * accompanied this code. If applicable, add the following below the
1857.25 * License Header, with the fields enclosed by brackets [] replaced by
1857.26 * your own identifying information:
1858.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlTableRulesDomain.java Fri Jul 16 11:47:36 2010 -0400
1858.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlTableRulesDomain.java Fri Jul 16 14:21:50 2010 -0400
1858.3 @@ -1,7 +1,10 @@
1858.4 /*
1858.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1858.6 *
1858.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1858.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1858.9 + *
1858.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1858.11 + * Other names may be trademarks of their respective owners.
1858.12 *
1858.13 * The contents of this file are subject to the terms of either the GNU
1858.14 * General Public License Version 2 only ("GPL") or the Common
1858.15 @@ -13,9 +16,9 @@
1858.16 * specific language governing permissions and limitations under the
1858.17 * License. When distributing the software, include this License Header
1858.18 * Notice in each file and include the License file at
1858.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1858.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1858.21 * particular file as subject to the "Classpath" exception as provided
1858.22 - * by Sun in the GPL Version 2 section of the License file that
1858.23 + * by Oracle in the GPL Version 2 section of the License file that
1858.24 * accompanied this code. If applicable, add the following below the
1858.25 * License Header, with the fields enclosed by brackets [] replaced by
1858.26 * your own identifying information:
1859.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlVerticalAlignDomain.java Fri Jul 16 11:47:36 2010 -0400
1859.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/HtmlVerticalAlignDomain.java Fri Jul 16 14:21:50 2010 -0400
1859.3 @@ -1,7 +1,10 @@
1859.4 /*
1859.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1859.6 *
1859.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1859.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1859.9 + *
1859.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1859.11 + * Other names may be trademarks of their respective owners.
1859.12 *
1859.13 * The contents of this file are subject to the terms of either the GNU
1859.14 * General Public License Version 2 only ("GPL") or the Common
1859.15 @@ -13,9 +16,9 @@
1859.16 * specific language governing permissions and limitations under the
1859.17 * License. When distributing the software, include this License Header
1859.18 * Notice in each file and include the License file at
1859.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1859.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1859.21 * particular file as subject to the "Classpath" exception as provided
1859.22 - * by Sun in the GPL Version 2 section of the License file that
1859.23 + * by Oracle in the GPL Version 2 section of the License file that
1859.24 * accompanied this code. If applicable, add the following below the
1859.25 * License Header, with the fields enclosed by brackets [] replaced by
1859.26 * your own identifying information:
1860.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/InputComponentIdsDomain.java Fri Jul 16 11:47:36 2010 -0400
1860.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/InputComponentIdsDomain.java Fri Jul 16 14:21:50 2010 -0400
1860.3 @@ -1,7 +1,10 @@
1860.4 /*
1860.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1860.6 *
1860.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1860.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1860.9 + *
1860.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1860.11 + * Other names may be trademarks of their respective owners.
1860.12 *
1860.13 * The contents of this file are subject to the terms of either the GNU
1860.14 * General Public License Version 2 only ("GPL") or the Common
1860.15 @@ -13,9 +16,9 @@
1860.16 * specific language governing permissions and limitations under the
1860.17 * License. When distributing the software, include this License Header
1860.18 * Notice in each file and include the License file at
1860.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1860.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1860.21 * particular file as subject to the "Classpath" exception as provided
1860.22 - * by Sun in the GPL Version 2 section of the License file that
1860.23 + * by Oracle in the GPL Version 2 section of the License file that
1860.24 * accompanied this code. If applicable, add the following below the
1860.25 * License Header, with the fields enclosed by brackets [] replaced by
1860.26 * your own identifying information:
1861.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/InstanceVariableDomain.java Fri Jul 16 11:47:36 2010 -0400
1861.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/InstanceVariableDomain.java Fri Jul 16 14:21:50 2010 -0400
1861.3 @@ -1,7 +1,10 @@
1861.4 /*
1861.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1861.6 *
1861.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1861.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1861.9 + *
1861.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1861.11 + * Other names may be trademarks of their respective owners.
1861.12 *
1861.13 * The contents of this file are subject to the terms of either the GNU
1861.14 * General Public License Version 2 only ("GPL") or the Common
1861.15 @@ -13,9 +16,9 @@
1861.16 * specific language governing permissions and limitations under the
1861.17 * License. When distributing the software, include this License Header
1861.18 * Notice in each file and include the License file at
1861.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1861.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1861.21 * particular file as subject to the "Classpath" exception as provided
1861.22 - * by Sun in the GPL Version 2 section of the License file that
1861.23 + * by Oracle in the GPL Version 2 section of the License file that
1861.24 * accompanied this code. If applicable, add the following below the
1861.25 * License Header, with the fields enclosed by brackets [] replaced by
1861.26 * your own identifying information:
1862.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/LanguagesDomain.java Fri Jul 16 11:47:36 2010 -0400
1862.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/LanguagesDomain.java Fri Jul 16 14:21:50 2010 -0400
1862.3 @@ -1,7 +1,10 @@
1862.4 /*
1862.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1862.6 *
1862.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1862.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1862.9 + *
1862.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1862.11 + * Other names may be trademarks of their respective owners.
1862.12 *
1862.13 * The contents of this file are subject to the terms of either the GNU
1862.14 * General Public License Version 2 only ("GPL") or the Common
1862.15 @@ -13,9 +16,9 @@
1862.16 * specific language governing permissions and limitations under the
1862.17 * License. When distributing the software, include this License Header
1862.18 * Notice in each file and include the License file at
1862.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1862.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1862.21 * particular file as subject to the "Classpath" exception as provided
1862.22 - * by Sun in the GPL Version 2 section of the License file that
1862.23 + * by Oracle in the GPL Version 2 section of the License file that
1862.24 * accompanied this code. If applicable, add the following below the
1862.25 * License Header, with the fields enclosed by brackets [] replaced by
1862.26 * your own identifying information:
1863.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/LayoutDomain.java Fri Jul 16 11:47:36 2010 -0400
1863.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/LayoutDomain.java Fri Jul 16 14:21:50 2010 -0400
1863.3 @@ -1,7 +1,10 @@
1863.4 /*
1863.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1863.6 *
1863.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1863.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1863.9 + *
1863.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1863.11 + * Other names may be trademarks of their respective owners.
1863.12 *
1863.13 * The contents of this file are subject to the terms of either the GNU
1863.14 * General Public License Version 2 only ("GPL") or the Common
1863.15 @@ -13,9 +16,9 @@
1863.16 * specific language governing permissions and limitations under the
1863.17 * License. When distributing the software, include this License Header
1863.18 * Notice in each file and include the License file at
1863.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1863.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1863.21 * particular file as subject to the "Classpath" exception as provided
1863.22 - * by Sun in the GPL Version 2 section of the License file that
1863.23 + * by Oracle in the GPL Version 2 section of the License file that
1863.24 * accompanied this code. If applicable, add the following below the
1863.25 * License Header, with the fields enclosed by brackets [] replaced by
1863.26 * your own identifying information:
1864.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/LocalesDomain.java Fri Jul 16 11:47:36 2010 -0400
1864.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/LocalesDomain.java Fri Jul 16 14:21:50 2010 -0400
1864.3 @@ -1,7 +1,10 @@
1864.4 /*
1864.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1864.6 *
1864.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1864.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1864.9 + *
1864.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1864.11 + * Other names may be trademarks of their respective owners.
1864.12 *
1864.13 * The contents of this file are subject to the terms of either the GNU
1864.14 * General Public License Version 2 only ("GPL") or the Common
1864.15 @@ -13,9 +16,9 @@
1864.16 * specific language governing permissions and limitations under the
1864.17 * License. When distributing the software, include this License Header
1864.18 * Notice in each file and include the License file at
1864.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1864.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1864.21 * particular file as subject to the "Classpath" exception as provided
1864.22 - * by Sun in the GPL Version 2 section of the License file that
1864.23 + * by Oracle in the GPL Version 2 section of the License file that
1864.24 * accompanied this code. If applicable, add the following below the
1864.25 * License Header, with the fields enclosed by brackets [] replaced by
1864.26 * your own identifying information:
1865.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/MimeTypesDomain.java Fri Jul 16 11:47:36 2010 -0400
1865.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/MimeTypesDomain.java Fri Jul 16 14:21:50 2010 -0400
1865.3 @@ -1,7 +1,10 @@
1865.4 /*
1865.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1865.6 *
1865.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1865.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1865.9 + *
1865.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1865.11 + * Other names may be trademarks of their respective owners.
1865.12 *
1865.13 * The contents of this file are subject to the terms of either the GNU
1865.14 * General Public License Version 2 only ("GPL") or the Common
1865.15 @@ -13,9 +16,9 @@
1865.16 * specific language governing permissions and limitations under the
1865.17 * License. When distributing the software, include this License Header
1865.18 * Notice in each file and include the License file at
1865.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1865.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1865.21 * particular file as subject to the "Classpath" exception as provided
1865.22 - * by Sun in the GPL Version 2 section of the License file that
1865.23 + * by Oracle in the GPL Version 2 section of the License file that
1865.24 * accompanied this code. If applicable, add the following below the
1865.25 * License Header, with the fields enclosed by brackets [] replaced by
1865.26 * your own identifying information:
1866.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/ResourceBundlesDomain.java Fri Jul 16 11:47:36 2010 -0400
1866.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/ResourceBundlesDomain.java Fri Jul 16 14:21:50 2010 -0400
1866.3 @@ -1,7 +1,10 @@
1866.4 /*
1866.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1866.6 *
1866.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1866.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1866.9 + *
1866.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1866.11 + * Other names may be trademarks of their respective owners.
1866.12 *
1866.13 * The contents of this file are subject to the terms of either the GNU
1866.14 * General Public License Version 2 only ("GPL") or the Common
1866.15 @@ -13,9 +16,9 @@
1866.16 * specific language governing permissions and limitations under the
1866.17 * License. When distributing the software, include this License Header
1866.18 * Notice in each file and include the License file at
1866.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1866.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1866.21 * particular file as subject to the "Classpath" exception as provided
1866.22 - * by Sun in the GPL Version 2 section of the License file that
1866.23 + * by Oracle in the GPL Version 2 section of the License file that
1866.24 * accompanied this code. If applicable, add the following below the
1866.25 * License Header, with the fields enclosed by brackets [] replaced by
1866.26 * your own identifying information:
1867.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/StringTokensDomain.java Fri Jul 16 11:47:36 2010 -0400
1867.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/StringTokensDomain.java Fri Jul 16 14:21:50 2010 -0400
1867.3 @@ -1,7 +1,10 @@
1867.4 /*
1867.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1867.6 *
1867.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1867.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1867.9 + *
1867.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1867.11 + * Other names may be trademarks of their respective owners.
1867.12 *
1867.13 * The contents of this file are subject to the terms of either the GNU
1867.14 * General Public License Version 2 only ("GPL") or the Common
1867.15 @@ -13,9 +16,9 @@
1867.16 * specific language governing permissions and limitations under the
1867.17 * License. When distributing the software, include this License Header
1867.18 * Notice in each file and include the License file at
1867.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1867.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1867.21 * particular file as subject to the "Classpath" exception as provided
1867.22 - * by Sun in the GPL Version 2 section of the License file that
1867.23 + * by Oracle in the GPL Version 2 section of the License file that
1867.24 * accompanied this code. If applicable, add the following below the
1867.25 * License Header, with the fields enclosed by brackets [] replaced by
1867.26 * your own identifying information:
1868.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/TextDirectionDomain.java Fri Jul 16 11:47:36 2010 -0400
1868.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/TextDirectionDomain.java Fri Jul 16 14:21:50 2010 -0400
1868.3 @@ -1,7 +1,10 @@
1868.4 /*
1868.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1868.6 *
1868.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1868.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1868.9 + *
1868.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1868.11 + * Other names may be trademarks of their respective owners.
1868.12 *
1868.13 * The contents of this file are subject to the terms of either the GNU
1868.14 * General Public License Version 2 only ("GPL") or the Common
1868.15 @@ -13,9 +16,9 @@
1868.16 * specific language governing permissions and limitations under the
1868.17 * License. When distributing the software, include this License Header
1868.18 * Notice in each file and include the License file at
1868.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1868.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1868.21 * particular file as subject to the "Classpath" exception as provided
1868.22 - * by Sun in the GPL Version 2 section of the License file that
1868.23 + * by Oracle in the GPL Version 2 section of the License file that
1868.24 * accompanied this code. If applicable, add the following below the
1868.25 * License Header, with the fields enclosed by brackets [] replaced by
1868.26 * your own identifying information:
1869.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/TimeZonesDomain.java Fri Jul 16 11:47:36 2010 -0400
1869.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/domains/TimeZonesDomain.java Fri Jul 16 14:21:50 2010 -0400
1869.3 @@ -1,7 +1,10 @@
1869.4 /*
1869.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1869.6 *
1869.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1869.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1869.9 + *
1869.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1869.11 + * Other names may be trademarks of their respective owners.
1869.12 *
1869.13 * The contents of this file are subject to the terms of either the GNU
1869.14 * General Public License Version 2 only ("GPL") or the Common
1869.15 @@ -13,9 +16,9 @@
1869.16 * specific language governing permissions and limitations under the
1869.17 * License. When distributing the software, include this License Header
1869.18 * Notice in each file and include the License file at
1869.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1869.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1869.21 * particular file as subject to the "Classpath" exception as provided
1869.22 - * by Sun in the GPL Version 2 section of the License file that
1869.23 + * by Oracle in the GPL Version 2 section of the License file that
1869.24 * accompanied this code. If applicable, add the following below the
1869.25 * License Header, with the fields enclosed by brackets [] replaced by
1869.26 * your own identifying information:
1870.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/util/Bundle.java Fri Jul 16 11:47:36 2010 -0400
1870.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/util/Bundle.java Fri Jul 16 14:21:50 2010 -0400
1870.3 @@ -1,7 +1,10 @@
1870.4 /*
1870.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1870.6 *
1870.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1870.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1870.9 + *
1870.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1870.11 + * Other names may be trademarks of their respective owners.
1870.12 *
1870.13 * The contents of this file are subject to the terms of either the GNU
1870.14 * General Public License Version 2 only ("GPL") or the Common
1870.15 @@ -13,9 +16,9 @@
1870.16 * specific language governing permissions and limitations under the
1870.17 * License. When distributing the software, include this License Header
1870.18 * Notice in each file and include the License file at
1870.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1870.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1870.21 * particular file as subject to the "Classpath" exception as provided
1870.22 - * by Sun in the GPL Version 2 section of the License file that
1870.23 + * by Oracle in the GPL Version 2 section of the License file that
1870.24 * accompanied this code. If applicable, add the following below the
1870.25 * License Header, with the fields enclosed by brackets [] replaced by
1870.26 * your own identifying information:
1871.1 --- a/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/util/JavaInitializer.java Fri Jul 16 11:47:36 2010 -0400
1871.2 +++ b/visualweb.propertyeditors.api/library/src/com/sun/rave/propertyeditors/util/JavaInitializer.java Fri Jul 16 14:21:50 2010 -0400
1871.3 @@ -1,7 +1,10 @@
1871.4 /*
1871.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1871.6 *
1871.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1871.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1871.9 + *
1871.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1871.11 + * Other names may be trademarks of their respective owners.
1871.12 *
1871.13 * The contents of this file are subject to the terms of either the GNU
1871.14 * General Public License Version 2 only ("GPL") or the Common
1871.15 @@ -13,9 +16,9 @@
1871.16 * specific language governing permissions and limitations under the
1871.17 * License. When distributing the software, include this License Header
1871.18 * Notice in each file and include the License file at
1871.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1871.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1871.21 * particular file as subject to the "Classpath" exception as provided
1871.22 - * by Sun in the GPL Version 2 section of the License file that
1871.23 + * by Oracle in the GPL Version 2 section of the License file that
1871.24 * accompanied this code. If applicable, add the following below the
1871.25 * License Header, with the fields enclosed by brackets [] replaced by
1871.26 * your own identifying information:
1872.1 --- a/visualweb.propertyeditors.api/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1872.2 +++ b/visualweb.propertyeditors.api/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1872.3 @@ -1,6 +1,9 @@
1872.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1872.5 #
1872.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1872.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1872.8 +#
1872.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1872.10 +# Other names may be trademarks of their respective owners.
1872.11 #
1872.12 # The contents of this file are subject to the terms of either the GNU
1872.13 # General Public License Version 2 only ("GPL") or the Common
1872.14 @@ -12,9 +15,9 @@
1872.15 # specific language governing permissions and limitations under the
1872.16 # License. When distributing the software, include this License Header
1872.17 # Notice in each file and include the License file at
1872.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1872.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1872.20 # particular file as subject to the "Classpath" exception as provided
1872.21 -# by Sun in the GPL Version 2 section of the License file that
1872.22 +# by Oracle in the GPL Version 2 section of the License file that
1872.23 # accompanied this code. If applicable, add the following below the
1872.24 # License Header, with the fields enclosed by brackets [] replaced by
1872.25 # your own identifying information:
1872.26 @@ -37,5 +40,5 @@
1872.27 # Version 2 license, then the option applies only if the new code is
1872.28 # made subject to such option by the copyright holder.
1872.29 javac.compilerargs=-Xlint:unchecked
1872.30 -javac.source=1.5
1872.31 +javac.source=1.6
1872.32 extra.module.files=modules/ext/editors.jar
1873.1 --- a/visualweb.propertyeditors.api/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1873.2 +++ b/visualweb.propertyeditors.api/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1873.3 @@ -2,7 +2,10 @@
1873.4 <!--
1873.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1873.6
1873.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1873.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1873.9 +
1873.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1873.11 +Other names may be trademarks of their respective owners.
1873.12
1873.13
1873.14 The contents of this file are subject to the terms of either the GNU
1873.15 @@ -15,9 +18,9 @@
1873.16 specific language governing permissions and limitations under the
1873.17 License. When distributing the software, include this License Header
1873.18 Notice in each file and include the License file at
1873.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1873.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1873.21 particular file as subject to the "Classpath" exception as provided
1873.22 -by Sun in the GPL Version 2 section of the License file that
1873.23 +by Oracle in the GPL Version 2 section of the License file that
1873.24 accompanied this code. If applicable, add the following below the
1873.25 License Header, with the fields enclosed by brackets [] replaced by
1873.26 your own identifying information:
1874.1 --- a/visualweb.propertyeditors.api/src/org/netbeans/modules/visualweb/propertyeditors/api/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1874.2 +++ b/visualweb.propertyeditors.api/src/org/netbeans/modules/visualweb/propertyeditors/api/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1874.3 @@ -1,6 +1,9 @@
1874.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1874.5 #
1874.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1874.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1874.8 +#
1874.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1874.10 +# Other names may be trademarks of their respective owners.
1874.11 #
1874.12 # The contents of this file are subject to the terms of either the GNU
1874.13 # General Public License Version 2 only ("GPL") or the Common
1874.14 @@ -12,9 +15,9 @@
1874.15 # specific language governing permissions and limitations under the
1874.16 # License. When distributing the software, include this License Header
1874.17 # Notice in each file and include the License file at
1874.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1874.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1874.20 # particular file as subject to the "Classpath" exception as provided
1874.21 -# by Sun in the GPL Version 2 section of the License file that
1874.22 +# by Oracle in the GPL Version 2 section of the License file that
1874.23 # accompanied this code. If applicable, add the following below the
1874.24 # License Header, with the fields enclosed by brackets [] replaced by
1874.25 # your own identifying information:
1875.1 --- a/visualweb.propertyeditors.resolver/build.xml Fri Jul 16 11:47:36 2010 -0400
1875.2 +++ b/visualweb.propertyeditors.resolver/build.xml Fri Jul 16 14:21:50 2010 -0400
1875.3 @@ -2,7 +2,10 @@
1875.4 <!--
1875.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1875.6
1875.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1875.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1875.9 +
1875.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1875.11 +Other names may be trademarks of their respective owners.
1875.12
1875.13
1875.14 The contents of this file are subject to the terms of either the GNU
1875.15 @@ -15,9 +18,9 @@
1875.16 specific language governing permissions and limitations under the
1875.17 License. When distributing the software, include this License Header
1875.18 Notice in each file and include the License file at
1875.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1875.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1875.21 particular file as subject to the "Classpath" exception as provided
1875.22 -by Sun in the GPL Version 2 section of the License file that
1875.23 +by Oracle in the GPL Version 2 section of the License file that
1875.24 accompanied this code. If applicable, add the following below the
1875.25 License Header, with the fields enclosed by brackets [] replaced by
1875.26 your own identifying information:
1876.1 --- a/visualweb.propertyeditors.resolver/library/build.xml Fri Jul 16 11:47:36 2010 -0400
1876.2 +++ b/visualweb.propertyeditors.resolver/library/build.xml Fri Jul 16 14:21:50 2010 -0400
1876.3 @@ -2,7 +2,10 @@
1876.4 <!--
1876.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1876.6
1876.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1876.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1876.9 +
1876.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1876.11 +Other names may be trademarks of their respective owners.
1876.12
1876.13
1876.14 The contents of this file are subject to the terms of either the GNU
1876.15 @@ -15,9 +18,9 @@
1876.16 specific language governing permissions and limitations under the
1876.17 License. When distributing the software, include this License Header
1876.18 Notice in each file and include the License file at
1876.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1876.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1876.21 particular file as subject to the "Classpath" exception as provided
1876.22 -by Sun in the GPL Version 2 section of the License file that
1876.23 +by Oracle in the GPL Version 2 section of the License file that
1876.24 accompanied this code. If applicable, add the following below the
1876.25 License Header, with the fields enclosed by brackets [] replaced by
1876.26 your own identifying information:
1877.1 --- a/visualweb.propertyeditors.resolver/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1877.2 +++ b/visualweb.propertyeditors.resolver/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1877.3 @@ -1,6 +1,9 @@
1877.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1877.5 #
1877.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1877.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1877.8 +#
1877.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1877.10 +# Other names may be trademarks of their respective owners.
1877.11 #
1877.12 # The contents of this file are subject to the terms of either the GNU
1877.13 # General Public License Version 2 only ("GPL") or the Common
1877.14 @@ -12,9 +15,9 @@
1877.15 # specific language governing permissions and limitations under the
1877.16 # License. When distributing the software, include this License Header
1877.17 # Notice in each file and include the License file at
1877.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1877.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1877.20 # particular file as subject to the "Classpath" exception as provided
1877.21 -# by Sun in the GPL Version 2 section of the License file that
1877.22 +# by Oracle in the GPL Version 2 section of the License file that
1877.23 # accompanied this code. If applicable, add the following below the
1877.24 # License Header, with the fields enclosed by brackets [] replaced by
1877.25 # your own identifying information:
1878.1 --- a/visualweb.propertyeditors.resolver/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1878.2 +++ b/visualweb.propertyeditors.resolver/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1878.3 @@ -2,7 +2,10 @@
1878.4 <!--
1878.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1878.6
1878.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1878.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1878.9 +
1878.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1878.11 +Other names may be trademarks of their respective owners.
1878.12
1878.13
1878.14 The contents of this file are subject to the terms of either the GNU
1878.15 @@ -15,9 +18,9 @@
1878.16 specific language governing permissions and limitations under the
1878.17 License. When distributing the software, include this License Header
1878.18 Notice in each file and include the License file at
1878.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1878.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1878.21 particular file as subject to the "Classpath" exception as provided
1878.22 -by Sun in the GPL Version 2 section of the License file that
1878.23 +by Oracle in the GPL Version 2 section of the License file that
1878.24 accompanied this code. If applicable, add the following below the
1878.25 License Header, with the fields enclosed by brackets [] replaced by
1878.26 your own identifying information:
1879.1 --- a/visualweb.propertyeditors.resolver/library/src/com/sun/rave/propertyeditors/resolver/PropertyEditorResolver.java Fri Jul 16 11:47:36 2010 -0400
1879.2 +++ b/visualweb.propertyeditors.resolver/library/src/com/sun/rave/propertyeditors/resolver/PropertyEditorResolver.java Fri Jul 16 14:21:50 2010 -0400
1879.3 @@ -1,7 +1,10 @@
1879.4 /*
1879.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1879.6 *
1879.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1879.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1879.9 + *
1879.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1879.11 + * Other names may be trademarks of their respective owners.
1879.12 *
1879.13 * The contents of this file are subject to the terms of either the GNU
1879.14 * General Public License Version 2 only ("GPL") or the Common
1879.15 @@ -13,9 +16,9 @@
1879.16 * specific language governing permissions and limitations under the
1879.17 * License. When distributing the software, include this License Header
1879.18 * Notice in each file and include the License file at
1879.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1879.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1879.21 * particular file as subject to the "Classpath" exception as provided
1879.22 - * by Sun in the GPL Version 2 section of the License file that
1879.23 + * by Oracle in the GPL Version 2 section of the License file that
1879.24 * accompanied this code. If applicable, add the following below the
1879.25 * License Header, with the fields enclosed by brackets [] replaced by
1879.26 * your own identifying information:
1880.1 --- a/visualweb.propertyeditors.resolver/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1880.2 +++ b/visualweb.propertyeditors.resolver/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1880.3 @@ -1,6 +1,9 @@
1880.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1880.5 #
1880.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1880.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1880.8 +#
1880.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1880.10 +# Other names may be trademarks of their respective owners.
1880.11 #
1880.12 # The contents of this file are subject to the terms of either the GNU
1880.13 # General Public License Version 2 only ("GPL") or the Common
1880.14 @@ -12,9 +15,9 @@
1880.15 # specific language governing permissions and limitations under the
1880.16 # License. When distributing the software, include this License Header
1880.17 # Notice in each file and include the License file at
1880.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1880.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1880.20 # particular file as subject to the "Classpath" exception as provided
1880.21 -# by Sun in the GPL Version 2 section of the License file that
1880.22 +# by Oracle in the GPL Version 2 section of the License file that
1880.23 # accompanied this code. If applicable, add the following below the
1880.24 # License Header, with the fields enclosed by brackets [] replaced by
1880.25 # your own identifying information:
1880.26 @@ -38,5 +41,5 @@
1880.27 # made subject to such option by the copyright holder.
1880.28
1880.29 javac.compilerargs=-Xlint:unchecked
1880.30 -javac.source=1.5
1880.31 +javac.source=1.6
1880.32 extra.module.files=modules/ext/editor-resolver.jar
1881.1 --- a/visualweb.propertyeditors.resolver/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1881.2 +++ b/visualweb.propertyeditors.resolver/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1881.3 @@ -2,7 +2,10 @@
1881.4 <!--
1881.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1881.6
1881.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1881.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1881.9 +
1881.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1881.11 +Other names may be trademarks of their respective owners.
1881.12
1881.13
1881.14 The contents of this file are subject to the terms of either the GNU
1881.15 @@ -15,9 +18,9 @@
1881.16 specific language governing permissions and limitations under the
1881.17 License. When distributing the software, include this License Header
1881.18 Notice in each file and include the License file at
1881.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1881.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1881.21 particular file as subject to the "Classpath" exception as provided
1881.22 -by Sun in the GPL Version 2 section of the License file that
1881.23 +by Oracle in the GPL Version 2 section of the License file that
1881.24 accompanied this code. If applicable, add the following below the
1881.25 License Header, with the fields enclosed by brackets [] replaced by
1881.26 your own identifying information:
1882.1 --- a/visualweb.propertyeditors.resolver/src/org/netbeans/modules/visualweb/propertyeditors/resolver/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1882.2 +++ b/visualweb.propertyeditors.resolver/src/org/netbeans/modules/visualweb/propertyeditors/resolver/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1882.3 @@ -1,6 +1,9 @@
1882.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1882.5 #
1882.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1882.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1882.8 +#
1882.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1882.10 +# Other names may be trademarks of their respective owners.
1882.11 #
1882.12 # The contents of this file are subject to the terms of either the GNU
1882.13 # General Public License Version 2 only ("GPL") or the Common
1882.14 @@ -12,9 +15,9 @@
1882.15 # specific language governing permissions and limitations under the
1882.16 # License. When distributing the software, include this License Header
1882.17 # Notice in each file and include the License file at
1882.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1882.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1882.20 # particular file as subject to the "Classpath" exception as provided
1882.21 -# by Sun in the GPL Version 2 section of the License file that
1882.22 +# by Oracle in the GPL Version 2 section of the License file that
1882.23 # accompanied this code. If applicable, add the following below the
1882.24 # License Header, with the fields enclosed by brackets [] replaced by
1882.25 # your own identifying information:
1883.1 --- a/visualweb.propertyeditors/build.xml Fri Jul 16 11:47:36 2010 -0400
1883.2 +++ b/visualweb.propertyeditors/build.xml Fri Jul 16 14:21:50 2010 -0400
1883.3 @@ -2,7 +2,10 @@
1883.4 <!--
1883.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1883.6
1883.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1883.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1883.9 +
1883.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1883.11 +Other names may be trademarks of their respective owners.
1883.12
1883.13
1883.14 The contents of this file are subject to the terms of either the GNU
1883.15 @@ -15,9 +18,9 @@
1883.16 specific language governing permissions and limitations under the
1883.17 License. When distributing the software, include this License Header
1883.18 Notice in each file and include the License file at
1883.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1883.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1883.21 particular file as subject to the "Classpath" exception as provided
1883.22 -by Sun in the GPL Version 2 section of the License file that
1883.23 +by Oracle in the GPL Version 2 section of the License file that
1883.24 accompanied this code. If applicable, add the following below the
1883.25 License Header, with the fields enclosed by brackets [] replaced by
1883.26 your own identifying information:
1884.1 --- a/visualweb.propertyeditors/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
1884.2 +++ b/visualweb.propertyeditors/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
1884.3 @@ -1,6 +1,9 @@
1884.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1884.5 #
1884.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1884.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1884.8 +#
1884.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1884.10 +# Other names may be trademarks of their respective owners.
1884.11 #
1884.12 # The contents of this file are subject to the terms of either the GNU
1884.13 # General Public License Version 2 only ("GPL") or the Common
1884.14 @@ -12,9 +15,9 @@
1884.15 # specific language governing permissions and limitations under the
1884.16 # License. When distributing the software, include this License Header
1884.17 # Notice in each file and include the License file at
1884.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1884.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1884.20 # particular file as subject to the "Classpath" exception as provided
1884.21 -# by Sun in the GPL Version 2 section of the License file that
1884.22 +# by Oracle in the GPL Version 2 section of the License file that
1884.23 # accompanied this code. If applicable, add the following below the
1884.24 # License Header, with the fields enclosed by brackets [] replaced by
1884.25 # your own identifying information:
1884.26 @@ -39,7 +42,7 @@
1884.27
1884.28 build.compiler.deprecation=false
1884.29 javac.compilerargs=-Xlint:unchecked
1884.30 -javac.source=1.5
1884.31 +javac.source=1.6
1884.32 javadoc.name=Property-Editors
1884.33 javadoc.title=Creator Property Editors
1884.34
1885.1 --- a/visualweb.propertyeditors/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
1885.2 +++ b/visualweb.propertyeditors/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
1885.3 @@ -2,7 +2,10 @@
1885.4 <!--
1885.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1885.6
1885.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1885.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1885.9 +
1885.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1885.11 +Other names may be trademarks of their respective owners.
1885.12
1885.13
1885.14 The contents of this file are subject to the terms of either the GNU
1885.15 @@ -15,9 +18,9 @@
1885.16 specific language governing permissions and limitations under the
1885.17 License. When distributing the software, include this License Header
1885.18 Notice in each file and include the License file at
1885.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1885.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1885.21 particular file as subject to the "Classpath" exception as provided
1885.22 -by Sun in the GPL Version 2 section of the License file that
1885.23 +by Oracle in the GPL Version 2 section of the License file that
1885.24 accompanied this code. If applicable, add the following below the
1885.25 License Header, with the fields enclosed by brackets [] replaced by
1885.26 your own identifying information:
1885.27 @@ -186,7 +189,15 @@
1885.28 <build-prerequisite/>
1885.29 <compile-dependency/>
1885.30 <run-dependency>
1885.31 - <specification-version>6.5.1</specification-version>
1885.32 + <specification-version>8.0</specification-version>
1885.33 + </run-dependency>
1885.34 + </dependency>
1885.35 + <dependency>
1885.36 + <code-name-base>org.openide.util.lookup</code-name-base>
1885.37 + <build-prerequisite/>
1885.38 + <compile-dependency/>
1885.39 + <run-dependency>
1885.40 + <specification-version>8.0</specification-version>
1885.41 </run-dependency>
1885.42 </dependency>
1885.43 <dependency>
1886.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/Action.java Fri Jul 16 11:47:36 2010 -0400
1886.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/Action.java Fri Jul 16 14:21:50 2010 -0400
1886.3 @@ -1,7 +1,10 @@
1886.4 /*
1886.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1886.6 *
1886.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1886.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1886.9 + *
1886.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1886.11 + * Other names may be trademarks of their respective owners.
1886.12 *
1886.13 * The contents of this file are subject to the terms of either the GNU
1886.14 * General Public License Version 2 only ("GPL") or the Common
1886.15 @@ -13,9 +16,9 @@
1886.16 * specific language governing permissions and limitations under the
1886.17 * License. When distributing the software, include this License Header
1886.18 * Notice in each file and include the License file at
1886.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1886.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1886.21 * particular file as subject to the "Classpath" exception as provided
1886.22 - * by Sun in the GPL Version 2 section of the License file that
1886.23 + * by Oracle in the GPL Version 2 section of the License file that
1886.24 * accompanied this code. If applicable, add the following below the
1886.25 * License Header, with the fields enclosed by brackets [] replaced by
1886.26 * your own identifying information:
1887.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1887.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1887.3 @@ -1,6 +1,9 @@
1887.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1887.5 #
1887.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1887.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1887.8 +#
1887.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1887.10 +# Other names may be trademarks of their respective owners.
1887.11 #
1887.12 # The contents of this file are subject to the terms of either the GNU
1887.13 # General Public License Version 2 only ("GPL") or the Common
1887.14 @@ -12,9 +15,9 @@
1887.15 # specific language governing permissions and limitations under the
1887.16 # License. When distributing the software, include this License Header
1887.17 # Notice in each file and include the License file at
1887.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1887.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1887.20 # particular file as subject to the "Classpath" exception as provided
1887.21 -# by Sun in the GPL Version 2 section of the License file that
1887.22 +# by Oracle in the GPL Version 2 section of the License file that
1887.23 # accompanied this code. If applicable, add the following below the
1887.24 # License Header, with the fields enclosed by brackets [] replaced by
1887.25 # your own identifying information:
1888.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/ConverterPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1888.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/ConverterPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1888.3 @@ -1,7 +1,10 @@
1888.4 /*
1888.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1888.6 *
1888.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1888.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1888.9 + *
1888.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1888.11 + * Other names may be trademarks of their respective owners.
1888.12 *
1888.13 * The contents of this file are subject to the terms of either the GNU
1888.14 * General Public License Version 2 only ("GPL") or the Common
1888.15 @@ -13,9 +16,9 @@
1888.16 * specific language governing permissions and limitations under the
1888.17 * License. When distributing the software, include this License Header
1888.18 * Notice in each file and include the License file at
1888.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1888.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1888.21 * particular file as subject to the "Classpath" exception as provided
1888.22 - * by Sun in the GPL Version 2 section of the License file that
1888.23 + * by Oracle in the GPL Version 2 section of the License file that
1888.24 * accompanied this code. If applicable, add the following below the
1888.25 * License Header, with the fields enclosed by brackets [] replaced by
1888.26 * your own identifying information:
1889.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/JavaScriptPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1889.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/JavaScriptPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1889.3 @@ -1,7 +1,10 @@
1889.4 /*
1889.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1889.6 *
1889.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1889.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1889.9 + *
1889.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1889.11 + * Other names may be trademarks of their respective owners.
1889.12 *
1889.13 * The contents of this file are subject to the terms of either the GNU
1889.14 * General Public License Version 2 only ("GPL") or the Common
1889.15 @@ -13,9 +16,9 @@
1889.16 * specific language governing permissions and limitations under the
1889.17 * License. When distributing the software, include this License Header
1889.18 * Notice in each file and include the License file at
1889.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1889.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1889.21 * particular file as subject to the "Classpath" exception as provided
1889.22 - * by Sun in the GPL Version 2 section of the License file that
1889.23 + * by Oracle in the GPL Version 2 section of the License file that
1889.24 * accompanied this code. If applicable, add the following below the
1889.25 * License Header, with the fields enclosed by brackets [] replaced by
1889.26 * your own identifying information:
1890.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/MethodBindingPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1890.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/MethodBindingPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1890.3 @@ -1,7 +1,10 @@
1890.4 /*
1890.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1890.6 *
1890.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1890.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1890.9 + *
1890.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1890.11 + * Other names may be trademarks of their respective owners.
1890.12 *
1890.13 * The contents of this file are subject to the terms of either the GNU
1890.14 * General Public License Version 2 only ("GPL") or the Common
1890.15 @@ -13,9 +16,9 @@
1890.16 * specific language governing permissions and limitations under the
1890.17 * License. When distributing the software, include this License Header
1890.18 * Notice in each file and include the License file at
1890.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1890.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1890.21 * particular file as subject to the "Classpath" exception as provided
1890.22 - * by Sun in the GPL Version 2 section of the License file that
1890.23 + * by Oracle in the GPL Version 2 section of the License file that
1890.24 * accompanied this code. If applicable, add the following below the
1890.25 * License Header, with the fields enclosed by brackets [] replaced by
1890.26 * your own identifying information:
1891.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/PropCategories.java Fri Jul 16 11:47:36 2010 -0400
1891.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/PropCategories.java Fri Jul 16 14:21:50 2010 -0400
1891.3 @@ -1,7 +1,10 @@
1891.4 /*
1891.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1891.6 *
1891.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1891.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1891.9 + *
1891.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1891.11 + * Other names may be trademarks of their respective owners.
1891.12 *
1891.13 * The contents of this file are subject to the terms of either the GNU
1891.14 * General Public License Version 2 only ("GPL") or the Common
1891.15 @@ -13,9 +16,9 @@
1891.16 * specific language governing permissions and limitations under the
1891.17 * License. When distributing the software, include this License Header
1891.18 * Notice in each file and include the License file at
1891.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1891.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1891.21 * particular file as subject to the "Classpath" exception as provided
1891.22 - * by Sun in the GPL Version 2 section of the License file that
1891.23 + * by Oracle in the GPL Version 2 section of the License file that
1891.24 * accompanied this code. If applicable, add the following below the
1891.25 * License Header, with the fields enclosed by brackets [] replaced by
1891.26 * your own identifying information:
1892.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/PropertyDescriptorBase.java Fri Jul 16 11:47:36 2010 -0400
1892.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/PropertyDescriptorBase.java Fri Jul 16 14:21:50 2010 -0400
1892.3 @@ -1,7 +1,10 @@
1892.4 /*
1892.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1892.6 *
1892.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1892.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1892.9 + *
1892.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1892.11 + * Other names may be trademarks of their respective owners.
1892.12 *
1892.13 * The contents of this file are subject to the terms of either the GNU
1892.14 * General Public License Version 2 only ("GPL") or the Common
1892.15 @@ -13,9 +16,9 @@
1892.16 * specific language governing permissions and limitations under the
1892.17 * License. When distributing the software, include this License Header
1892.18 * Notice in each file and include the License file at
1892.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1892.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1892.21 * particular file as subject to the "Classpath" exception as provided
1892.22 - * by Sun in the GPL Version 2 section of the License file that
1892.23 + * by Oracle in the GPL Version 2 section of the License file that
1892.24 * accompanied this code. If applicable, add the following below the
1892.25 * License Header, with the fields enclosed by brackets [] replaced by
1892.26 * your own identifying information:
1893.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/RangePanel.java Fri Jul 16 11:47:36 2010 -0400
1893.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/RangePanel.java Fri Jul 16 14:21:50 2010 -0400
1893.3 @@ -1,7 +1,10 @@
1893.4 /*
1893.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1893.6 *
1893.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1893.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1893.9 + *
1893.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1893.11 + * Other names may be trademarks of their respective owners.
1893.12 *
1893.13 * The contents of this file are subject to the terms of either the GNU
1893.14 * General Public License Version 2 only ("GPL") or the Common
1893.15 @@ -13,9 +16,9 @@
1893.16 * specific language governing permissions and limitations under the
1893.17 * License. When distributing the software, include this License Header
1893.18 * Notice in each file and include the License file at
1893.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1893.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1893.21 * particular file as subject to the "Classpath" exception as provided
1893.22 - * by Sun in the GPL Version 2 section of the License file that
1893.23 + * by Oracle in the GPL Version 2 section of the License file that
1893.24 * accompanied this code. If applicable, add the following below the
1893.25 * License Header, with the fields enclosed by brackets [] replaced by
1893.26 * your own identifying information:
1894.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/RangePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1894.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/RangePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1894.3 @@ -1,7 +1,10 @@
1894.4 /*
1894.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1894.6 *
1894.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1894.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1894.9 + *
1894.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1894.11 + * Other names may be trademarks of their respective owners.
1894.12 *
1894.13 * The contents of this file are subject to the terms of either the GNU
1894.14 * General Public License Version 2 only ("GPL") or the Common
1894.15 @@ -13,9 +16,9 @@
1894.16 * specific language governing permissions and limitations under the
1894.17 * License. When distributing the software, include this License Header
1894.18 * Notice in each file and include the License file at
1894.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1894.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1894.21 * particular file as subject to the "Classpath" exception as provided
1894.22 - * by Sun in the GPL Version 2 section of the License file that
1894.23 + * by Oracle in the GPL Version 2 section of the License file that
1894.24 * accompanied this code. If applicable, add the following below the
1894.25 * License Header, with the fields enclosed by brackets [] replaced by
1894.26 * your own identifying information:
1895.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/RaveStringCustomEditor.java Fri Jul 16 11:47:36 2010 -0400
1895.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/RaveStringCustomEditor.java Fri Jul 16 14:21:50 2010 -0400
1895.3 @@ -1,7 +1,10 @@
1895.4 /*
1895.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1895.6 *
1895.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1895.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1895.9 + *
1895.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1895.11 + * Other names may be trademarks of their respective owners.
1895.12 *
1895.13 * The contents of this file are subject to the terms of either the GNU
1895.14 * General Public License Version 2 only ("GPL") or the Common
1895.15 @@ -13,9 +16,9 @@
1895.16 * specific language governing permissions and limitations under the
1895.17 * License. When distributing the software, include this License Header
1895.18 * Notice in each file and include the License file at
1895.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1895.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1895.21 * particular file as subject to the "Classpath" exception as provided
1895.22 - * by Sun in the GPL Version 2 section of the License file that
1895.23 + * by Oracle in the GPL Version 2 section of the License file that
1895.24 * accompanied this code. If applicable, add the following below the
1895.25 * License Header, with the fields enclosed by brackets [] replaced by
1895.26 * your own identifying information:
1896.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/RaveStringEditor.java Fri Jul 16 11:47:36 2010 -0400
1896.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/RaveStringEditor.java Fri Jul 16 14:21:50 2010 -0400
1896.3 @@ -1,7 +1,10 @@
1896.4 /*
1896.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1896.6 *
1896.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1896.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1896.9 + *
1896.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1896.11 + * Other names may be trademarks of their respective owners.
1896.12 *
1896.13 * The contents of this file are subject to the terms of either the GNU
1896.14 * General Public License Version 2 only ("GPL") or the Common
1896.15 @@ -13,9 +16,9 @@
1896.16 * specific language governing permissions and limitations under the
1896.17 * License. When distributing the software, include this License Header
1896.18 * Notice in each file and include the License file at
1896.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1896.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1896.21 * particular file as subject to the "Classpath" exception as provided
1896.22 - * by Sun in the GPL Version 2 section of the License file that
1896.23 + * by Oracle in the GPL Version 2 section of the License file that
1896.24 * accompanied this code. If applicable, add the following below the
1896.25 * License Header, with the fields enclosed by brackets [] replaced by
1896.26 * your own identifying information:
1897.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/StringEditorWithNoCr.java Fri Jul 16 11:47:36 2010 -0400
1897.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/StringEditorWithNoCr.java Fri Jul 16 14:21:50 2010 -0400
1897.3 @@ -1,7 +1,10 @@
1897.4 /*
1897.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1897.6 *
1897.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1897.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1897.9 + *
1897.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1897.11 + * Other names may be trademarks of their respective owners.
1897.12 *
1897.13 * The contents of this file are subject to the terms of either the GNU
1897.14 * General Public License Version 2 only ("GPL") or the Common
1897.15 @@ -13,9 +16,9 @@
1897.16 * specific language governing permissions and limitations under the
1897.17 * License. When distributing the software, include this License Header
1897.18 * Notice in each file and include the License file at
1897.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1897.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1897.21 * particular file as subject to the "Classpath" exception as provided
1897.22 - * by Sun in the GPL Version 2 section of the License file that
1897.23 + * by Oracle in the GPL Version 2 section of the License file that
1897.24 * accompanied this code. If applicable, add the following below the
1897.25 * License Header, with the fields enclosed by brackets [] replaced by
1897.26 * your own identifying information:
1898.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/StringEditorWithShortDescription.java Fri Jul 16 11:47:36 2010 -0400
1898.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/StringEditorWithShortDescription.java Fri Jul 16 14:21:50 2010 -0400
1898.3 @@ -1,7 +1,10 @@
1898.4 /*
1898.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1898.6 *
1898.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1898.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1898.9 + *
1898.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1898.11 + * Other names may be trademarks of their respective owners.
1898.12 *
1898.13 * The contents of this file are subject to the terms of either the GNU
1898.14 * General Public License Version 2 only ("GPL") or the Common
1898.15 @@ -13,9 +16,9 @@
1898.16 * specific language governing permissions and limitations under the
1898.17 * License. When distributing the software, include this License Header
1898.18 * Notice in each file and include the License file at
1898.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1898.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1898.21 * particular file as subject to the "Classpath" exception as provided
1898.22 - * by Sun in the GPL Version 2 section of the License file that
1898.23 + * by Oracle in the GPL Version 2 section of the License file that
1898.24 * accompanied this code. If applicable, add the following below the
1898.25 * License Header, with the fields enclosed by brackets [] replaced by
1898.26 * your own identifying information:
1899.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/URLPanel.java Fri Jul 16 11:47:36 2010 -0400
1899.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/URLPanel.java Fri Jul 16 14:21:50 2010 -0400
1899.3 @@ -1,7 +1,10 @@
1899.4 /*
1899.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1899.6 *
1899.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1899.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1899.9 + *
1899.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1899.11 + * Other names may be trademarks of their respective owners.
1899.12 *
1899.13 * The contents of this file are subject to the terms of either the GNU
1899.14 * General Public License Version 2 only ("GPL") or the Common
1899.15 @@ -13,9 +16,9 @@
1899.16 * specific language governing permissions and limitations under the
1899.17 * License. When distributing the software, include this License Header
1899.18 * Notice in each file and include the License file at
1899.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1899.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1899.21 * particular file as subject to the "Classpath" exception as provided
1899.22 - * by Sun in the GPL Version 2 section of the License file that
1899.23 + * by Oracle in the GPL Version 2 section of the License file that
1899.24 * accompanied this code. If applicable, add the following below the
1899.25 * License Header, with the fields enclosed by brackets [] replaced by
1899.26 * your own identifying information:
1900.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/URLPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1900.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/URLPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1900.3 @@ -1,7 +1,10 @@
1900.4 /*
1900.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1900.6 *
1900.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1900.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1900.9 + *
1900.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1900.11 + * Other names may be trademarks of their respective owners.
1900.12 *
1900.13 * The contents of this file are subject to the terms of either the GNU
1900.14 * General Public License Version 2 only ("GPL") or the Common
1900.15 @@ -13,9 +16,9 @@
1900.16 * specific language governing permissions and limitations under the
1900.17 * License. When distributing the software, include this License Header
1900.18 * Notice in each file and include the License file at
1900.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1900.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1900.21 * particular file as subject to the "Classpath" exception as provided
1900.22 - * by Sun in the GPL Version 2 section of the License file that
1900.23 + * by Oracle in the GPL Version 2 section of the License file that
1900.24 * accompanied this code. If applicable, add the following below the
1900.25 * License Header, with the fields enclosed by brackets [] replaced by
1900.26 * your own identifying information:
1901.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/UiComponentIdPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1901.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/UiComponentIdPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1901.3 @@ -1,7 +1,10 @@
1901.4 /*
1901.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1901.6 *
1901.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1901.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1901.9 + *
1901.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1901.11 + * Other names may be trademarks of their respective owners.
1901.12 *
1901.13 * The contents of this file are subject to the terms of either the GNU
1901.14 * General Public License Version 2 only ("GPL") or the Common
1901.15 @@ -13,9 +16,9 @@
1901.16 * specific language governing permissions and limitations under the
1901.17 * License. When distributing the software, include this License Header
1901.18 * Notice in each file and include the License file at
1901.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1901.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1901.21 * particular file as subject to the "Classpath" exception as provided
1901.22 - * by Sun in the GPL Version 2 section of the License file that
1901.23 + * by Oracle in the GPL Version 2 section of the License file that
1901.24 * accompanied this code. If applicable, add the following below the
1901.25 * License Header, with the fields enclosed by brackets [] replaced by
1901.26 * your own identifying information:
1902.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/ValidatorRefPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1902.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/ValidatorRefPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1902.3 @@ -1,7 +1,10 @@
1902.4 /*
1902.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1902.6 *
1902.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1902.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1902.9 + *
1902.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1902.11 + * Other names may be trademarks of their respective owners.
1902.12 *
1902.13 * The contents of this file are subject to the terms of either the GNU
1902.14 * General Public License Version 2 only ("GPL") or the Common
1902.15 @@ -13,9 +16,9 @@
1902.16 * specific language governing permissions and limitations under the
1902.17 * License. When distributing the software, include this License Header
1902.18 * Notice in each file and include the License file at
1902.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1902.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1902.21 * particular file as subject to the "Classpath" exception as provided
1902.22 - * by Sun in the GPL Version 2 section of the License file that
1902.23 + * by Oracle in the GPL Version 2 section of the License file that
1902.24 * accompanied this code. If applicable, add the following below the
1902.25 * License Header, with the fields enclosed by brackets [] replaced by
1902.26 * your own identifying information:
1903.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/ValueBindingPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1903.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/ValueBindingPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1903.3 @@ -1,7 +1,10 @@
1903.4 /*
1903.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1903.6 *
1903.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1903.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1903.9 + *
1903.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1903.11 + * Other names may be trademarks of their respective owners.
1903.12 *
1903.13 * The contents of this file are subject to the terms of either the GNU
1903.14 * General Public License Version 2 only ("GPL") or the Common
1903.15 @@ -13,9 +16,9 @@
1903.16 * specific language governing permissions and limitations under the
1903.17 * License. When distributing the software, include this License Header
1903.18 * Notice in each file and include the License file at
1903.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1903.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1903.21 * particular file as subject to the "Classpath" exception as provided
1903.22 - * by Sun in the GPL Version 2 section of the License file that
1903.23 + * by Oracle in the GPL Version 2 section of the License file that
1903.24 * accompanied this code. If applicable, add the following below the
1903.25 * License Header, with the fields enclosed by brackets [] replaced by
1903.26 * your own identifying information:
1904.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/AbstractPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1904.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/AbstractPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1904.3 @@ -1,7 +1,10 @@
1904.4 /*
1904.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1904.6 *
1904.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1904.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1904.9 + *
1904.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1904.11 + * Other names may be trademarks of their respective owners.
1904.12 *
1904.13 * The contents of this file are subject to the terms of either the GNU
1904.14 * General Public License Version 2 only ("GPL") or the Common
1904.15 @@ -13,9 +16,9 @@
1904.16 * specific language governing permissions and limitations under the
1904.17 * License. When distributing the software, include this License Header
1904.18 * Notice in each file and include the License file at
1904.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1904.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1904.21 * particular file as subject to the "Classpath" exception as provided
1904.22 - * by Sun in the GPL Version 2 section of the License file that
1904.23 + * by Oracle in the GPL Version 2 section of the License file that
1904.24 * accompanied this code. If applicable, add the following below the
1904.25 * License Header, with the fields enclosed by brackets [] replaced by
1904.26 * your own identifying information:
1905.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/AbstractPropertyJPanel.java Fri Jul 16 11:47:36 2010 -0400
1905.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/AbstractPropertyJPanel.java Fri Jul 16 14:21:50 2010 -0400
1905.3 @@ -1,7 +1,10 @@
1905.4 /*
1905.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1905.6 *
1905.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1905.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1905.9 + *
1905.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1905.11 + * Other names may be trademarks of their respective owners.
1905.12 *
1905.13 * The contents of this file are subject to the terms of either the GNU
1905.14 * General Public License Version 2 only ("GPL") or the Common
1905.15 @@ -13,9 +16,9 @@
1905.16 * specific language governing permissions and limitations under the
1905.17 * License. When distributing the software, include this License Header
1905.18 * Notice in each file and include the License file at
1905.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1905.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1905.21 * particular file as subject to the "Classpath" exception as provided
1905.22 - * by Sun in the GPL Version 2 section of the License file that
1905.23 + * by Oracle in the GPL Version 2 section of the License file that
1905.24 * accompanied this code. If applicable, add the following below the
1905.25 * License Header, with the fields enclosed by brackets [] replaced by
1905.26 * your own identifying information:
1906.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1906.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1906.3 @@ -1,6 +1,9 @@
1906.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1906.5 #
1906.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1906.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1906.8 +#
1906.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1906.10 +# Other names may be trademarks of their respective owners.
1906.11 #
1906.12 # The contents of this file are subject to the terms of either the GNU
1906.13 # General Public License Version 2 only ("GPL") or the Common
1906.14 @@ -12,9 +15,9 @@
1906.15 # specific language governing permissions and limitations under the
1906.16 # License. When distributing the software, include this License Header
1906.17 # Notice in each file and include the License file at
1906.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1906.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1906.20 # particular file as subject to the "Classpath" exception as provided
1906.21 -# by Sun in the GPL Version 2 section of the License file that
1906.22 +# by Oracle in the GPL Version 2 section of the License file that
1906.23 # accompanied this code. If applicable, add the following below the
1906.24 # License Header, with the fields enclosed by brackets [] replaced by
1906.25 # your own identifying information:
1907.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/BundleHolder.java Fri Jul 16 11:47:36 2010 -0400
1907.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/BundleHolder.java Fri Jul 16 14:21:50 2010 -0400
1907.3 @@ -1,7 +1,10 @@
1907.4 /*
1907.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1907.6 *
1907.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1907.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1907.9 + *
1907.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1907.11 + * Other names may be trademarks of their respective owners.
1907.12 *
1907.13 * The contents of this file are subject to the terms of either the GNU
1907.14 * General Public License Version 2 only ("GPL") or the Common
1907.15 @@ -13,9 +16,9 @@
1907.16 * specific language governing permissions and limitations under the
1907.17 * License. When distributing the software, include this License Header
1907.18 * Notice in each file and include the License file at
1907.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1907.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1907.21 * particular file as subject to the "Classpath" exception as provided
1907.22 - * by Sun in the GPL Version 2 section of the License file that
1907.23 + * by Oracle in the GPL Version 2 section of the License file that
1907.24 * accompanied this code. If applicable, add the following below the
1907.25 * License Header, with the fields enclosed by brackets [] replaced by
1907.26 * your own identifying information:
1908.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyNodeData.java Fri Jul 16 11:47:36 2010 -0400
1908.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyNodeData.java Fri Jul 16 14:21:50 2010 -0400
1908.3 @@ -1,7 +1,10 @@
1908.4 /*
1908.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1908.6 *
1908.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1908.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1908.9 + *
1908.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1908.11 + * Other names may be trademarks of their respective owners.
1908.12 *
1908.13 * The contents of this file are subject to the terms of either the GNU
1908.14 * General Public License Version 2 only ("GPL") or the Common
1908.15 @@ -13,9 +16,9 @@
1908.16 * specific language governing permissions and limitations under the
1908.17 * License. When distributing the software, include this License Header
1908.18 * Notice in each file and include the License file at
1908.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1908.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1908.21 * particular file as subject to the "Classpath" exception as provided
1908.22 - * by Sun in the GPL Version 2 section of the License file that
1908.23 + * by Oracle in the GPL Version 2 section of the License file that
1908.24 * accompanied this code. If applicable, add the following below the
1908.25 * License Header, with the fields enclosed by brackets [] replaced by
1908.26 * your own identifying information:
1909.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyNodeDataTreeCellRenderer.java Fri Jul 16 11:47:36 2010 -0400
1909.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyNodeDataTreeCellRenderer.java Fri Jul 16 14:21:50 2010 -0400
1909.3 @@ -1,7 +1,10 @@
1909.4 /*
1909.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1909.6 *
1909.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1909.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1909.9 + *
1909.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1909.11 + * Other names may be trademarks of their respective owners.
1909.12 *
1909.13 * The contents of this file are subject to the terms of either the GNU
1909.14 * General Public License Version 2 only ("GPL") or the Common
1909.15 @@ -13,9 +16,9 @@
1909.16 * specific language governing permissions and limitations under the
1909.17 * License. When distributing the software, include this License Header
1909.18 * Notice in each file and include the License file at
1909.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1909.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1909.21 * particular file as subject to the "Classpath" exception as provided
1909.22 - * by Sun in the GPL Version 2 section of the License file that
1909.23 + * by Oracle in the GPL Version 2 section of the License file that
1909.24 * accompanied this code. If applicable, add the following below the
1909.25 * License Header, with the fields enclosed by brackets [] replaced by
1909.26 * your own identifying information:
1910.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyNodeDataTwoColumnTreeCellRenderer.java Fri Jul 16 11:47:36 2010 -0400
1910.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyNodeDataTwoColumnTreeCellRenderer.java Fri Jul 16 14:21:50 2010 -0400
1910.3 @@ -1,7 +1,10 @@
1910.4 /*
1910.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1910.6 *
1910.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1910.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1910.9 + *
1910.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1910.11 + * Other names may be trademarks of their respective owners.
1910.12 *
1910.13 * The contents of this file are subject to the terms of either the GNU
1910.14 * General Public License Version 2 only ("GPL") or the Common
1910.15 @@ -13,9 +16,9 @@
1910.16 * specific language governing permissions and limitations under the
1910.17 * License. When distributing the software, include this License Header
1910.18 * Notice in each file and include the License file at
1910.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1910.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1910.21 * particular file as subject to the "Classpath" exception as provided
1910.22 - * by Sun in the GPL Version 2 section of the License file that
1910.23 + * by Oracle in the GPL Version 2 section of the License file that
1910.24 * accompanied this code. If applicable, add the following below the
1910.25 * License Header, with the fields enclosed by brackets [] replaced by
1910.26 * your own identifying information:
1911.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyReferenceDataPanel.java Fri Jul 16 11:47:36 2010 -0400
1911.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyReferenceDataPanel.java Fri Jul 16 14:21:50 2010 -0400
1911.3 @@ -1,7 +1,10 @@
1911.4 /*
1911.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1911.6 *
1911.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1911.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1911.9 + *
1911.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1911.11 + * Other names may be trademarks of their respective owners.
1911.12 *
1911.13 * The contents of this file are subject to the terms of either the GNU
1911.14 * General Public License Version 2 only ("GPL") or the Common
1911.15 @@ -13,9 +16,9 @@
1911.16 * specific language governing permissions and limitations under the
1911.17 * License. When distributing the software, include this License Header
1911.18 * Notice in each file and include the License file at
1911.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1911.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1911.21 * particular file as subject to the "Classpath" exception as provided
1911.22 - * by Sun in the GPL Version 2 section of the License file that
1911.23 + * by Oracle in the GPL Version 2 section of the License file that
1911.24 * accompanied this code. If applicable, add the following below the
1911.25 * License Header, with the fields enclosed by brackets [] replaced by
1911.26 * your own identifying information:
1912.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyReferenceDataPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1912.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyOfManyReferenceDataPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1912.3 @@ -1,7 +1,10 @@
1912.4 /*
1912.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1912.6 *
1912.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1912.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1912.9 + *
1912.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1912.11 + * Other names may be trademarks of their respective owners.
1912.12 *
1912.13 * The contents of this file are subject to the terms of either the GNU
1912.14 * General Public License Version 2 only ("GPL") or the Common
1912.15 @@ -13,9 +16,9 @@
1912.16 * specific language governing permissions and limitations under the
1912.17 * License. When distributing the software, include this License Header
1912.18 * Notice in each file and include the License file at
1912.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1912.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1912.21 * particular file as subject to the "Classpath" exception as provided
1912.22 - * by Sun in the GPL Version 2 section of the License file that
1912.23 + * by Oracle in the GPL Version 2 section of the License file that
1912.24 * accompanied this code. If applicable, add the following below the
1912.25 * License Header, with the fields enclosed by brackets [] replaced by
1912.26 * your own identifying information:
1913.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyReferenceDataPanel.java Fri Jul 16 11:47:36 2010 -0400
1913.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyReferenceDataPanel.java Fri Jul 16 14:21:50 2010 -0400
1913.3 @@ -1,7 +1,10 @@
1913.4 /*
1913.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1913.6 *
1913.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1913.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1913.9 + *
1913.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1913.11 + * Other names may be trademarks of their respective owners.
1913.12 *
1913.13 * The contents of this file are subject to the terms of either the GNU
1913.14 * General Public License Version 2 only ("GPL") or the Common
1913.15 @@ -13,9 +16,9 @@
1913.16 * specific language governing permissions and limitations under the
1913.17 * License. When distributing the software, include this License Header
1913.18 * Notice in each file and include the License file at
1913.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1913.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1913.21 * particular file as subject to the "Classpath" exception as provided
1913.22 - * by Sun in the GPL Version 2 section of the License file that
1913.23 + * by Oracle in the GPL Version 2 section of the License file that
1913.24 * accompanied this code. If applicable, add the following below the
1913.25 * License Header, with the fields enclosed by brackets [] replaced by
1913.26 * your own identifying information:
1914.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyReferenceDataPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1914.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseManyReferenceDataPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1914.3 @@ -1,7 +1,10 @@
1914.4 /*
1914.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1914.6 *
1914.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1914.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1914.9 + *
1914.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1914.11 + * Other names may be trademarks of their respective owners.
1914.12 *
1914.13 * The contents of this file are subject to the terms of either the GNU
1914.14 * General Public License Version 2 only ("GPL") or the Common
1914.15 @@ -13,9 +16,9 @@
1914.16 * specific language governing permissions and limitations under the
1914.17 * License. When distributing the software, include this License Header
1914.18 * Notice in each file and include the License file at
1914.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1914.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1914.21 * particular file as subject to the "Classpath" exception as provided
1914.22 - * by Sun in the GPL Version 2 section of the License file that
1914.23 + * by Oracle in the GPL Version 2 section of the License file that
1914.24 * accompanied this code. If applicable, add the following below the
1914.25 * License Header, with the fields enclosed by brackets [] replaced by
1914.26 * your own identifying information:
1915.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseOneReferenceDataPanel.java Fri Jul 16 11:47:36 2010 -0400
1915.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseOneReferenceDataPanel.java Fri Jul 16 14:21:50 2010 -0400
1915.3 @@ -1,7 +1,10 @@
1915.4 /*
1915.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1915.6 *
1915.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1915.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1915.9 + *
1915.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1915.11 + * Other names may be trademarks of their respective owners.
1915.12 *
1915.13 * The contents of this file are subject to the terms of either the GNU
1915.14 * General Public License Version 2 only ("GPL") or the Common
1915.15 @@ -13,9 +16,9 @@
1915.16 * specific language governing permissions and limitations under the
1915.17 * License. When distributing the software, include this License Header
1915.18 * Notice in each file and include the License file at
1915.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1915.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1915.21 * particular file as subject to the "Classpath" exception as provided
1915.22 - * by Sun in the GPL Version 2 section of the License file that
1915.23 + * by Oracle in the GPL Version 2 section of the License file that
1915.24 * accompanied this code. If applicable, add the following below the
1915.25 * License Header, with the fields enclosed by brackets [] replaced by
1915.26 * your own identifying information:
1916.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseOneReferenceDataPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1916.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ChooseOneReferenceDataPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1916.3 @@ -1,7 +1,10 @@
1916.4 /*
1916.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1916.6 *
1916.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1916.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1916.9 + *
1916.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1916.11 + * Other names may be trademarks of their respective owners.
1916.12 *
1916.13 * The contents of this file are subject to the terms of either the GNU
1916.14 * General Public License Version 2 only ("GPL") or the Common
1916.15 @@ -13,9 +16,9 @@
1916.16 * specific language governing permissions and limitations under the
1916.17 * License. When distributing the software, include this License Header
1916.18 * Notice in each file and include the License file at
1916.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1916.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1916.21 * particular file as subject to the "Classpath" exception as provided
1916.22 - * by Sun in the GPL Version 2 section of the License file that
1916.23 + * by Oracle in the GPL Version 2 section of the License file that
1916.24 * accompanied this code. If applicable, add the following below the
1916.25 * License Header, with the fields enclosed by brackets [] replaced by
1916.26 * your own identifying information:
1917.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/DateTimePatternPanel.java Fri Jul 16 11:47:36 2010 -0400
1917.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/DateTimePatternPanel.java Fri Jul 16 14:21:50 2010 -0400
1917.3 @@ -1,7 +1,10 @@
1917.4 /*
1917.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1917.6 *
1917.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1917.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1917.9 + *
1917.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1917.11 + * Other names may be trademarks of their respective owners.
1917.12 *
1917.13 * The contents of this file are subject to the terms of either the GNU
1917.14 * General Public License Version 2 only ("GPL") or the Common
1917.15 @@ -13,9 +16,9 @@
1917.16 * specific language governing permissions and limitations under the
1917.17 * License. When distributing the software, include this License Header
1917.18 * Notice in each file and include the License file at
1917.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1917.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1917.21 * particular file as subject to the "Classpath" exception as provided
1917.22 - * by Sun in the GPL Version 2 section of the License file that
1917.23 + * by Oracle in the GPL Version 2 section of the License file that
1917.24 * accompanied this code. If applicable, add the following below the
1917.25 * License Header, with the fields enclosed by brackets [] replaced by
1917.26 * your own identifying information:
1918.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/DateTimePatternPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1918.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/DateTimePatternPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1918.3 @@ -1,7 +1,10 @@
1918.4 /*
1918.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1918.6 *
1918.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1918.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1918.9 + *
1918.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1918.11 + * Other names may be trademarks of their respective owners.
1918.12 *
1918.13 * The contents of this file are subject to the terms of either the GNU
1918.14 * General Public License Version 2 only ("GPL") or the Common
1918.15 @@ -13,9 +16,9 @@
1918.16 * specific language governing permissions and limitations under the
1918.17 * License. When distributing the software, include this License Header
1918.18 * Notice in each file and include the License file at
1918.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1918.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1918.21 * particular file as subject to the "Classpath" exception as provided
1918.22 - * by Sun in the GPL Version 2 section of the License file that
1918.23 + * by Oracle in the GPL Version 2 section of the License file that
1918.24 * accompanied this code. If applicable, add the following below the
1918.25 * License Header, with the fields enclosed by brackets [] replaced by
1918.26 * your own identifying information:
1919.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/DoublePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1919.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/DoublePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1919.3 @@ -1,7 +1,10 @@
1919.4 /*
1919.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1919.6 *
1919.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1919.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1919.9 + *
1919.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1919.11 + * Other names may be trademarks of their respective owners.
1919.12 *
1919.13 * The contents of this file are subject to the terms of either the GNU
1919.14 * General Public License Version 2 only ("GPL") or the Common
1919.15 @@ -13,9 +16,9 @@
1919.16 * specific language governing permissions and limitations under the
1919.17 * License. When distributing the software, include this License Header
1919.18 * Notice in each file and include the License file at
1919.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1919.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1919.21 * particular file as subject to the "Classpath" exception as provided
1919.22 - * by Sun in the GPL Version 2 section of the License file that
1919.23 + * by Oracle in the GPL Version 2 section of the License file that
1919.24 * accompanied this code. If applicable, add the following below the
1919.25 * License Header, with the fields enclosed by brackets [] replaced by
1919.26 * your own identifying information:
1920.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/IntegerPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1920.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/IntegerPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1920.3 @@ -1,7 +1,10 @@
1920.4 /*
1920.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1920.6 *
1920.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1920.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1920.9 + *
1920.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1920.11 + * Other names may be trademarks of their respective owners.
1920.12 *
1920.13 * The contents of this file are subject to the terms of either the GNU
1920.14 * General Public License Version 2 only ("GPL") or the Common
1920.15 @@ -13,9 +16,9 @@
1920.16 * specific language governing permissions and limitations under the
1920.17 * License. When distributing the software, include this License Header
1920.18 * Notice in each file and include the License file at
1920.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1920.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1920.21 * particular file as subject to the "Classpath" exception as provided
1920.22 - * by Sun in the GPL Version 2 section of the License file that
1920.23 + * by Oracle in the GPL Version 2 section of the License file that
1920.24 * accompanied this code. If applicable, add the following below the
1920.25 * License Header, with the fields enclosed by brackets [] replaced by
1920.26 * your own identifying information:
1921.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/LengthValuePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1921.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/LengthValuePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1921.3 @@ -1,7 +1,10 @@
1921.4 /*
1921.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1921.6 *
1921.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1921.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1921.9 + *
1921.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1921.11 + * Other names may be trademarks of their respective owners.
1921.12 *
1921.13 * The contents of this file are subject to the terms of either the GNU
1921.14 * General Public License Version 2 only ("GPL") or the Common
1921.15 @@ -13,9 +16,9 @@
1921.16 * specific language governing permissions and limitations under the
1921.17 * License. When distributing the software, include this License Header
1921.18 * Notice in each file and include the License file at
1921.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1921.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1921.21 * particular file as subject to the "Classpath" exception as provided
1921.22 - * by Sun in the GPL Version 2 section of the License file that
1921.23 + * by Oracle in the GPL Version 2 section of the License file that
1921.24 * accompanied this code. If applicable, add the following below the
1921.25 * License Header, with the fields enclosed by brackets [] replaced by
1921.26 * your own identifying information:
1922.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/LocalizedMessageRuntimeException.java Fri Jul 16 11:47:36 2010 -0400
1922.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/LocalizedMessageRuntimeException.java Fri Jul 16 14:21:50 2010 -0400
1922.3 @@ -1,7 +1,10 @@
1922.4 /*
1922.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1922.6 *
1922.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1922.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1922.9 + *
1922.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1922.11 + * Other names may be trademarks of their respective owners.
1922.12 *
1922.13 * The contents of this file are subject to the terms of either the GNU
1922.14 * General Public License Version 2 only ("GPL") or the Common
1922.15 @@ -13,9 +16,9 @@
1922.16 * specific language governing permissions and limitations under the
1922.17 * License. When distributing the software, include this License Header
1922.18 * Notice in each file and include the License file at
1922.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1922.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1922.21 * particular file as subject to the "Classpath" exception as provided
1922.22 - * by Sun in the GPL Version 2 section of the License file that
1922.23 + * by Oracle in the GPL Version 2 section of the License file that
1922.24 * accompanied this code. If applicable, add the following below the
1922.25 * License Header, with the fields enclosed by brackets [] replaced by
1922.26 * your own identifying information:
1923.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/LongPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1923.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/LongPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1923.3 @@ -1,7 +1,10 @@
1923.4 /*
1923.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1923.6 *
1923.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1923.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1923.9 + *
1923.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1923.11 + * Other names may be trademarks of their respective owners.
1923.12 *
1923.13 * The contents of this file are subject to the terms of either the GNU
1923.14 * General Public License Version 2 only ("GPL") or the Common
1923.15 @@ -13,9 +16,9 @@
1923.16 * specific language governing permissions and limitations under the
1923.17 * License. When distributing the software, include this License Header
1923.18 * Notice in each file and include the License file at
1923.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1923.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1923.21 * particular file as subject to the "Classpath" exception as provided
1923.22 - * by Sun in the GPL Version 2 section of the License file that
1923.23 + * by Oracle in the GPL Version 2 section of the License file that
1923.24 * accompanied this code. If applicable, add the following below the
1923.25 * License Header, with the fields enclosed by brackets [] replaced by
1923.26 * your own identifying information:
1924.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NewReferenceDataItemDialog.java Fri Jul 16 11:47:36 2010 -0400
1924.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NewReferenceDataItemDialog.java Fri Jul 16 14:21:50 2010 -0400
1924.3 @@ -1,7 +1,10 @@
1924.4 /*
1924.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1924.6 *
1924.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1924.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1924.9 + *
1924.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1924.11 + * Other names may be trademarks of their respective owners.
1924.12 *
1924.13 * The contents of this file are subject to the terms of either the GNU
1924.14 * General Public License Version 2 only ("GPL") or the Common
1924.15 @@ -13,9 +16,9 @@
1924.16 * specific language governing permissions and limitations under the
1924.17 * License. When distributing the software, include this License Header
1924.18 * Notice in each file and include the License file at
1924.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1924.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1924.21 * particular file as subject to the "Classpath" exception as provided
1924.22 - * by Sun in the GPL Version 2 section of the License file that
1924.23 + * by Oracle in the GPL Version 2 section of the License file that
1924.24 * accompanied this code. If applicable, add the following below the
1924.25 * License Header, with the fields enclosed by brackets [] replaced by
1924.26 * your own identifying information:
1925.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NumberConverterTypePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1925.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NumberConverterTypePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1925.3 @@ -1,7 +1,10 @@
1925.4 /*
1925.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1925.6 *
1925.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1925.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1925.9 + *
1925.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1925.11 + * Other names may be trademarks of their respective owners.
1925.12 *
1925.13 * The contents of this file are subject to the terms of either the GNU
1925.14 * General Public License Version 2 only ("GPL") or the Common
1925.15 @@ -13,9 +16,9 @@
1925.16 * specific language governing permissions and limitations under the
1925.17 * License. When distributing the software, include this License Header
1925.18 * Notice in each file and include the License file at
1925.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1925.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1925.21 * particular file as subject to the "Classpath" exception as provided
1925.22 - * by Sun in the GPL Version 2 section of the License file that
1925.23 + * by Oracle in the GPL Version 2 section of the License file that
1925.24 * accompanied this code. If applicable, add the following below the
1925.25 * License Header, with the fields enclosed by brackets [] replaced by
1925.26 * your own identifying information:
1926.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NumberPatternPanel.java Fri Jul 16 11:47:36 2010 -0400
1926.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NumberPatternPanel.java Fri Jul 16 14:21:50 2010 -0400
1926.3 @@ -1,7 +1,10 @@
1926.4 /*
1926.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1926.6 *
1926.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1926.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1926.9 + *
1926.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1926.11 + * Other names may be trademarks of their respective owners.
1926.12 *
1926.13 * The contents of this file are subject to the terms of either the GNU
1926.14 * General Public License Version 2 only ("GPL") or the Common
1926.15 @@ -13,9 +16,9 @@
1926.16 * specific language governing permissions and limitations under the
1926.17 * License. When distributing the software, include this License Header
1926.18 * Notice in each file and include the License file at
1926.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1926.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1926.21 * particular file as subject to the "Classpath" exception as provided
1926.22 - * by Sun in the GPL Version 2 section of the License file that
1926.23 + * by Oracle in the GPL Version 2 section of the License file that
1926.24 * accompanied this code. If applicable, add the following below the
1926.25 * License Header, with the fields enclosed by brackets [] replaced by
1926.26 * your own identifying information:
1927.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NumberPatternPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1927.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NumberPatternPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1927.3 @@ -1,7 +1,10 @@
1927.4 /*
1927.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1927.6 *
1927.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1927.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1927.9 + *
1927.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1927.11 + * Other names may be trademarks of their respective owners.
1927.12 *
1927.13 * The contents of this file are subject to the terms of either the GNU
1927.14 * General Public License Version 2 only ("GPL") or the Common
1927.15 @@ -13,9 +16,9 @@
1927.16 * specific language governing permissions and limitations under the
1927.17 * License. When distributing the software, include this License Header
1927.18 * Notice in each file and include the License file at
1927.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1927.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1927.21 * particular file as subject to the "Classpath" exception as provided
1927.22 - * by Sun in the GPL Version 2 section of the License file that
1927.23 + * by Oracle in the GPL Version 2 section of the License file that
1927.24 * accompanied this code. If applicable, add the following below the
1927.25 * License Header, with the fields enclosed by brackets [] replaced by
1927.26 * your own identifying information:
1928.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NumberPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1928.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/NumberPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1928.3 @@ -1,7 +1,10 @@
1928.4 /*
1928.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1928.6 *
1928.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1928.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1928.9 + *
1928.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1928.11 + * Other names may be trademarks of their respective owners.
1928.12 *
1928.13 * The contents of this file are subject to the terms of either the GNU
1928.14 * General Public License Version 2 only ("GPL") or the Common
1928.15 @@ -13,9 +16,9 @@
1928.16 * specific language governing permissions and limitations under the
1928.17 * License. When distributing the software, include this License Header
1928.18 * Notice in each file and include the License file at
1928.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1928.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1928.21 * particular file as subject to the "Classpath" exception as provided
1928.22 - * by Sun in the GPL Version 2 section of the License file that
1928.23 + * by Oracle in the GPL Version 2 section of the License file that
1928.24 * accompanied this code. If applicable, add the following below the
1928.25 * License Header, with the fields enclosed by brackets [] replaced by
1928.26 * your own identifying information:
1929.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ReferenceDataListCellRenderer.java Fri Jul 16 11:47:36 2010 -0400
1929.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ReferenceDataListCellRenderer.java Fri Jul 16 14:21:50 2010 -0400
1929.3 @@ -1,7 +1,10 @@
1929.4 /*
1929.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1929.6 *
1929.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1929.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1929.9 + *
1929.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1929.11 + * Other names may be trademarks of their respective owners.
1929.12 *
1929.13 * The contents of this file are subject to the terms of either the GNU
1929.14 * General Public License Version 2 only ("GPL") or the Common
1929.15 @@ -13,9 +16,9 @@
1929.16 * specific language governing permissions and limitations under the
1929.17 * License. When distributing the software, include this License Header
1929.18 * Notice in each file and include the License file at
1929.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1929.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1929.21 * particular file as subject to the "Classpath" exception as provided
1929.22 - * by Sun in the GPL Version 2 section of the License file that
1929.23 + * by Oracle in the GPL Version 2 section of the License file that
1929.24 * accompanied this code. If applicable, add the following below the
1929.25 * License Header, with the fields enclosed by brackets [] replaced by
1929.26 * your own identifying information:
1930.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ReferenceDataTwoColumnListCellRenderer.java Fri Jul 16 11:47:36 2010 -0400
1930.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/ReferenceDataTwoColumnListCellRenderer.java Fri Jul 16 14:21:50 2010 -0400
1930.3 @@ -1,7 +1,10 @@
1930.4 /*
1930.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1930.6 *
1930.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1930.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1930.9 + *
1930.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1930.11 + * Other names may be trademarks of their respective owners.
1930.12 *
1930.13 * The contents of this file are subject to the terms of either the GNU
1930.14 * General Public License Version 2 only ("GPL") or the Common
1930.15 @@ -13,9 +16,9 @@
1930.16 * specific language governing permissions and limitations under the
1930.17 * License. When distributing the software, include this License Header
1930.18 * Notice in each file and include the License file at
1930.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1930.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1930.21 * particular file as subject to the "Classpath" exception as provided
1930.22 - * by Sun in the GPL Version 2 section of the License file that
1930.23 + * by Oracle in the GPL Version 2 section of the License file that
1930.24 * accompanied this code. If applicable, add the following below the
1930.25 * License Header, with the fields enclosed by brackets [] replaced by
1930.26 * your own identifying information:
1931.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/SingleChoiceListPanel.java Fri Jul 16 11:47:36 2010 -0400
1931.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/SingleChoiceListPanel.java Fri Jul 16 14:21:50 2010 -0400
1931.3 @@ -1,7 +1,10 @@
1931.4 /*
1931.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1931.6 *
1931.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1931.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1931.9 + *
1931.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1931.11 + * Other names may be trademarks of their respective owners.
1931.12 *
1931.13 * The contents of this file are subject to the terms of either the GNU
1931.14 * General Public License Version 2 only ("GPL") or the Common
1931.15 @@ -13,9 +16,9 @@
1931.16 * specific language governing permissions and limitations under the
1931.17 * License. When distributing the software, include this License Header
1931.18 * Notice in each file and include the License file at
1931.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1931.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1931.21 * particular file as subject to the "Classpath" exception as provided
1931.22 - * by Sun in the GPL Version 2 section of the License file that
1931.23 + * by Oracle in the GPL Version 2 section of the License file that
1931.24 * accompanied this code. If applicable, add the following below the
1931.25 * License Header, with the fields enclosed by brackets [] replaced by
1931.26 * your own identifying information:
1932.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/SingleChoiceListPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1932.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/property/SingleChoiceListPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1932.3 @@ -1,7 +1,10 @@
1932.4 /*
1932.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1932.6 *
1932.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1932.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1932.9 + *
1932.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1932.11 + * Other names may be trademarks of their respective owners.
1932.12 *
1932.13 * The contents of this file are subject to the terms of either the GNU
1932.14 * General Public License Version 2 only ("GPL") or the Common
1932.15 @@ -13,9 +16,9 @@
1932.16 * specific language governing permissions and limitations under the
1932.17 * License. When distributing the software, include this License Header
1932.18 * Notice in each file and include the License file at
1932.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1932.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1932.21 * particular file as subject to the "Classpath" exception as provided
1932.22 - * by Sun in the GPL Version 2 section of the License file that
1932.23 + * by Oracle in the GPL Version 2 section of the License file that
1932.24 * accompanied this code. If applicable, add the following below the
1932.25 * License Header, with the fields enclosed by brackets [] replaced by
1932.26 * your own identifying information:
1933.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/BaseReferenceData.java Fri Jul 16 11:47:36 2010 -0400
1933.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/BaseReferenceData.java Fri Jul 16 14:21:50 2010 -0400
1933.3 @@ -1,7 +1,10 @@
1933.4 /*
1933.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1933.6 *
1933.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1933.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1933.9 + *
1933.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1933.11 + * Other names may be trademarks of their respective owners.
1933.12 *
1933.13 * The contents of this file are subject to the terms of either the GNU
1933.14 * General Public License Version 2 only ("GPL") or the Common
1933.15 @@ -13,9 +16,9 @@
1933.16 * specific language governing permissions and limitations under the
1933.17 * License. When distributing the software, include this License Header
1933.18 * Notice in each file and include the License file at
1933.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1933.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1933.21 * particular file as subject to the "Classpath" exception as provided
1933.22 - * by Sun in the GPL Version 2 section of the License file that
1933.23 + * by Oracle in the GPL Version 2 section of the License file that
1933.24 * accompanied this code. If applicable, add the following below the
1933.25 * License Header, with the fields enclosed by brackets [] replaced by
1933.26 * your own identifying information:
1934.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1934.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1934.3 @@ -1,6 +1,9 @@
1934.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1934.5 #
1934.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1934.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1934.8 +#
1934.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1934.10 +# Other names may be trademarks of their respective owners.
1934.11 #
1934.12 # The contents of this file are subject to the terms of either the GNU
1934.13 # General Public License Version 2 only ("GPL") or the Common
1934.14 @@ -12,9 +15,9 @@
1934.15 # specific language governing permissions and limitations under the
1934.16 # License. When distributing the software, include this License Header
1934.17 # Notice in each file and include the License file at
1934.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1934.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1934.20 # particular file as subject to the "Classpath" exception as provided
1934.21 -# by Sun in the GPL Version 2 section of the License file that
1934.22 +# by Oracle in the GPL Version 2 section of the License file that
1934.23 # accompanied this code. If applicable, add the following below the
1934.24 # License Header, with the fields enclosed by brackets [] replaced by
1934.25 # your own identifying information:
1935.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/BundleHolder.java Fri Jul 16 11:47:36 2010 -0400
1935.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/BundleHolder.java Fri Jul 16 14:21:50 2010 -0400
1935.3 @@ -1,7 +1,10 @@
1935.4 /*
1935.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1935.6 *
1935.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1935.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1935.9 + *
1935.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1935.11 + * Other names may be trademarks of their respective owners.
1935.12 *
1935.13 * The contents of this file are subject to the terms of either the GNU
1935.14 * General Public License Version 2 only ("GPL") or the Common
1935.15 @@ -13,9 +16,9 @@
1935.16 * specific language governing permissions and limitations under the
1935.17 * License. When distributing the software, include this License Header
1935.18 * Notice in each file and include the License file at
1935.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1935.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1935.21 * particular file as subject to the "Classpath" exception as provided
1935.22 - * by Sun in the GPL Version 2 section of the License file that
1935.23 + * by Oracle in the GPL Version 2 section of the License file that
1935.24 * accompanied this code. If applicable, add the following below the
1935.25 * License Header, with the fields enclosed by brackets [] replaced by
1935.26 * your own identifying information:
1936.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/CharacterSetsReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1936.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/CharacterSetsReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1936.3 @@ -1,7 +1,10 @@
1936.4 /*
1936.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1936.6 *
1936.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1936.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1936.9 + *
1936.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1936.11 + * Other names may be trademarks of their respective owners.
1936.12 *
1936.13 * The contents of this file are subject to the terms of either the GNU
1936.14 * General Public License Version 2 only ("GPL") or the Common
1936.15 @@ -13,9 +16,9 @@
1936.16 * specific language governing permissions and limitations under the
1936.17 * License. When distributing the software, include this License Header
1936.18 * Notice in each file and include the License file at
1936.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1936.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1936.21 * particular file as subject to the "Classpath" exception as provided
1936.22 - * by Sun in the GPL Version 2 section of the License file that
1936.23 + * by Oracle in the GPL Version 2 section of the License file that
1936.24 * accompanied this code. If applicable, add the following below the
1936.25 * License Header, with the fields enclosed by brackets [] replaced by
1936.26 * your own identifying information:
1937.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/CommandButtonTypesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1937.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/CommandButtonTypesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1937.3 @@ -1,7 +1,10 @@
1937.4 /*
1937.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1937.6 *
1937.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1937.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1937.9 + *
1937.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1937.11 + * Other names may be trademarks of their respective owners.
1937.12 *
1937.13 * The contents of this file are subject to the terms of either the GNU
1937.14 * General Public License Version 2 only ("GPL") or the Common
1937.15 @@ -13,9 +16,9 @@
1937.16 * specific language governing permissions and limitations under the
1937.17 * License. When distributing the software, include this License Header
1937.18 * Notice in each file and include the License file at
1937.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1937.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1937.21 * particular file as subject to the "Classpath" exception as provided
1937.22 - * by Sun in the GPL Version 2 section of the License file that
1937.23 + * by Oracle in the GPL Version 2 section of the License file that
1937.24 * accompanied this code. If applicable, add the following below the
1937.25 * License Header, with the fields enclosed by brackets [] replaced by
1937.26 * your own identifying information:
1938.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ComponentIdsReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1938.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ComponentIdsReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1938.3 @@ -1,7 +1,10 @@
1938.4 /*
1938.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1938.6 *
1938.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1938.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1938.9 + *
1938.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1938.11 + * Other names may be trademarks of their respective owners.
1938.12 *
1938.13 * The contents of this file are subject to the terms of either the GNU
1938.14 * General Public License Version 2 only ("GPL") or the Common
1938.15 @@ -13,9 +16,9 @@
1938.16 * specific language governing permissions and limitations under the
1938.17 * License. When distributing the software, include this License Header
1938.18 * Notice in each file and include the License file at
1938.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1938.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1938.21 * particular file as subject to the "Classpath" exception as provided
1938.22 - * by Sun in the GPL Version 2 section of the License file that
1938.23 + * by Oracle in the GPL Version 2 section of the License file that
1938.24 * accompanied this code. If applicable, add the following below the
1938.25 * License Header, with the fields enclosed by brackets [] replaced by
1938.26 * your own identifying information:
1939.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/CompositeReferenceData.java Fri Jul 16 11:47:36 2010 -0400
1939.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/CompositeReferenceData.java Fri Jul 16 14:21:50 2010 -0400
1939.3 @@ -1,7 +1,10 @@
1939.4 /*
1939.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1939.6 *
1939.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1939.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1939.9 + *
1939.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1939.11 + * Other names may be trademarks of their respective owners.
1939.12 *
1939.13 * The contents of this file are subject to the terms of either the GNU
1939.14 * General Public License Version 2 only ("GPL") or the Common
1939.15 @@ -13,9 +16,9 @@
1939.16 * specific language governing permissions and limitations under the
1939.17 * License. When distributing the software, include this License Header
1939.18 * Notice in each file and include the License file at
1939.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1939.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1939.21 * particular file as subject to the "Classpath" exception as provided
1939.22 - * by Sun in the GPL Version 2 section of the License file that
1939.23 + * by Oracle in the GPL Version 2 section of the License file that
1939.24 * accompanied this code. If applicable, add the following below the
1939.25 * License Header, with the fields enclosed by brackets [] replaced by
1939.26 * your own identifying information:
1940.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ConcurrencyTypesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1940.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ConcurrencyTypesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1940.3 @@ -1,7 +1,10 @@
1940.4 /*
1940.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1940.6 *
1940.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1940.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1940.9 + *
1940.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1940.11 + * Other names may be trademarks of their respective owners.
1940.12 *
1940.13 * The contents of this file are subject to the terms of either the GNU
1940.14 * General Public License Version 2 only ("GPL") or the Common
1940.15 @@ -13,9 +16,9 @@
1940.16 * specific language governing permissions and limitations under the
1940.17 * License. When distributing the software, include this License Header
1940.18 * Notice in each file and include the License file at
1940.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1940.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1940.21 * particular file as subject to the "Classpath" exception as provided
1940.22 - * by Sun in the GPL Version 2 section of the License file that
1940.23 + * by Oracle in the GPL Version 2 section of the License file that
1940.24 * accompanied this code. If applicable, add the following below the
1940.25 * License Header, with the fields enclosed by brackets [] replaced by
1940.26 * your own identifying information:
1941.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/DataSourceNamesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1941.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/DataSourceNamesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1941.3 @@ -1,7 +1,10 @@
1941.4 /*
1941.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1941.6 *
1941.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1941.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1941.9 + *
1941.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1941.11 + * Other names may be trademarks of their respective owners.
1941.12 *
1941.13 * The contents of this file are subject to the terms of either the GNU
1941.14 * General Public License Version 2 only ("GPL") or the Common
1941.15 @@ -13,9 +16,9 @@
1941.16 * specific language governing permissions and limitations under the
1941.17 * License. When distributing the software, include this License Header
1941.18 * Notice in each file and include the License file at
1941.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1941.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1941.21 * particular file as subject to the "Classpath" exception as provided
1941.22 - * by Sun in the GPL Version 2 section of the License file that
1941.23 + * by Oracle in the GPL Version 2 section of the License file that
1941.24 * accompanied this code. If applicable, add the following below the
1941.25 * License Header, with the fields enclosed by brackets [] replaced by
1941.26 * your own identifying information:
1942.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/DateTimeStylesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1942.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/DateTimeStylesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1942.3 @@ -1,7 +1,10 @@
1942.4 /*
1942.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1942.6 *
1942.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1942.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1942.9 + *
1942.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1942.11 + * Other names may be trademarks of their respective owners.
1942.12 *
1942.13 * The contents of this file are subject to the terms of either the GNU
1942.14 * General Public License Version 2 only ("GPL") or the Common
1942.15 @@ -13,9 +16,9 @@
1942.16 * specific language governing permissions and limitations under the
1942.17 * License. When distributing the software, include this License Header
1942.18 * Notice in each file and include the License file at
1942.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1942.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1942.21 * particular file as subject to the "Classpath" exception as provided
1942.22 - * by Sun in the GPL Version 2 section of the License file that
1942.23 + * by Oracle in the GPL Version 2 section of the License file that
1942.24 * accompanied this code. If applicable, add the following below the
1942.25 * License Header, with the fields enclosed by brackets [] replaced by
1942.26 * your own identifying information:
1943.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/DateTimeTypesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1943.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/DateTimeTypesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1943.3 @@ -1,7 +1,10 @@
1943.4 /*
1943.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1943.6 *
1943.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1943.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1943.9 + *
1943.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1943.11 + * Other names may be trademarks of their respective owners.
1943.12 *
1943.13 * The contents of this file are subject to the terms of either the GNU
1943.14 * General Public License Version 2 only ("GPL") or the Common
1943.15 @@ -13,9 +16,9 @@
1943.16 * specific language governing permissions and limitations under the
1943.17 * License. When distributing the software, include this License Header
1943.18 * Notice in each file and include the License file at
1943.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1943.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1943.21 * particular file as subject to the "Classpath" exception as provided
1943.22 - * by Sun in the GPL Version 2 section of the License file that
1943.23 + * by Oracle in the GPL Version 2 section of the License file that
1943.24 * accompanied this code. If applicable, add the following below the
1943.25 * License Header, with the fields enclosed by brackets [] replaced by
1943.26 * your own identifying information:
1944.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/DesignPropertyAttachedReferenceData.java Fri Jul 16 11:47:36 2010 -0400
1944.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/DesignPropertyAttachedReferenceData.java Fri Jul 16 14:21:50 2010 -0400
1944.3 @@ -1,7 +1,10 @@
1944.4 /*
1944.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1944.6 *
1944.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1944.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1944.9 + *
1944.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1944.11 + * Other names may be trademarks of their respective owners.
1944.12 *
1944.13 * The contents of this file are subject to the terms of either the GNU
1944.14 * General Public License Version 2 only ("GPL") or the Common
1944.15 @@ -13,9 +16,9 @@
1944.16 * specific language governing permissions and limitations under the
1944.17 * License. When distributing the software, include this License Header
1944.18 * Notice in each file and include the License file at
1944.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1944.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1944.21 * particular file as subject to the "Classpath" exception as provided
1944.22 - * by Sun in the GPL Version 2 section of the License file that
1944.23 + * by Oracle in the GPL Version 2 section of the License file that
1944.24 * accompanied this code. If applicable, add the following below the
1944.25 * License Header, with the fields enclosed by brackets [] replaced by
1944.26 * your own identifying information:
1945.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/FrameTargetsReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1945.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/FrameTargetsReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1945.3 @@ -1,7 +1,10 @@
1945.4 /*
1945.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1945.6 *
1945.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1945.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1945.9 + *
1945.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1945.11 + * Other names may be trademarks of their respective owners.
1945.12 *
1945.13 * The contents of this file are subject to the terms of either the GNU
1945.14 * General Public License Version 2 only ("GPL") or the Common
1945.15 @@ -13,9 +16,9 @@
1945.16 * specific language governing permissions and limitations under the
1945.17 * License. When distributing the software, include this License Header
1945.18 * Notice in each file and include the License file at
1945.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1945.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1945.21 * particular file as subject to the "Classpath" exception as provided
1945.22 - * by Sun in the GPL Version 2 section of the License file that
1945.23 + * by Oracle in the GPL Version 2 section of the License file that
1945.24 * accompanied this code. If applicable, add the following below the
1945.25 * License Header, with the fields enclosed by brackets [] replaced by
1945.26 * your own identifying information:
1946.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ImageMapNamesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1946.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ImageMapNamesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1946.3 @@ -1,7 +1,10 @@
1946.4 /*
1946.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1946.6 *
1946.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1946.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1946.9 + *
1946.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1946.11 + * Other names may be trademarks of their respective owners.
1946.12 *
1946.13 * The contents of this file are subject to the terms of either the GNU
1946.14 * General Public License Version 2 only ("GPL") or the Common
1946.15 @@ -13,9 +16,9 @@
1946.16 * specific language governing permissions and limitations under the
1946.17 * License. When distributing the software, include this License Header
1946.18 * Notice in each file and include the License file at
1946.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1946.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1946.21 * particular file as subject to the "Classpath" exception as provided
1946.22 - * by Sun in the GPL Version 2 section of the License file that
1946.23 + * by Oracle in the GPL Version 2 section of the License file that
1946.24 * accompanied this code. If applicable, add the following below the
1946.25 * License Header, with the fields enclosed by brackets [] replaced by
1946.26 * your own identifying information:
1947.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/LanguageCodesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1947.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/LanguageCodesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1947.3 @@ -1,7 +1,10 @@
1947.4 /*
1947.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1947.6 *
1947.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1947.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1947.9 + *
1947.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1947.11 + * Other names may be trademarks of their respective owners.
1947.12 *
1947.13 * The contents of this file are subject to the terms of either the GNU
1947.14 * General Public License Version 2 only ("GPL") or the Common
1947.15 @@ -13,9 +16,9 @@
1947.16 * specific language governing permissions and limitations under the
1947.17 * License. When distributing the software, include this License Header
1947.18 * Notice in each file and include the License file at
1947.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1947.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1947.21 * particular file as subject to the "Classpath" exception as provided
1947.22 - * by Sun in the GPL Version 2 section of the License file that
1947.23 + * by Oracle in the GPL Version 2 section of the License file that
1947.24 * accompanied this code. If applicable, add the following below the
1947.25 * License Header, with the fields enclosed by brackets [] replaced by
1947.26 * your own identifying information:
1948.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/LinkTypesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1948.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/LinkTypesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1948.3 @@ -1,7 +1,10 @@
1948.4 /*
1948.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1948.6 *
1948.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1948.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1948.9 + *
1948.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1948.11 + * Other names may be trademarks of their respective owners.
1948.12 *
1948.13 * The contents of this file are subject to the terms of either the GNU
1948.14 * General Public License Version 2 only ("GPL") or the Common
1948.15 @@ -13,9 +16,9 @@
1948.16 * specific language governing permissions and limitations under the
1948.17 * License. When distributing the software, include this License Header
1948.18 * Notice in each file and include the License file at
1948.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1948.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1948.21 * particular file as subject to the "Classpath" exception as provided
1948.22 - * by Sun in the GPL Version 2 section of the License file that
1948.23 + * by Oracle in the GPL Version 2 section of the License file that
1948.24 * accompanied this code. If applicable, add the following below the
1948.25 * License Header, with the fields enclosed by brackets [] replaced by
1948.26 * your own identifying information:
1949.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/LocalesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1949.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/LocalesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1949.3 @@ -1,7 +1,10 @@
1949.4 /*
1949.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1949.6 *
1949.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1949.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1949.9 + *
1949.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1949.11 + * Other names may be trademarks of their respective owners.
1949.12 *
1949.13 * The contents of this file are subject to the terms of either the GNU
1949.14 * General Public License Version 2 only ("GPL") or the Common
1949.15 @@ -13,9 +16,9 @@
1949.16 * specific language governing permissions and limitations under the
1949.17 * License. When distributing the software, include this License Header
1949.18 * Notice in each file and include the License file at
1949.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1949.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1949.21 * particular file as subject to the "Classpath" exception as provided
1949.22 - * by Sun in the GPL Version 2 section of the License file that
1949.23 + * by Oracle in the GPL Version 2 section of the License file that
1949.24 * accompanied this code. If applicable, add the following below the
1949.25 * License Header, with the fields enclosed by brackets [] replaced by
1949.26 * your own identifying information:
1950.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ManyCheckboxLayoutStylesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1950.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ManyCheckboxLayoutStylesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1950.3 @@ -1,7 +1,10 @@
1950.4 /*
1950.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1950.6 *
1950.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1950.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1950.9 + *
1950.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1950.11 + * Other names may be trademarks of their respective owners.
1950.12 *
1950.13 * The contents of this file are subject to the terms of either the GNU
1950.14 * General Public License Version 2 only ("GPL") or the Common
1950.15 @@ -13,9 +16,9 @@
1950.16 * specific language governing permissions and limitations under the
1950.17 * License. When distributing the software, include this License Header
1950.18 * Notice in each file and include the License file at
1950.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1950.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1950.21 * particular file as subject to the "Classpath" exception as provided
1950.22 - * by Sun in the GPL Version 2 section of the License file that
1950.23 + * by Oracle in the GPL Version 2 section of the License file that
1950.24 * accompanied this code. If applicable, add the following below the
1950.25 * License Header, with the fields enclosed by brackets [] replaced by
1950.26 * your own identifying information:
1951.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/MediaTypesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1951.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/MediaTypesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1951.3 @@ -1,7 +1,10 @@
1951.4 /*
1951.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1951.6 *
1951.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1951.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1951.9 + *
1951.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1951.11 + * Other names may be trademarks of their respective owners.
1951.12 *
1951.13 * The contents of this file are subject to the terms of either the GNU
1951.14 * General Public License Version 2 only ("GPL") or the Common
1951.15 @@ -13,9 +16,9 @@
1951.16 * specific language governing permissions and limitations under the
1951.17 * License. When distributing the software, include this License Header
1951.18 * Notice in each file and include the License file at
1951.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1951.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1951.21 * particular file as subject to the "Classpath" exception as provided
1951.22 - * by Sun in the GPL Version 2 section of the License file that
1951.23 + * by Oracle in the GPL Version 2 section of the License file that
1951.24 * accompanied this code. If applicable, add the following below the
1951.25 * License Header, with the fields enclosed by brackets [] replaced by
1951.26 * your own identifying information:
1952.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/MessagesLayoutsReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1952.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/MessagesLayoutsReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1952.3 @@ -1,7 +1,10 @@
1952.4 /*
1952.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1952.6 *
1952.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1952.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1952.9 + *
1952.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1952.11 + * Other names may be trademarks of their respective owners.
1952.12 *
1952.13 * The contents of this file are subject to the terms of either the GNU
1952.14 * General Public License Version 2 only ("GPL") or the Common
1952.15 @@ -13,9 +16,9 @@
1952.16 * specific language governing permissions and limitations under the
1952.17 * License. When distributing the software, include this License Header
1952.18 * Notice in each file and include the License file at
1952.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1952.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1952.21 * particular file as subject to the "Classpath" exception as provided
1952.22 - * by Sun in the GPL Version 2 section of the License file that
1952.23 + * by Oracle in the GPL Version 2 section of the License file that
1952.24 * accompanied this code. If applicable, add the following below the
1952.25 * License Header, with the fields enclosed by brackets [] replaced by
1952.26 * your own identifying information:
1953.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ProjectAttachedReferenceData.java Fri Jul 16 11:47:36 2010 -0400
1953.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ProjectAttachedReferenceData.java Fri Jul 16 14:21:50 2010 -0400
1953.3 @@ -1,7 +1,10 @@
1953.4 /*
1953.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1953.6 *
1953.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1953.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1953.9 + *
1953.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1953.11 + * Other names may be trademarks of their respective owners.
1953.12 *
1953.13 * The contents of this file are subject to the terms of either the GNU
1953.14 * General Public License Version 2 only ("GPL") or the Common
1953.15 @@ -13,9 +16,9 @@
1953.16 * specific language governing permissions and limitations under the
1953.17 * License. When distributing the software, include this License Header
1953.18 * Notice in each file and include the License file at
1953.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1953.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1953.21 * particular file as subject to the "Classpath" exception as provided
1953.22 - * by Sun in the GPL Version 2 section of the License file that
1953.23 + * by Oracle in the GPL Version 2 section of the License file that
1953.24 * accompanied this code. If applicable, add the following below the
1953.25 * License Header, with the fields enclosed by brackets [] replaced by
1953.26 * your own identifying information:
1954.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ReferenceData.java Fri Jul 16 11:47:36 2010 -0400
1954.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ReferenceData.java Fri Jul 16 14:21:50 2010 -0400
1954.3 @@ -1,7 +1,10 @@
1954.4 /*
1954.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1954.6 *
1954.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1954.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1954.9 + *
1954.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1954.11 + * Other names may be trademarks of their respective owners.
1954.12 *
1954.13 * The contents of this file are subject to the terms of either the GNU
1954.14 * General Public License Version 2 only ("GPL") or the Common
1954.15 @@ -13,9 +16,9 @@
1954.16 * specific language governing permissions and limitations under the
1954.17 * License. When distributing the software, include this License Header
1954.18 * Notice in each file and include the License file at
1954.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1954.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1954.21 * particular file as subject to the "Classpath" exception as provided
1954.22 - * by Sun in the GPL Version 2 section of the License file that
1954.23 + * by Oracle in the GPL Version 2 section of the License file that
1954.24 * accompanied this code. If applicable, add the following below the
1954.25 * License Header, with the fields enclosed by brackets [] replaced by
1954.26 * your own identifying information:
1955.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1955.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1955.3 @@ -1,7 +1,10 @@
1955.4 /*
1955.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1955.6 *
1955.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1955.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1955.9 + *
1955.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1955.11 + * Other names may be trademarks of their respective owners.
1955.12 *
1955.13 * The contents of this file are subject to the terms of either the GNU
1955.14 * General Public License Version 2 only ("GPL") or the Common
1955.15 @@ -13,9 +16,9 @@
1955.16 * specific language governing permissions and limitations under the
1955.17 * License. When distributing the software, include this License Header
1955.18 * Notice in each file and include the License file at
1955.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1955.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1955.21 * particular file as subject to the "Classpath" exception as provided
1955.22 - * by Sun in the GPL Version 2 section of the License file that
1955.23 + * by Oracle in the GPL Version 2 section of the License file that
1955.24 * accompanied this code. If applicable, add the following below the
1955.25 * License Header, with the fields enclosed by brackets [] replaced by
1955.26 * your own identifying information:
1956.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ReferenceDataItem.java Fri Jul 16 11:47:36 2010 -0400
1956.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ReferenceDataItem.java Fri Jul 16 14:21:50 2010 -0400
1956.3 @@ -1,7 +1,10 @@
1956.4 /*
1956.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1956.6 *
1956.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1956.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1956.9 + *
1956.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1956.11 + * Other names may be trademarks of their respective owners.
1956.12 *
1956.13 * The contents of this file are subject to the terms of either the GNU
1956.14 * General Public License Version 2 only ("GPL") or the Common
1956.15 @@ -13,9 +16,9 @@
1956.16 * specific language governing permissions and limitations under the
1956.17 * License. When distributing the software, include this License Header
1956.18 * Notice in each file and include the License file at
1956.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1956.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1956.21 * particular file as subject to the "Classpath" exception as provided
1956.22 - * by Sun in the GPL Version 2 section of the License file that
1956.23 + * by Oracle in the GPL Version 2 section of the License file that
1956.24 * accompanied this code. If applicable, add the following below the
1956.25 * License Header, with the fields enclosed by brackets [] replaced by
1956.26 * your own identifying information:
1957.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ReferenceDataManager.java Fri Jul 16 11:47:36 2010 -0400
1957.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/ReferenceDataManager.java Fri Jul 16 14:21:50 2010 -0400
1957.3 @@ -1,7 +1,10 @@
1957.4 /*
1957.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1957.6 *
1957.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1957.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1957.9 + *
1957.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1957.11 + * Other names may be trademarks of their respective owners.
1957.12 *
1957.13 * The contents of this file are subject to the terms of either the GNU
1957.14 * General Public License Version 2 only ("GPL") or the Common
1957.15 @@ -13,9 +16,9 @@
1957.16 * specific language governing permissions and limitations under the
1957.17 * License. When distributing the software, include this License Header
1957.18 * Notice in each file and include the License file at
1957.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1957.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1957.21 * particular file as subject to the "Classpath" exception as provided
1957.22 - * by Sun in the GPL Version 2 section of the License file that
1957.23 + * by Oracle in the GPL Version 2 section of the License file that
1957.24 * accompanied this code. If applicable, add the following below the
1957.25 * License Header, with the fields enclosed by brackets [] replaced by
1957.26 * your own identifying information:
1958.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/RegionShapesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1958.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/RegionShapesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1958.3 @@ -1,7 +1,10 @@
1958.4 /*
1958.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1958.6 *
1958.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1958.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1958.9 + *
1958.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1958.11 + * Other names may be trademarks of their respective owners.
1958.12 *
1958.13 * The contents of this file are subject to the terms of either the GNU
1958.14 * General Public License Version 2 only ("GPL") or the Common
1958.15 @@ -13,9 +16,9 @@
1958.16 * specific language governing permissions and limitations under the
1958.17 * License. When distributing the software, include this License Header
1958.18 * Notice in each file and include the License file at
1958.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1958.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1958.21 * particular file as subject to the "Classpath" exception as provided
1958.22 - * by Sun in the GPL Version 2 section of the License file that
1958.23 + * by Oracle in the GPL Version 2 section of the License file that
1958.24 * accompanied this code. If applicable, add the following below the
1958.25 * License Header, with the fields enclosed by brackets [] replaced by
1958.26 * your own identifying information:
1959.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/StyleClassesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1959.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/StyleClassesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1959.3 @@ -1,7 +1,10 @@
1959.4 /*
1959.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1959.6 *
1959.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1959.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1959.9 + *
1959.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1959.11 + * Other names may be trademarks of their respective owners.
1959.12 *
1959.13 * The contents of this file are subject to the terms of either the GNU
1959.14 * General Public License Version 2 only ("GPL") or the Common
1959.15 @@ -13,9 +16,9 @@
1959.16 * specific language governing permissions and limitations under the
1959.17 * License. When distributing the software, include this License Header
1959.18 * Notice in each file and include the License file at
1959.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1959.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1959.21 * particular file as subject to the "Classpath" exception as provided
1959.22 - * by Sun in the GPL Version 2 section of the License file that
1959.23 + * by Oracle in the GPL Version 2 section of the License file that
1959.24 * accompanied this code. If applicable, add the following below the
1959.25 * License Header, with the fields enclosed by brackets [] replaced by
1959.26 * your own identifying information:
1960.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/TFramesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1960.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/TFramesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1960.3 @@ -1,7 +1,10 @@
1960.4 /*
1960.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1960.6 *
1960.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1960.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1960.9 + *
1960.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1960.11 + * Other names may be trademarks of their respective owners.
1960.12 *
1960.13 * The contents of this file are subject to the terms of either the GNU
1960.14 * General Public License Version 2 only ("GPL") or the Common
1960.15 @@ -13,9 +16,9 @@
1960.16 * specific language governing permissions and limitations under the
1960.17 * License. When distributing the software, include this License Header
1960.18 * Notice in each file and include the License file at
1960.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1960.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1960.21 * particular file as subject to the "Classpath" exception as provided
1960.22 - * by Sun in the GPL Version 2 section of the License file that
1960.23 + * by Oracle in the GPL Version 2 section of the License file that
1960.24 * accompanied this code. If applicable, add the following below the
1960.25 * License Header, with the fields enclosed by brackets [] replaced by
1960.26 * your own identifying information:
1961.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/TableRulesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1961.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/TableRulesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1961.3 @@ -1,7 +1,10 @@
1961.4 /*
1961.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1961.6 *
1961.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1961.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1961.9 + *
1961.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1961.11 + * Other names may be trademarks of their respective owners.
1961.12 *
1961.13 * The contents of this file are subject to the terms of either the GNU
1961.14 * General Public License Version 2 only ("GPL") or the Common
1961.15 @@ -13,9 +16,9 @@
1961.16 * specific language governing permissions and limitations under the
1961.17 * License. When distributing the software, include this License Header
1961.18 * Notice in each file and include the License file at
1961.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1961.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1961.21 * particular file as subject to the "Classpath" exception as provided
1961.22 - * by Sun in the GPL Version 2 section of the License file that
1961.23 + * by Oracle in the GPL Version 2 section of the License file that
1961.24 * accompanied this code. If applicable, add the following below the
1961.25 * License Header, with the fields enclosed by brackets [] replaced by
1961.26 * your own identifying information:
1962.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/TextDirectionsReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1962.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/TextDirectionsReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1962.3 @@ -1,7 +1,10 @@
1962.4 /*
1962.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1962.6 *
1962.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1962.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1962.9 + *
1962.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1962.11 + * Other names may be trademarks of their respective owners.
1962.12 *
1962.13 * The contents of this file are subject to the terms of either the GNU
1962.14 * General Public License Version 2 only ("GPL") or the Common
1962.15 @@ -13,9 +16,9 @@
1962.16 * specific language governing permissions and limitations under the
1962.17 * License. When distributing the software, include this License Header
1962.18 * Notice in each file and include the License file at
1962.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1962.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1962.21 * particular file as subject to the "Classpath" exception as provided
1962.22 - * by Sun in the GPL Version 2 section of the License file that
1962.23 + * by Oracle in the GPL Version 2 section of the License file that
1962.24 * accompanied this code. If applicable, add the following below the
1962.25 * License Header, with the fields enclosed by brackets [] replaced by
1962.26 * your own identifying information:
1963.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/TimeZonesReferenceDataDefiner.java Fri Jul 16 11:47:36 2010 -0400
1963.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/std/reference/TimeZonesReferenceDataDefiner.java Fri Jul 16 14:21:50 2010 -0400
1963.3 @@ -1,7 +1,10 @@
1963.4 /*
1963.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1963.6 *
1963.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1963.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1963.9 + *
1963.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1963.11 + * Other names may be trademarks of their respective owners.
1963.12 *
1963.13 * The contents of this file are subject to the terms of either the GNU
1963.14 * General Public License Version 2 only ("GPL") or the Common
1963.15 @@ -13,9 +16,9 @@
1963.16 * specific language governing permissions and limitations under the
1963.17 * License. When distributing the software, include this License Header
1963.18 * Notice in each file and include the License file at
1963.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1963.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1963.21 * particular file as subject to the "Classpath" exception as provided
1963.22 - * by Sun in the GPL Version 2 section of the License file that
1963.23 + * by Oracle in the GPL Version 2 section of the License file that
1963.24 * accompanied this code. If applicable, add the following below the
1963.25 * License Header, with the fields enclosed by brackets [] replaced by
1963.26 * your own identifying information:
1964.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/util/ComponentBundle.java Fri Jul 16 11:47:36 2010 -0400
1964.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/util/ComponentBundle.java Fri Jul 16 14:21:50 2010 -0400
1964.3 @@ -1,7 +1,10 @@
1964.4 /*
1964.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1964.6 *
1964.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1964.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1964.9 + *
1964.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1964.11 + * Other names may be trademarks of their respective owners.
1964.12 *
1964.13 * The contents of this file are subject to the terms of either the GNU
1964.14 * General Public License Version 2 only ("GPL") or the Common
1964.15 @@ -13,9 +16,9 @@
1964.16 * specific language governing permissions and limitations under the
1964.17 * License. When distributing the software, include this License Header
1964.18 * Notice in each file and include the License file at
1964.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1964.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1964.21 * particular file as subject to the "Classpath" exception as provided
1964.22 - * by Sun in the GPL Version 2 section of the License file that
1964.23 + * by Oracle in the GPL Version 2 section of the License file that
1964.24 * accompanied this code. If applicable, add the following below the
1964.25 * License Header, with the fields enclosed by brackets [] replaced by
1964.26 * your own identifying information:
1965.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/util/DesignTimeComponentBundle.java Fri Jul 16 11:47:36 2010 -0400
1965.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/util/DesignTimeComponentBundle.java Fri Jul 16 14:21:50 2010 -0400
1965.3 @@ -1,7 +1,10 @@
1965.4 /*
1965.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1965.6 *
1965.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1965.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1965.9 + *
1965.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1965.11 + * Other names may be trademarks of their respective owners.
1965.12 *
1965.13 * The contents of this file are subject to the terms of either the GNU
1965.14 * General Public License Version 2 only ("GPL") or the Common
1965.15 @@ -13,9 +16,9 @@
1965.16 * specific language governing permissions and limitations under the
1965.17 * License. When distributing the software, include this License Header
1965.18 * Notice in each file and include the License file at
1965.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1965.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1965.21 * particular file as subject to the "Classpath" exception as provided
1965.22 - * by Sun in the GPL Version 2 section of the License file that
1965.23 + * by Oracle in the GPL Version 2 section of the License file that
1965.24 * accompanied this code. If applicable, add the following below the
1965.25 * License Header, with the fields enclosed by brackets [] replaced by
1965.26 * your own identifying information:
1966.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/util/LoggerUtil.java Fri Jul 16 11:47:36 2010 -0400
1966.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/util/LoggerUtil.java Fri Jul 16 14:21:50 2010 -0400
1966.3 @@ -1,7 +1,10 @@
1966.4 /*
1966.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1966.6 *
1966.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1966.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1966.9 + *
1966.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1966.11 + * Other names may be trademarks of their respective owners.
1966.12 *
1966.13 * The contents of this file are subject to the terms of either the GNU
1966.14 * General Public License Version 2 only ("GPL") or the Common
1966.15 @@ -13,9 +16,9 @@
1966.16 * specific language governing permissions and limitations under the
1966.17 * License. When distributing the software, include this License Header
1966.18 * Notice in each file and include the License file at
1966.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1966.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1966.21 * particular file as subject to the "Classpath" exception as provided
1966.22 - * by Sun in the GPL Version 2 section of the License file that
1966.23 + * by Oracle in the GPL Version 2 section of the License file that
1966.24 * accompanied this code. If applicable, add the following below the
1966.25 * License Header, with the fields enclosed by brackets [] replaced by
1966.26 * your own identifying information:
1967.1 --- a/visualweb.propertyeditors/src/com/sun/jsfcl/util/LoggerUtilSimpleFormatter.java Fri Jul 16 11:47:36 2010 -0400
1967.2 +++ b/visualweb.propertyeditors/src/com/sun/jsfcl/util/LoggerUtilSimpleFormatter.java Fri Jul 16 14:21:50 2010 -0400
1967.3 @@ -1,7 +1,10 @@
1967.4 /*
1967.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1967.6 *
1967.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1967.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1967.9 + *
1967.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1967.11 + * Other names may be trademarks of their respective owners.
1967.12 *
1967.13 * The contents of this file are subject to the terms of either the GNU
1967.14 * General Public License Version 2 only ("GPL") or the Common
1967.15 @@ -13,9 +16,9 @@
1967.16 * specific language governing permissions and limitations under the
1967.17 * License. When distributing the software, include this License Header
1967.18 * Notice in each file and include the License file at
1967.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1967.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1967.21 * particular file as subject to the "Classpath" exception as provided
1967.22 - * by Sun in the GPL Version 2 section of the License file that
1967.23 + * by Oracle in the GPL Version 2 section of the License file that
1967.24 * accompanied this code. If applicable, add the following below the
1967.25 * License Header, with the fields enclosed by brackets [] replaced by
1967.26 * your own identifying information:
1968.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
1968.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
1968.3 @@ -1,6 +1,9 @@
1968.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1968.5 #
1968.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1968.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1968.8 +#
1968.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1968.10 +# Other names may be trademarks of their respective owners.
1968.11 #
1968.12 # The contents of this file are subject to the terms of either the GNU
1968.13 # General Public License Version 2 only ("GPL") or the Common
1968.14 @@ -12,9 +15,9 @@
1968.15 # specific language governing permissions and limitations under the
1968.16 # License. When distributing the software, include this License Header
1968.17 # Notice in each file and include the License file at
1968.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1968.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1968.20 # particular file as subject to the "Classpath" exception as provided
1968.21 -# by Sun in the GPL Version 2 section of the License file that
1968.22 +# by Oracle in the GPL Version 2 section of the License file that
1968.23 # accompanied this code. If applicable, add the following below the
1968.24 # License Header, with the fields enclosed by brackets [] replaced by
1968.25 # your own identifying information:
1969.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/ConverterPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1969.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/ConverterPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1969.3 @@ -1,7 +1,10 @@
1969.4 /*
1969.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1969.6 *
1969.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1969.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1969.9 + *
1969.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1969.11 + * Other names may be trademarks of their respective owners.
1969.12 *
1969.13 * The contents of this file are subject to the terms of either the GNU
1969.14 * General Public License Version 2 only ("GPL") or the Common
1969.15 @@ -13,9 +16,9 @@
1969.16 * specific language governing permissions and limitations under the
1969.17 * License. When distributing the software, include this License Header
1969.18 * Notice in each file and include the License file at
1969.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1969.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1969.21 * particular file as subject to the "Classpath" exception as provided
1969.22 - * by Sun in the GPL Version 2 section of the License file that
1969.23 + * by Oracle in the GPL Version 2 section of the License file that
1969.24 * accompanied this code. If applicable, add the following below the
1969.25 * License Header, with the fields enclosed by brackets [] replaced by
1969.26 * your own identifying information:
1970.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/DateFormatPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1970.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/DateFormatPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1970.3 @@ -1,7 +1,10 @@
1970.4 /*
1970.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1970.6 *
1970.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1970.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1970.9 + *
1970.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1970.11 + * Other names may be trademarks of their respective owners.
1970.12 *
1970.13 * The contents of this file are subject to the terms of either the GNU
1970.14 * General Public License Version 2 only ("GPL") or the Common
1970.15 @@ -13,9 +16,9 @@
1970.16 * specific language governing permissions and limitations under the
1970.17 * License. When distributing the software, include this License Header
1970.18 * Notice in each file and include the License file at
1970.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1970.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1970.21 * particular file as subject to the "Classpath" exception as provided
1970.22 - * by Sun in the GPL Version 2 section of the License file that
1970.23 + * by Oracle in the GPL Version 2 section of the License file that
1970.24 * accompanied this code. If applicable, add the following below the
1970.25 * License Header, with the fields enclosed by brackets [] replaced by
1970.26 * your own identifying information:
1971.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/DatePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1971.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/DatePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1971.3 @@ -1,7 +1,10 @@
1971.4 /*
1971.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1971.6 *
1971.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1971.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1971.9 + *
1971.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1971.11 + * Other names may be trademarks of their respective owners.
1971.12 *
1971.13 * The contents of this file are subject to the terms of either the GNU
1971.14 * General Public License Version 2 only ("GPL") or the Common
1971.15 @@ -13,9 +16,9 @@
1971.16 * specific language governing permissions and limitations under the
1971.17 * License. When distributing the software, include this License Header
1971.18 * Notice in each file and include the License file at
1971.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1971.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1971.21 * particular file as subject to the "Classpath" exception as provided
1971.22 - * by Sun in the GPL Version 2 section of the License file that
1971.23 + * by Oracle in the GPL Version 2 section of the License file that
1971.24 * accompanied this code. If applicable, add the following below the
1971.25 * License Header, with the fields enclosed by brackets [] replaced by
1971.26 * your own identifying information:
1972.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/DomainPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1972.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/DomainPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1972.3 @@ -1,7 +1,10 @@
1972.4 /*
1972.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1972.6 *
1972.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1972.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1972.9 + *
1972.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1972.11 + * Other names may be trademarks of their respective owners.
1972.12 *
1972.13 * The contents of this file are subject to the terms of either the GNU
1972.14 * General Public License Version 2 only ("GPL") or the Common
1972.15 @@ -13,9 +16,9 @@
1972.16 * specific language governing permissions and limitations under the
1972.17 * License. When distributing the software, include this License Header
1972.18 * Notice in each file and include the License file at
1972.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1972.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1972.21 * particular file as subject to the "Classpath" exception as provided
1972.22 - * by Sun in the GPL Version 2 section of the License file that
1972.23 + * by Oracle in the GPL Version 2 section of the License file that
1972.24 * accompanied this code. If applicable, add the following below the
1972.25 * License Header, with the fields enclosed by brackets [] replaced by
1972.26 * your own identifying information:
1973.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/DoublePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1973.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/DoublePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1973.3 @@ -1,7 +1,10 @@
1973.4 /*
1973.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1973.6 *
1973.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1973.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1973.9 + *
1973.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1973.11 + * Other names may be trademarks of their respective owners.
1973.12 *
1973.13 * The contents of this file are subject to the terms of either the GNU
1973.14 * General Public License Version 2 only ("GPL") or the Common
1973.15 @@ -13,9 +16,9 @@
1973.16 * specific language governing permissions and limitations under the
1973.17 * License. When distributing the software, include this License Header
1973.18 * Notice in each file and include the License file at
1973.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1973.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1973.21 * particular file as subject to the "Classpath" exception as provided
1973.22 - * by Sun in the GPL Version 2 section of the License file that
1973.23 + * by Oracle in the GPL Version 2 section of the License file that
1973.24 * accompanied this code. If applicable, add the following below the
1973.25 * License Header, with the fields enclosed by brackets [] replaced by
1973.26 * your own identifying information:
1974.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/EditElementDialog.java Fri Jul 16 11:47:36 2010 -0400
1974.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/EditElementDialog.java Fri Jul 16 14:21:50 2010 -0400
1974.3 @@ -1,7 +1,10 @@
1974.4 /*
1974.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1974.6 *
1974.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1974.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1974.9 + *
1974.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1974.11 + * Other names may be trademarks of their respective owners.
1974.12 *
1974.13 * The contents of this file are subject to the terms of either the GNU
1974.14 * General Public License Version 2 only ("GPL") or the Common
1974.15 @@ -13,9 +16,9 @@
1974.16 * specific language governing permissions and limitations under the
1974.17 * License. When distributing the software, include this License Header
1974.18 * Notice in each file and include the License file at
1974.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1974.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1974.21 * particular file as subject to the "Classpath" exception as provided
1974.22 - * by Sun in the GPL Version 2 section of the License file that
1974.23 + * by Oracle in the GPL Version 2 section of the License file that
1974.24 * accompanied this code. If applicable, add the following below the
1974.25 * License Header, with the fields enclosed by brackets [] replaced by
1974.26 * your own identifying information:
1975.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/IllegalTextArgumentException.java Fri Jul 16 11:47:36 2010 -0400
1975.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/IllegalTextArgumentException.java Fri Jul 16 14:21:50 2010 -0400
1975.3 @@ -1,7 +1,10 @@
1975.4 /*
1975.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1975.6 *
1975.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1975.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1975.9 + *
1975.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1975.11 + * Other names may be trademarks of their respective owners.
1975.12 *
1975.13 * The contents of this file are subject to the terms of either the GNU
1975.14 * General Public License Version 2 only ("GPL") or the Common
1975.15 @@ -13,9 +16,9 @@
1975.16 * specific language governing permissions and limitations under the
1975.17 * License. When distributing the software, include this License Header
1975.18 * Notice in each file and include the License file at
1975.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1975.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1975.21 * particular file as subject to the "Classpath" exception as provided
1975.22 - * by Sun in the GPL Version 2 section of the License file that
1975.23 + * by Oracle in the GPL Version 2 section of the License file that
1975.24 * accompanied this code. If applicable, add the following below the
1975.25 * License Header, with the fields enclosed by brackets [] replaced by
1975.26 * your own identifying information:
1976.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/ImageUrlPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1976.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/ImageUrlPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1976.3 @@ -1,7 +1,10 @@
1976.4 /*
1976.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1976.6 *
1976.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1976.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1976.9 + *
1976.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1976.11 + * Other names may be trademarks of their respective owners.
1976.12 *
1976.13 * The contents of this file are subject to the terms of either the GNU
1976.14 * General Public License Version 2 only ("GPL") or the Common
1976.15 @@ -13,9 +16,9 @@
1976.16 * specific language governing permissions and limitations under the
1976.17 * License. When distributing the software, include this License Header
1976.18 * Notice in each file and include the License file at
1976.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1976.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1976.21 * particular file as subject to the "Classpath" exception as provided
1976.22 - * by Sun in the GPL Version 2 section of the License file that
1976.23 + * by Oracle in the GPL Version 2 section of the License file that
1976.24 * accompanied this code. If applicable, add the following below the
1976.25 * License Header, with the fields enclosed by brackets [] replaced by
1976.26 * your own identifying information:
1977.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/IntegerPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1977.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/IntegerPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1977.3 @@ -1,7 +1,10 @@
1977.4 /*
1977.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1977.6 *
1977.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1977.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1977.9 + *
1977.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1977.11 + * Other names may be trademarks of their respective owners.
1977.12 *
1977.13 * The contents of this file are subject to the terms of either the GNU
1977.14 * General Public License Version 2 only ("GPL") or the Common
1977.15 @@ -13,9 +16,9 @@
1977.16 * specific language governing permissions and limitations under the
1977.17 * License. When distributing the software, include this License Header
1977.18 * Notice in each file and include the License file at
1977.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1977.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1977.21 * particular file as subject to the "Classpath" exception as provided
1977.22 - * by Sun in the GPL Version 2 section of the License file that
1977.23 + * by Oracle in the GPL Version 2 section of the License file that
1977.24 * accompanied this code. If applicable, add the following below the
1977.25 * License Header, with the fields enclosed by brackets [] replaced by
1977.26 * your own identifying information:
1978.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/JavaScriptPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1978.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/JavaScriptPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1978.3 @@ -1,7 +1,10 @@
1978.4 /*
1978.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1978.6 *
1978.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1978.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1978.9 + *
1978.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1978.11 + * Other names may be trademarks of their respective owners.
1978.12 *
1978.13 * The contents of this file are subject to the terms of either the GNU
1978.14 * General Public License Version 2 only ("GPL") or the Common
1978.15 @@ -13,9 +16,9 @@
1978.16 * specific language governing permissions and limitations under the
1978.17 * License. When distributing the software, include this License Header
1978.18 * Notice in each file and include the License file at
1978.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1978.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1978.21 * particular file as subject to the "Classpath" exception as provided
1978.22 - * by Sun in the GPL Version 2 section of the License file that
1978.23 + * by Oracle in the GPL Version 2 section of the License file that
1978.24 * accompanied this code. If applicable, add the following below the
1978.25 * License Header, with the fields enclosed by brackets [] replaced by
1978.26 * your own identifying information:
1979.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/JavaScriptPropertyPanel.java Fri Jul 16 11:47:36 2010 -0400
1979.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/JavaScriptPropertyPanel.java Fri Jul 16 14:21:50 2010 -0400
1979.3 @@ -1,7 +1,10 @@
1979.4 /*
1979.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1979.6 *
1979.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1979.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1979.9 + *
1979.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1979.11 + * Other names may be trademarks of their respective owners.
1979.12 *
1979.13 * The contents of this file are subject to the terms of either the GNU
1979.14 * General Public License Version 2 only ("GPL") or the Common
1979.15 @@ -13,9 +16,9 @@
1979.16 * specific language governing permissions and limitations under the
1979.17 * License. When distributing the software, include this License Header
1979.18 * Notice in each file and include the License file at
1979.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1979.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1979.21 * particular file as subject to the "Classpath" exception as provided
1979.22 - * by Sun in the GPL Version 2 section of the License file that
1979.23 + * by Oracle in the GPL Version 2 section of the License file that
1979.24 * accompanied this code. If applicable, add the following below the
1979.25 * License Header, with the fields enclosed by brackets [] replaced by
1979.26 * your own identifying information:
1980.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/LengthPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1980.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/LengthPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1980.3 @@ -1,7 +1,10 @@
1980.4 /*
1980.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1980.6 *
1980.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1980.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1980.9 + *
1980.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1980.11 + * Other names may be trademarks of their respective owners.
1980.12 *
1980.13 * The contents of this file are subject to the terms of either the GNU
1980.14 * General Public License Version 2 only ("GPL") or the Common
1980.15 @@ -13,9 +16,9 @@
1980.16 * specific language governing permissions and limitations under the
1980.17 * License. When distributing the software, include this License Header
1980.18 * Notice in each file and include the License file at
1980.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1980.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1980.21 * particular file as subject to the "Classpath" exception as provided
1980.22 - * by Sun in the GPL Version 2 section of the License file that
1980.23 + * by Oracle in the GPL Version 2 section of the License file that
1980.24 * accompanied this code. If applicable, add the following below the
1980.25 * License Header, with the fields enclosed by brackets [] replaced by
1980.26 * your own identifying information:
1981.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/LongPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1981.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/LongPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1981.3 @@ -1,7 +1,10 @@
1981.4 /*
1981.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1981.6 *
1981.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1981.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1981.9 + *
1981.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1981.11 + * Other names may be trademarks of their respective owners.
1981.12 *
1981.13 * The contents of this file are subject to the terms of either the GNU
1981.14 * General Public License Version 2 only ("GPL") or the Common
1981.15 @@ -13,9 +16,9 @@
1981.16 * specific language governing permissions and limitations under the
1981.17 * License. When distributing the software, include this License Header
1981.18 * Notice in each file and include the License file at
1981.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1981.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1981.21 * particular file as subject to the "Classpath" exception as provided
1981.22 - * by Sun in the GPL Version 2 section of the License file that
1981.23 + * by Oracle in the GPL Version 2 section of the License file that
1981.24 * accompanied this code. If applicable, add the following below the
1981.25 * License Header, with the fields enclosed by brackets [] replaced by
1981.26 * your own identifying information:
1982.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/MethodBindingPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1982.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/MethodBindingPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1982.3 @@ -1,7 +1,10 @@
1982.4 /*
1982.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1982.6 *
1982.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1982.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1982.9 + *
1982.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1982.11 + * Other names may be trademarks of their respective owners.
1982.12 *
1982.13 * The contents of this file are subject to the terms of either the GNU
1982.14 * General Public License Version 2 only ("GPL") or the Common
1982.15 @@ -13,9 +16,9 @@
1982.16 * specific language governing permissions and limitations under the
1982.17 * License. When distributing the software, include this License Header
1982.18 * Notice in each file and include the License file at
1982.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1982.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1982.21 * particular file as subject to the "Classpath" exception as provided
1982.22 - * by Sun in the GPL Version 2 section of the License file that
1982.23 + * by Oracle in the GPL Version 2 section of the License file that
1982.24 * accompanied this code. If applicable, add the following below the
1982.25 * License Header, with the fields enclosed by brackets [] replaced by
1982.26 * your own identifying information:
1983.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/MethodBindingPropertyPanel.java Fri Jul 16 11:47:36 2010 -0400
1983.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/MethodBindingPropertyPanel.java Fri Jul 16 14:21:50 2010 -0400
1983.3 @@ -1,7 +1,10 @@
1983.4 /*
1983.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1983.6 *
1983.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1983.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1983.9 + *
1983.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1983.11 + * Other names may be trademarks of their respective owners.
1983.12 *
1983.13 * The contents of this file are subject to the terms of either the GNU
1983.14 * General Public License Version 2 only ("GPL") or the Common
1983.15 @@ -13,9 +16,9 @@
1983.16 * specific language governing permissions and limitations under the
1983.17 * License. When distributing the software, include this License Header
1983.18 * Notice in each file and include the License file at
1983.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1983.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1983.21 * particular file as subject to the "Classpath" exception as provided
1983.22 - * by Sun in the GPL Version 2 section of the License file that
1983.23 + * by Oracle in the GPL Version 2 section of the License file that
1983.24 * accompanied this code. If applicable, add the following below the
1983.25 * License Header, with the fields enclosed by brackets [] replaced by
1983.26 * your own identifying information:
1984.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/NumberPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1984.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/NumberPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1984.3 @@ -1,7 +1,10 @@
1984.4 /*
1984.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1984.6 *
1984.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1984.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1984.9 + *
1984.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1984.11 + * Other names may be trademarks of their respective owners.
1984.12 *
1984.13 * The contents of this file are subject to the terms of either the GNU
1984.14 * General Public License Version 2 only ("GPL") or the Common
1984.15 @@ -13,9 +16,9 @@
1984.16 * specific language governing permissions and limitations under the
1984.17 * License. When distributing the software, include this License Header
1984.18 * Notice in each file and include the License file at
1984.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1984.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1984.21 * particular file as subject to the "Classpath" exception as provided
1984.22 - * by Sun in the GPL Version 2 section of the License file that
1984.23 + * by Oracle in the GPL Version 2 section of the License file that
1984.24 * accompanied this code. If applicable, add the following below the
1984.25 * License Header, with the fields enclosed by brackets [] replaced by
1984.26 * your own identifying information:
1985.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/PropertyEditorBase.java Fri Jul 16 11:47:36 2010 -0400
1985.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/PropertyEditorBase.java Fri Jul 16 14:21:50 2010 -0400
1985.3 @@ -1,7 +1,10 @@
1985.4 /*
1985.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1985.6 *
1985.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1985.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1985.9 + *
1985.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1985.11 + * Other names may be trademarks of their respective owners.
1985.12 *
1985.13 * The contents of this file are subject to the terms of either the GNU
1985.14 * General Public License Version 2 only ("GPL") or the Common
1985.15 @@ -13,9 +16,9 @@
1985.16 * specific language governing permissions and limitations under the
1985.17 * License. When distributing the software, include this License Header
1985.18 * Notice in each file and include the License file at
1985.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1985.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1985.21 * particular file as subject to the "Classpath" exception as provided
1985.22 - * by Sun in the GPL Version 2 section of the License file that
1985.23 + * by Oracle in the GPL Version 2 section of the License file that
1985.24 * accompanied this code. If applicable, add the following below the
1985.25 * License Header, with the fields enclosed by brackets [] replaced by
1985.26 * your own identifying information:
1986.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/PropertyPanelBase.java Fri Jul 16 11:47:36 2010 -0400
1986.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/PropertyPanelBase.java Fri Jul 16 14:21:50 2010 -0400
1986.3 @@ -1,7 +1,10 @@
1986.4 /*
1986.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1986.6 *
1986.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1986.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1986.9 + *
1986.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1986.11 + * Other names may be trademarks of their respective owners.
1986.12 *
1986.13 * The contents of this file are subject to the terms of either the GNU
1986.14 * General Public License Version 2 only ("GPL") or the Common
1986.15 @@ -13,9 +16,9 @@
1986.16 * specific language governing permissions and limitations under the
1986.17 * License. When distributing the software, include this License Header
1986.18 * Notice in each file and include the License file at
1986.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1986.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1986.21 * particular file as subject to the "Classpath" exception as provided
1986.22 - * by Sun in the GPL Version 2 section of the License file that
1986.23 + * by Oracle in the GPL Version 2 section of the License file that
1986.24 * accompanied this code. If applicable, add the following below the
1986.25 * License Header, with the fields enclosed by brackets [] replaced by
1986.26 * your own identifying information:
1987.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/SelectOneDomainEditor.java Fri Jul 16 11:47:36 2010 -0400
1987.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/SelectOneDomainEditor.java Fri Jul 16 14:21:50 2010 -0400
1987.3 @@ -1,7 +1,10 @@
1987.4 /*
1987.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1987.6 *
1987.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1987.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1987.9 + *
1987.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1987.11 + * Other names may be trademarks of their respective owners.
1987.12 *
1987.13 * The contents of this file are subject to the terms of either the GNU
1987.14 * General Public License Version 2 only ("GPL") or the Common
1987.15 @@ -13,9 +16,9 @@
1987.16 * specific language governing permissions and limitations under the
1987.17 * License. When distributing the software, include this License Header
1987.18 * Notice in each file and include the License file at
1987.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1987.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1987.21 * particular file as subject to the "Classpath" exception as provided
1987.22 - * by Sun in the GPL Version 2 section of the License file that
1987.23 + * by Oracle in the GPL Version 2 section of the License file that
1987.24 * accompanied this code. If applicable, add the following below the
1987.25 * License Header, with the fields enclosed by brackets [] replaced by
1987.26 * your own identifying information:
1988.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/SelectOneDomainPanel.java Fri Jul 16 11:47:36 2010 -0400
1988.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/SelectOneDomainPanel.java Fri Jul 16 14:21:50 2010 -0400
1988.3 @@ -1,7 +1,10 @@
1988.4 /*
1988.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1988.6 *
1988.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1988.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1988.9 + *
1988.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1988.11 + * Other names may be trademarks of their respective owners.
1988.12 *
1988.13 * The contents of this file are subject to the terms of either the GNU
1988.14 * General Public License Version 2 only ("GPL") or the Common
1988.15 @@ -13,9 +16,9 @@
1988.16 * specific language governing permissions and limitations under the
1988.17 * License. When distributing the software, include this License Header
1988.18 * Notice in each file and include the License file at
1988.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1988.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1988.21 * particular file as subject to the "Classpath" exception as provided
1988.22 - * by Sun in the GPL Version 2 section of the License file that
1988.23 + * by Oracle in the GPL Version 2 section of the License file that
1988.24 * accompanied this code. If applicable, add the following below the
1988.25 * License Header, with the fields enclosed by brackets [] replaced by
1988.26 * your own identifying information:
1989.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StandardUrlPanel.java Fri Jul 16 11:47:36 2010 -0400
1989.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StandardUrlPanel.java Fri Jul 16 14:21:50 2010 -0400
1989.3 @@ -1,7 +1,10 @@
1989.4 /*
1989.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1989.6 *
1989.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1989.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1989.9 + *
1989.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1989.11 + * Other names may be trademarks of their respective owners.
1989.12 *
1989.13 * The contents of this file are subject to the terms of either the GNU
1989.14 * General Public License Version 2 only ("GPL") or the Common
1989.15 @@ -13,9 +16,9 @@
1989.16 * specific language governing permissions and limitations under the
1989.17 * License. When distributing the software, include this License Header
1989.18 * Notice in each file and include the License file at
1989.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1989.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1989.21 * particular file as subject to the "Classpath" exception as provided
1989.22 - * by Sun in the GPL Version 2 section of the License file that
1989.23 + * by Oracle in the GPL Version 2 section of the License file that
1989.24 * accompanied this code. If applicable, add the following below the
1989.25 * License Header, with the fields enclosed by brackets [] replaced by
1989.26 * your own identifying information:
1990.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StandardUrlPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1990.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StandardUrlPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1990.3 @@ -1,7 +1,10 @@
1990.4 /*
1990.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1990.6 *
1990.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1990.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1990.9 + *
1990.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1990.11 + * Other names may be trademarks of their respective owners.
1990.12 *
1990.13 * The contents of this file are subject to the terms of either the GNU
1990.14 * General Public License Version 2 only ("GPL") or the Common
1990.15 @@ -13,9 +16,9 @@
1990.16 * specific language governing permissions and limitations under the
1990.17 * License. When distributing the software, include this License Header
1990.18 * Notice in each file and include the License file at
1990.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1990.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1990.21 * particular file as subject to the "Classpath" exception as provided
1990.22 - * by Sun in the GPL Version 2 section of the License file that
1990.23 + * by Oracle in the GPL Version 2 section of the License file that
1990.24 * accompanied this code. If applicable, add the following below the
1990.25 * License Header, with the fields enclosed by brackets [] replaced by
1990.26 * your own identifying information:
1991.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StringArrayPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1991.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StringArrayPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1991.3 @@ -1,7 +1,10 @@
1991.4 /*
1991.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1991.6 *
1991.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1991.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1991.9 + *
1991.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1991.11 + * Other names may be trademarks of their respective owners.
1991.12 *
1991.13 * The contents of this file are subject to the terms of either the GNU
1991.14 * General Public License Version 2 only ("GPL") or the Common
1991.15 @@ -13,9 +16,9 @@
1991.16 * specific language governing permissions and limitations under the
1991.17 * License. When distributing the software, include this License Header
1991.18 * Notice in each file and include the License file at
1991.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1991.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1991.21 * particular file as subject to the "Classpath" exception as provided
1991.22 - * by Sun in the GPL Version 2 section of the License file that
1991.23 + * by Oracle in the GPL Version 2 section of the License file that
1991.24 * accompanied this code. If applicable, add the following below the
1991.25 * License Header, with the fields enclosed by brackets [] replaced by
1991.26 * your own identifying information:
1992.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StringPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1992.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StringPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1992.3 @@ -1,7 +1,10 @@
1992.4 /*
1992.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1992.6 *
1992.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1992.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1992.9 + *
1992.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1992.11 + * Other names may be trademarks of their respective owners.
1992.12 *
1992.13 * The contents of this file are subject to the terms of either the GNU
1992.14 * General Public License Version 2 only ("GPL") or the Common
1992.15 @@ -13,9 +16,9 @@
1992.16 * specific language governing permissions and limitations under the
1992.17 * License. When distributing the software, include this License Header
1992.18 * Notice in each file and include the License file at
1992.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1992.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1992.21 * particular file as subject to the "Classpath" exception as provided
1992.22 - * by Sun in the GPL Version 2 section of the License file that
1992.23 + * by Oracle in the GPL Version 2 section of the License file that
1992.24 * accompanied this code. If applicable, add the following below the
1992.25 * License Header, with the fields enclosed by brackets [] replaced by
1992.26 * your own identifying information:
1993.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StringPropertyPanel.java Fri Jul 16 11:47:36 2010 -0400
1993.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StringPropertyPanel.java Fri Jul 16 14:21:50 2010 -0400
1993.3 @@ -1,7 +1,10 @@
1993.4 /*
1993.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1993.6 *
1993.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1993.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1993.9 + *
1993.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1993.11 + * Other names may be trademarks of their respective owners.
1993.12 *
1993.13 * The contents of this file are subject to the terms of either the GNU
1993.14 * General Public License Version 2 only ("GPL") or the Common
1993.15 @@ -13,9 +16,9 @@
1993.16 * specific language governing permissions and limitations under the
1993.17 * License. When distributing the software, include this License Header
1993.18 * Notice in each file and include the License file at
1993.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1993.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1993.21 * particular file as subject to the "Classpath" exception as provided
1993.22 - * by Sun in the GPL Version 2 section of the License file that
1993.23 + * by Oracle in the GPL Version 2 section of the License file that
1993.24 * accompanied this code. If applicable, add the following below the
1993.25 * License Header, with the fields enclosed by brackets [] replaced by
1993.26 * your own identifying information:
1994.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StyleClassPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1994.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StyleClassPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1994.3 @@ -1,7 +1,10 @@
1994.4 /*
1994.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1994.6 *
1994.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1994.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1994.9 + *
1994.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1994.11 + * Other names may be trademarks of their respective owners.
1994.12 *
1994.13 * The contents of this file are subject to the terms of either the GNU
1994.14 * General Public License Version 2 only ("GPL") or the Common
1994.15 @@ -13,9 +16,9 @@
1994.16 * specific language governing permissions and limitations under the
1994.17 * License. When distributing the software, include this License Header
1994.18 * Notice in each file and include the License file at
1994.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1994.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1994.21 * particular file as subject to the "Classpath" exception as provided
1994.22 - * by Sun in the GPL Version 2 section of the License file that
1994.23 + * by Oracle in the GPL Version 2 section of the License file that
1994.24 * accompanied this code. If applicable, add the following below the
1994.25 * License Header, with the fields enclosed by brackets [] replaced by
1994.26 * your own identifying information:
1995.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StyleClassPropertyPanel.java Fri Jul 16 11:47:36 2010 -0400
1995.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/StyleClassPropertyPanel.java Fri Jul 16 14:21:50 2010 -0400
1995.3 @@ -1,7 +1,10 @@
1995.4 /*
1995.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1995.6 *
1995.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1995.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1995.9 + *
1995.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1995.11 + * Other names may be trademarks of their respective owners.
1995.12 *
1995.13 * The contents of this file are subject to the terms of either the GNU
1995.14 * General Public License Version 2 only ("GPL") or the Common
1995.15 @@ -13,9 +16,9 @@
1995.16 * specific language governing permissions and limitations under the
1995.17 * License. When distributing the software, include this License Header
1995.18 * Notice in each file and include the License file at
1995.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1995.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1995.21 * particular file as subject to the "Classpath" exception as provided
1995.22 - * by Sun in the GPL Version 2 section of the License file that
1995.23 + * by Oracle in the GPL Version 2 section of the License file that
1995.24 * accompanied this code. If applicable, add the following below the
1995.25 * License Header, with the fields enclosed by brackets [] replaced by
1995.26 * your own identifying information:
1996.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/TabularPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
1996.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/TabularPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
1996.3 @@ -1,7 +1,10 @@
1996.4 /*
1996.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1996.6 *
1996.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1996.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1996.9 + *
1996.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1996.11 + * Other names may be trademarks of their respective owners.
1996.12 *
1996.13 * The contents of this file are subject to the terms of either the GNU
1996.14 * General Public License Version 2 only ("GPL") or the Common
1996.15 @@ -13,9 +16,9 @@
1996.16 * specific language governing permissions and limitations under the
1996.17 * License. When distributing the software, include this License Header
1996.18 * Notice in each file and include the License file at
1996.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1996.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1996.21 * particular file as subject to the "Classpath" exception as provided
1996.22 - * by Sun in the GPL Version 2 section of the License file that
1996.23 + * by Oracle in the GPL Version 2 section of the License file that
1996.24 * accompanied this code. If applicable, add the following below the
1996.25 * License Header, with the fields enclosed by brackets [] replaced by
1996.26 * your own identifying information:
1997.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/TabularPropertyModel.java Fri Jul 16 11:47:36 2010 -0400
1997.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/TabularPropertyModel.java Fri Jul 16 14:21:50 2010 -0400
1997.3 @@ -1,7 +1,10 @@
1997.4 /*
1997.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1997.6 *
1997.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1997.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1997.9 + *
1997.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1997.11 + * Other names may be trademarks of their respective owners.
1997.12 *
1997.13 * The contents of this file are subject to the terms of either the GNU
1997.14 * General Public License Version 2 only ("GPL") or the Common
1997.15 @@ -13,9 +16,9 @@
1997.16 * specific language governing permissions and limitations under the
1997.17 * License. When distributing the software, include this License Header
1997.18 * Notice in each file and include the License file at
1997.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1997.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1997.21 * particular file as subject to the "Classpath" exception as provided
1997.22 - * by Sun in the GPL Version 2 section of the License file that
1997.23 + * by Oracle in the GPL Version 2 section of the License file that
1997.24 * accompanied this code. If applicable, add the following below the
1997.25 * License Header, with the fields enclosed by brackets [] replaced by
1997.26 * your own identifying information:
1998.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/TabularPropertyPanel.java Fri Jul 16 11:47:36 2010 -0400
1998.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/TabularPropertyPanel.java Fri Jul 16 14:21:50 2010 -0400
1998.3 @@ -1,7 +1,10 @@
1998.4 /*
1998.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1998.6 *
1998.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1998.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1998.9 + *
1998.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1998.11 + * Other names may be trademarks of their respective owners.
1998.12 *
1998.13 * The contents of this file are subject to the terms of either the GNU
1998.14 * General Public License Version 2 only ("GPL") or the Common
1998.15 @@ -13,9 +16,9 @@
1998.16 * specific language governing permissions and limitations under the
1998.17 * License. When distributing the software, include this License Header
1998.18 * Notice in each file and include the License file at
1998.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1998.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1998.21 * particular file as subject to the "Classpath" exception as provided
1998.22 - * by Sun in the GPL Version 2 section of the License file that
1998.23 + * by Oracle in the GPL Version 2 section of the License file that
1998.24 * accompanied this code. If applicable, add the following below the
1998.25 * License Header, with the fields enclosed by brackets [] replaced by
1998.26 * your own identifying information:
1999.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/UrlFileFilter.java Fri Jul 16 11:47:36 2010 -0400
1999.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/UrlFileFilter.java Fri Jul 16 14:21:50 2010 -0400
1999.3 @@ -1,7 +1,10 @@
1999.4 /*
1999.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1999.6 *
1999.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
1999.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
1999.9 + *
1999.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1999.11 + * Other names may be trademarks of their respective owners.
1999.12 *
1999.13 * The contents of this file are subject to the terms of either the GNU
1999.14 * General Public License Version 2 only ("GPL") or the Common
1999.15 @@ -13,9 +16,9 @@
1999.16 * specific language governing permissions and limitations under the
1999.17 * License. When distributing the software, include this License Header
1999.18 * Notice in each file and include the License file at
1999.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1999.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1999.21 * particular file as subject to the "Classpath" exception as provided
1999.22 - * by Sun in the GPL Version 2 section of the License file that
1999.23 + * by Oracle in the GPL Version 2 section of the License file that
1999.24 * accompanied this code. If applicable, add the following below the
1999.25 * License Header, with the fields enclosed by brackets [] replaced by
1999.26 * your own identifying information:
2000.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/UrlPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2000.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/UrlPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2000.3 @@ -1,7 +1,10 @@
2000.4 /*
2000.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2000.6 *
2000.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2000.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2000.9 + *
2000.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2000.11 + * Other names may be trademarks of their respective owners.
2000.12 *
2000.13 * The contents of this file are subject to the terms of either the GNU
2000.14 * General Public License Version 2 only ("GPL") or the Common
2000.15 @@ -13,9 +16,9 @@
2000.16 * specific language governing permissions and limitations under the
2000.17 * License. When distributing the software, include this License Header
2000.18 * Notice in each file and include the License file at
2000.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2000.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2000.21 * particular file as subject to the "Classpath" exception as provided
2000.22 - * by Sun in the GPL Version 2 section of the License file that
2000.23 + * by Oracle in the GPL Version 2 section of the License file that
2000.24 * accompanied this code. If applicable, add the following below the
2000.25 * License Header, with the fields enclosed by brackets [] replaced by
2000.26 * your own identifying information:
2001.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/UrlPropertyPanel.java Fri Jul 16 11:47:36 2010 -0400
2001.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/UrlPropertyPanel.java Fri Jul 16 14:21:50 2010 -0400
2001.3 @@ -1,7 +1,10 @@
2001.4 /*
2001.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2001.6 *
2001.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2001.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2001.9 + *
2001.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2001.11 + * Other names may be trademarks of their respective owners.
2001.12 *
2001.13 * The contents of this file are subject to the terms of either the GNU
2001.14 * General Public License Version 2 only ("GPL") or the Common
2001.15 @@ -13,9 +16,9 @@
2001.16 * specific language governing permissions and limitations under the
2001.17 * License. When distributing the software, include this License Header
2001.18 * Notice in each file and include the License file at
2001.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2001.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2001.21 * particular file as subject to the "Classpath" exception as provided
2001.22 - * by Sun in the GPL Version 2 section of the License file that
2001.23 + * by Oracle in the GPL Version 2 section of the License file that
2001.24 * accompanied this code. If applicable, add the following below the
2001.25 * License Header, with the fields enclosed by brackets [] replaced by
2001.26 * your own identifying information:
2002.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/ValidatorPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2002.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/ValidatorPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2002.3 @@ -1,7 +1,10 @@
2002.4 /*
2002.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2002.6 *
2002.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2002.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2002.9 + *
2002.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2002.11 + * Other names may be trademarks of their respective owners.
2002.12 *
2002.13 * The contents of this file are subject to the terms of either the GNU
2002.14 * General Public License Version 2 only ("GPL") or the Common
2002.15 @@ -13,9 +16,9 @@
2002.16 * specific language governing permissions and limitations under the
2002.17 * License. When distributing the software, include this License Header
2002.18 * Notice in each file and include the License file at
2002.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2002.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2002.21 * particular file as subject to the "Classpath" exception as provided
2002.22 - * by Sun in the GPL Version 2 section of the License file that
2002.23 + * by Oracle in the GPL Version 2 section of the License file that
2002.24 * accompanied this code. If applicable, add the following below the
2002.25 * License Header, with the fields enclosed by brackets [] replaced by
2002.26 * your own identifying information:
2003.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingSourcePanel.java Fri Jul 16 11:47:36 2010 -0400
2003.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingSourcePanel.java Fri Jul 16 14:21:50 2010 -0400
2003.3 @@ -1,7 +1,10 @@
2003.4 /*
2003.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2003.6 *
2003.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2003.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2003.9 + *
2003.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2003.11 + * Other names may be trademarks of their respective owners.
2003.12 *
2003.13 * The contents of this file are subject to the terms of either the GNU
2003.14 * General Public License Version 2 only ("GPL") or the Common
2003.15 @@ -13,9 +16,9 @@
2003.16 * specific language governing permissions and limitations under the
2003.17 * License. When distributing the software, include this License Header
2003.18 * Notice in each file and include the License file at
2003.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2003.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2003.21 * particular file as subject to the "Classpath" exception as provided
2003.22 - * by Sun in the GPL Version 2 section of the License file that
2003.23 + * by Oracle in the GPL Version 2 section of the License file that
2003.24 * accompanied this code. If applicable, add the following below the
2003.25 * License Header, with the fields enclosed by brackets [] replaced by
2003.26 * your own identifying information:
2004.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingTargetCallback.java Fri Jul 16 11:47:36 2010 -0400
2004.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingTargetCallback.java Fri Jul 16 14:21:50 2010 -0400
2004.3 @@ -1,7 +1,10 @@
2004.4 /*
2004.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2004.6 *
2004.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2004.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2004.9 + *
2004.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2004.11 + * Other names may be trademarks of their respective owners.
2004.12 *
2004.13 * The contents of this file are subject to the terms of either the GNU
2004.14 * General Public License Version 2 only ("GPL") or the Common
2004.15 @@ -13,9 +16,9 @@
2004.16 * specific language governing permissions and limitations under the
2004.17 * License. When distributing the software, include this License Header
2004.18 * Notice in each file and include the License file at
2004.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2004.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2004.21 * particular file as subject to the "Classpath" exception as provided
2004.22 - * by Sun in the GPL Version 2 section of the License file that
2004.23 + * by Oracle in the GPL Version 2 section of the License file that
2004.24 * accompanied this code. If applicable, add the following below the
2004.25 * License Header, with the fields enclosed by brackets [] replaced by
2004.26 * your own identifying information:
2005.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingTargetNode.java Fri Jul 16 11:47:36 2010 -0400
2005.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingTargetNode.java Fri Jul 16 14:21:50 2010 -0400
2005.3 @@ -1,7 +1,10 @@
2005.4 /*
2005.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2005.6 *
2005.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2005.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2005.9 + *
2005.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2005.11 + * Other names may be trademarks of their respective owners.
2005.12 *
2005.13 * The contents of this file are subject to the terms of either the GNU
2005.14 * General Public License Version 2 only ("GPL") or the Common
2005.15 @@ -13,9 +16,9 @@
2005.16 * specific language governing permissions and limitations under the
2005.17 * License. When distributing the software, include this License Header
2005.18 * Notice in each file and include the License file at
2005.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2005.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2005.21 * particular file as subject to the "Classpath" exception as provided
2005.22 - * by Sun in the GPL Version 2 section of the License file that
2005.23 + * by Oracle in the GPL Version 2 section of the License file that
2005.24 * accompanied this code. If applicable, add the following below the
2005.25 * License Header, with the fields enclosed by brackets [] replaced by
2005.26 * your own identifying information:
2006.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingTargetNodeFactory.java Fri Jul 16 11:47:36 2010 -0400
2006.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingTargetNodeFactory.java Fri Jul 16 14:21:50 2010 -0400
2006.3 @@ -1,7 +1,10 @@
2006.4 /*
2006.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2006.6 *
2006.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2006.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2006.9 + *
2006.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2006.11 + * Other names may be trademarks of their respective owners.
2006.12 *
2006.13 * The contents of this file are subject to the terms of either the GNU
2006.14 * General Public License Version 2 only ("GPL") or the Common
2006.15 @@ -13,9 +16,9 @@
2006.16 * specific language governing permissions and limitations under the
2006.17 * License. When distributing the software, include this License Header
2006.18 * Notice in each file and include the License file at
2006.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2006.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2006.21 * particular file as subject to the "Classpath" exception as provided
2006.22 - * by Sun in the GPL Version 2 section of the License file that
2006.23 + * by Oracle in the GPL Version 2 section of the License file that
2006.24 * accompanied this code. If applicable, add the following below the
2006.25 * License Header, with the fields enclosed by brackets [] replaced by
2006.26 * your own identifying information:
2007.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingTargetPanel.java Fri Jul 16 11:47:36 2010 -0400
2007.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/BindingTargetPanel.java Fri Jul 16 14:21:50 2010 -0400
2007.3 @@ -1,7 +1,10 @@
2007.4 /*
2007.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2007.6 *
2007.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2007.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2007.9 + *
2007.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2007.11 + * Other names may be trademarks of their respective owners.
2007.12 *
2007.13 * The contents of this file are subject to the terms of either the GNU
2007.14 * General Public License Version 2 only ("GPL") or the Common
2007.15 @@ -13,9 +16,9 @@
2007.16 * specific language governing permissions and limitations under the
2007.17 * License. When distributing the software, include this License Header
2007.18 * Notice in each file and include the License file at
2007.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2007.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2007.21 * particular file as subject to the "Classpath" exception as provided
2007.22 - * by Sun in the GPL Version 2 section of the License file that
2007.23 + * by Oracle in the GPL Version 2 section of the License file that
2007.24 * accompanied this code. If applicable, add the following below the
2007.25 * License Header, with the fields enclosed by brackets [] replaced by
2007.26 * your own identifying information:
2008.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2008.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2008.3 @@ -1,6 +1,9 @@
2008.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2008.5 #
2008.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2008.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2008.8 +#
2008.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2008.10 +# Other names may be trademarks of their respective owners.
2008.11 #
2008.12 # The contents of this file are subject to the terms of either the GNU
2008.13 # General Public License Version 2 only ("GPL") or the Common
2008.14 @@ -12,9 +15,9 @@
2008.15 # specific language governing permissions and limitations under the
2008.16 # License. When distributing the software, include this License Header
2008.17 # Notice in each file and include the License file at
2008.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2008.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2008.20 # particular file as subject to the "Classpath" exception as provided
2008.21 -# by Sun in the GPL Version 2 section of the License file that
2008.22 +# by Oracle in the GPL Version 2 section of the License file that
2008.23 # accompanied this code. If applicable, add the following below the
2008.24 # License Header, with the fields enclosed by brackets [] replaced by
2008.25 # your own identifying information:
2009.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/PropertyBindingHelper.java Fri Jul 16 11:47:36 2010 -0400
2009.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/PropertyBindingHelper.java Fri Jul 16 14:21:50 2010 -0400
2009.3 @@ -1,7 +1,10 @@
2009.4 /*
2009.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2009.6 *
2009.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2009.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2009.9 + *
2009.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2009.11 + * Other names may be trademarks of their respective owners.
2009.12 *
2009.13 * The contents of this file are subject to the terms of either the GNU
2009.14 * General Public License Version 2 only ("GPL") or the Common
2009.15 @@ -13,9 +16,9 @@
2009.16 * specific language governing permissions and limitations under the
2009.17 * License. When distributing the software, include this License Header
2009.18 * Notice in each file and include the License file at
2009.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2009.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2009.21 * particular file as subject to the "Classpath" exception as provided
2009.22 - * by Sun in the GPL Version 2 section of the License file that
2009.23 + * by Oracle in the GPL Version 2 section of the License file that
2009.24 * accompanied this code. If applicable, add the following below the
2009.25 * License Header, with the fields enclosed by brackets [] replaced by
2009.26 * your own identifying information:
2010.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/PropertyBindingPanel.java Fri Jul 16 11:47:36 2010 -0400
2010.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/PropertyBindingPanel.java Fri Jul 16 14:21:50 2010 -0400
2010.3 @@ -1,7 +1,10 @@
2010.4 /*
2010.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2010.6 *
2010.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2010.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2010.9 + *
2010.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2010.11 + * Other names may be trademarks of their respective owners.
2010.12 *
2010.13 * The contents of this file are subject to the terms of either the GNU
2010.14 * General Public License Version 2 only ("GPL") or the Common
2010.15 @@ -13,9 +16,9 @@
2010.16 * specific language governing permissions and limitations under the
2010.17 * License. When distributing the software, include this License Header
2010.18 * Notice in each file and include the License file at
2010.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2010.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2010.21 * particular file as subject to the "Classpath" exception as provided
2010.22 - * by Sun in the GPL Version 2 section of the License file that
2010.23 + * by Oracle in the GPL Version 2 section of the License file that
2010.24 * accompanied this code. If applicable, add the following below the
2010.25 * License Header, with the fields enclosed by brackets [] replaced by
2010.26 * your own identifying information:
2011.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/PropertyBindingsCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2011.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/PropertyBindingsCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2011.3 @@ -1,7 +1,10 @@
2011.4 /*
2011.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2011.6 *
2011.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2011.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2011.9 + *
2011.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2011.11 + * Other names may be trademarks of their respective owners.
2011.12 *
2011.13 * The contents of this file are subject to the terms of either the GNU
2011.14 * General Public License Version 2 only ("GPL") or the Common
2011.15 @@ -13,9 +16,9 @@
2011.16 * specific language governing permissions and limitations under the
2011.17 * License. When distributing the software, include this License Header
2011.18 * Notice in each file and include the License file at
2011.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2011.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2011.21 * particular file as subject to the "Classpath" exception as provided
2011.22 - * by Sun in the GPL Version 2 section of the License file that
2011.23 + * by Oracle in the GPL Version 2 section of the License file that
2011.24 * accompanied this code. If applicable, add the following below the
2011.25 * License Header, with the fields enclosed by brackets [] replaced by
2011.26 * your own identifying information:
2012.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/ValueBindingAttributePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2012.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/ValueBindingAttributePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2012.3 @@ -1,7 +1,10 @@
2012.4 /*
2012.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2012.6 *
2012.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2012.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2012.9 + *
2012.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2012.11 + * Other names may be trademarks of their respective owners.
2012.12 *
2012.13 * The contents of this file are subject to the terms of either the GNU
2012.14 * General Public License Version 2 only ("GPL") or the Common
2012.15 @@ -13,9 +16,9 @@
2012.16 * specific language governing permissions and limitations under the
2012.17 * License. When distributing the software, include this License Header
2012.18 * Notice in each file and include the License file at
2012.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2012.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2012.21 * particular file as subject to the "Classpath" exception as provided
2012.22 - * by Sun in the GPL Version 2 section of the License file that
2012.23 + * by Oracle in the GPL Version 2 section of the License file that
2012.24 * accompanied this code. If applicable, add the following below the
2012.25 * License Header, with the fields enclosed by brackets [] replaced by
2012.26 * your own identifying information:
2013.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/ValueBindingPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2013.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/ValueBindingPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2013.3 @@ -1,7 +1,10 @@
2013.4 /*
2013.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2013.6 *
2013.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2013.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2013.9 + *
2013.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2013.11 + * Other names may be trademarks of their respective owners.
2013.12 *
2013.13 * The contents of this file are subject to the terms of either the GNU
2013.14 * General Public License Version 2 only ("GPL") or the Common
2013.15 @@ -13,9 +16,9 @@
2013.16 * specific language governing permissions and limitations under the
2013.17 * License. When distributing the software, include this License Header
2013.18 * Notice in each file and include the License file at
2013.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2013.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2013.21 * particular file as subject to the "Classpath" exception as provided
2013.22 - * by Sun in the GPL Version 2 section of the License file that
2013.23 + * by Oracle in the GPL Version 2 section of the License file that
2013.24 * accompanied this code. If applicable, add the following below the
2013.25 * License Header, with the fields enclosed by brackets [] replaced by
2013.26 * your own identifying information:
2014.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/AddDataProviderDialog.java Fri Jul 16 11:47:36 2010 -0400
2014.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/AddDataProviderDialog.java Fri Jul 16 14:21:50 2010 -0400
2014.3 @@ -1,7 +1,10 @@
2014.4 /*
2014.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2014.6 *
2014.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2014.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2014.9 + *
2014.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2014.11 + * Other names may be trademarks of their respective owners.
2014.12 *
2014.13 * The contents of this file are subject to the terms of either the GNU
2014.14 * General Public License Version 2 only ("GPL") or the Common
2014.15 @@ -13,9 +16,9 @@
2014.16 * specific language governing permissions and limitations under the
2014.17 * License. When distributing the software, include this License Header
2014.18 * Notice in each file and include the License file at
2014.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2014.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2014.21 * particular file as subject to the "Classpath" exception as provided
2014.22 - * by Sun in the GPL Version 2 section of the License file that
2014.23 + * by Oracle in the GPL Version 2 section of the License file that
2014.24 * accompanied this code. If applicable, add the following below the
2014.25 * License Header, with the fields enclosed by brackets [] replaced by
2014.26 * your own identifying information:
2015.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/BindOptionsToDataProviderPanel.java Fri Jul 16 11:47:36 2010 -0400
2015.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/BindOptionsToDataProviderPanel.java Fri Jul 16 14:21:50 2010 -0400
2015.3 @@ -1,7 +1,10 @@
2015.4 /*
2015.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2015.6 *
2015.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2015.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2015.9 + *
2015.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2015.11 + * Other names may be trademarks of their respective owners.
2015.12 *
2015.13 * The contents of this file are subject to the terms of either the GNU
2015.14 * General Public License Version 2 only ("GPL") or the Common
2015.15 @@ -13,9 +16,9 @@
2015.16 * specific language governing permissions and limitations under the
2015.17 * License. When distributing the software, include this License Header
2015.18 * Notice in each file and include the License file at
2015.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2015.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2015.21 * particular file as subject to the "Classpath" exception as provided
2015.22 - * by Sun in the GPL Version 2 section of the License file that
2015.23 + * by Oracle in the GPL Version 2 section of the License file that
2015.24 * accompanied this code. If applicable, add the following below the
2015.25 * License Header, with the fields enclosed by brackets [] replaced by
2015.26 * your own identifying information:
2016.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/BindSelectItemsToDataProviderPanel.java Fri Jul 16 11:47:36 2010 -0400
2016.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/BindSelectItemsToDataProviderPanel.java Fri Jul 16 14:21:50 2010 -0400
2016.3 @@ -1,7 +1,10 @@
2016.4 /*
2016.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2016.6 *
2016.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2016.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2016.9 + *
2016.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2016.11 + * Other names may be trademarks of their respective owners.
2016.12 *
2016.13 * The contents of this file are subject to the terms of either the GNU
2016.14 * General Public License Version 2 only ("GPL") or the Common
2016.15 @@ -13,9 +16,9 @@
2016.16 * specific language governing permissions and limitations under the
2016.17 * License. When distributing the software, include this License Header
2016.18 * Notice in each file and include the License file at
2016.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2016.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2016.21 * particular file as subject to the "Classpath" exception as provided
2016.22 - * by Sun in the GPL Version 2 section of the License file that
2016.23 + * by Oracle in the GPL Version 2 section of the License file that
2016.24 * accompanied this code. If applicable, add the following below the
2016.25 * License Header, with the fields enclosed by brackets [] replaced by
2016.26 * your own identifying information:
2017.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/BindValueToDataProviderPanel.java Fri Jul 16 11:47:36 2010 -0400
2017.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/BindValueToDataProviderPanel.java Fri Jul 16 14:21:50 2010 -0400
2017.3 @@ -1,7 +1,10 @@
2017.4 /*
2017.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2017.6 *
2017.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2017.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2017.9 + *
2017.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2017.11 + * Other names may be trademarks of their respective owners.
2017.12 *
2017.13 * The contents of this file are subject to the terms of either the GNU
2017.14 * General Public License Version 2 only ("GPL") or the Common
2017.15 @@ -13,9 +16,9 @@
2017.16 * specific language governing permissions and limitations under the
2017.17 * License. When distributing the software, include this License Header
2017.18 * Notice in each file and include the License file at
2017.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2017.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2017.21 * particular file as subject to the "Classpath" exception as provided
2017.22 - * by Sun in the GPL Version 2 section of the License file that
2017.23 + * by Oracle in the GPL Version 2 section of the License file that
2017.24 * accompanied this code. If applicable, add the following below the
2017.25 * License Header, with the fields enclosed by brackets [] replaced by
2017.26 * your own identifying information:
2018.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/BindValueToObjectPanel.java Fri Jul 16 11:47:36 2010 -0400
2018.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/BindValueToObjectPanel.java Fri Jul 16 14:21:50 2010 -0400
2018.3 @@ -1,7 +1,10 @@
2018.4 /*
2018.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2018.6 *
2018.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2018.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2018.9 + *
2018.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2018.11 + * Other names may be trademarks of their respective owners.
2018.12 *
2018.13 * The contents of this file are subject to the terms of either the GNU
2018.14 * General Public License Version 2 only ("GPL") or the Common
2018.15 @@ -13,9 +16,9 @@
2018.16 * specific language governing permissions and limitations under the
2018.17 * License. When distributing the software, include this License Header
2018.18 * Notice in each file and include the License file at
2018.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2018.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2018.21 * particular file as subject to the "Classpath" exception as provided
2018.22 - * by Sun in the GPL Version 2 section of the License file that
2018.23 + * by Oracle in the GPL Version 2 section of the License file that
2018.24 * accompanied this code. If applicable, add the following below the
2018.25 * License Header, with the fields enclosed by brackets [] replaced by
2018.26 * your own identifying information:
2019.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2019.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2019.3 @@ -1,6 +1,9 @@
2019.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2019.5 #
2019.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2019.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2019.8 +#
2019.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2019.10 +# Other names may be trademarks of their respective owners.
2019.11 #
2019.12 # The contents of this file are subject to the terms of either the GNU
2019.13 # General Public License Version 2 only ("GPL") or the Common
2019.14 @@ -12,9 +15,9 @@
2019.15 # specific language governing permissions and limitations under the
2019.16 # License. When distributing the software, include this License Header
2019.17 # Notice in each file and include the License file at
2019.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2019.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2019.20 # particular file as subject to the "Classpath" exception as provided
2019.21 -# by Sun in the GPL Version 2 section of the License file that
2019.22 +# by Oracle in the GPL Version 2 section of the License file that
2019.23 # accompanied this code. If applicable, add the following below the
2019.24 # License Header, with the fields enclosed by brackets [] replaced by
2019.25 # your own identifying information:
2020.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataBindingCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2020.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataBindingCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2020.3 @@ -1,7 +1,10 @@
2020.4 /*
2020.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2020.6 *
2020.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2020.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2020.9 + *
2020.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2020.11 + * Other names may be trademarks of their respective owners.
2020.12 *
2020.13 * The contents of this file are subject to the terms of either the GNU
2020.14 * General Public License Version 2 only ("GPL") or the Common
2020.15 @@ -13,9 +16,9 @@
2020.16 * specific language governing permissions and limitations under the
2020.17 * License. When distributing the software, include this License Header
2020.18 * Notice in each file and include the License file at
2020.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2020.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2020.21 * particular file as subject to the "Classpath" exception as provided
2020.22 - * by Sun in the GPL Version 2 section of the License file that
2020.23 + * by Oracle in the GPL Version 2 section of the License file that
2020.24 * accompanied this code. If applicable, add the following below the
2020.25 * License Header, with the fields enclosed by brackets [] replaced by
2020.26 * your own identifying information:
2021.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataBindingHelper.java Fri Jul 16 11:47:36 2010 -0400
2021.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataBindingHelper.java Fri Jul 16 14:21:50 2010 -0400
2021.3 @@ -1,7 +1,10 @@
2021.4 /*
2021.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2021.6 *
2021.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2021.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2021.9 + *
2021.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2021.11 + * Other names may be trademarks of their respective owners.
2021.12 *
2021.13 * The contents of this file are subject to the terms of either the GNU
2021.14 * General Public License Version 2 only ("GPL") or the Common
2021.15 @@ -13,9 +16,9 @@
2021.16 * specific language governing permissions and limitations under the
2021.17 * License. When distributing the software, include this License Header
2021.18 * Notice in each file and include the License file at
2021.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2021.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2021.21 * particular file as subject to the "Classpath" exception as provided
2021.22 - * by Sun in the GPL Version 2 section of the License file that
2021.23 + * by Oracle in the GPL Version 2 section of the License file that
2021.24 * accompanied this code. If applicable, add the following below the
2021.25 * License Header, with the fields enclosed by brackets [] replaced by
2021.26 * your own identifying information:
2022.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataBindingHelperBridge.java Fri Jul 16 11:47:36 2010 -0400
2022.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataBindingHelperBridge.java Fri Jul 16 14:21:50 2010 -0400
2022.3 @@ -1,7 +1,10 @@
2022.4 /*
2022.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2022.6 *
2022.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2022.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2022.9 + *
2022.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2022.11 + * Other names may be trademarks of their respective owners.
2022.12 *
2022.13 * The contents of this file are subject to the terms of either the GNU
2022.14 * General Public License Version 2 only ("GPL") or the Common
2022.15 @@ -13,9 +16,9 @@
2022.16 * specific language governing permissions and limitations under the
2022.17 * License. When distributing the software, include this License Header
2022.18 * Notice in each file and include the License file at
2022.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2022.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2022.21 * particular file as subject to the "Classpath" exception as provided
2022.22 - * by Sun in the GPL Version 2 section of the License file that
2022.23 + * by Oracle in the GPL Version 2 section of the License file that
2022.24 * accompanied this code. If applicable, add the following below the
2022.25 * License Header, with the fields enclosed by brackets [] replaced by
2022.26 * your own identifying information:
2023.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataBindingPanel.java Fri Jul 16 11:47:36 2010 -0400
2023.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataBindingPanel.java Fri Jul 16 14:21:50 2010 -0400
2023.3 @@ -1,7 +1,10 @@
2023.4 /*
2023.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2023.6 *
2023.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2023.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2023.9 + *
2023.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2023.11 + * Other names may be trademarks of their respective owners.
2023.12 *
2023.13 * The contents of this file are subject to the terms of either the GNU
2023.14 * General Public License Version 2 only ("GPL") or the Common
2023.15 @@ -13,9 +16,9 @@
2023.16 * specific language governing permissions and limitations under the
2023.17 * License. When distributing the software, include this License Header
2023.18 * Notice in each file and include the License file at
2023.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2023.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2023.21 * particular file as subject to the "Classpath" exception as provided
2023.22 - * by Sun in the GPL Version 2 section of the License file that
2023.23 + * by Oracle in the GPL Version 2 section of the License file that
2023.24 * accompanied this code. If applicable, add the following below the
2023.25 * License Header, with the fields enclosed by brackets [] replaced by
2023.26 * your own identifying information:
2024.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataProviderExplorerPanel.java Fri Jul 16 11:47:36 2010 -0400
2024.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/DataProviderExplorerPanel.java Fri Jul 16 14:21:50 2010 -0400
2024.3 @@ -1,7 +1,10 @@
2024.4 /*
2024.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2024.6 *
2024.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2024.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2024.9 + *
2024.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2024.11 + * Other names may be trademarks of their respective owners.
2024.12 *
2024.13 * The contents of this file are subject to the terms of either the GNU
2024.14 * General Public License Version 2 only ("GPL") or the Common
2024.15 @@ -13,9 +16,9 @@
2024.16 * specific language governing permissions and limitations under the
2024.17 * License. When distributing the software, include this License Header
2024.18 * Notice in each file and include the License file at
2024.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2024.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2024.21 * particular file as subject to the "Classpath" exception as provided
2024.22 - * by Sun in the GPL Version 2 section of the License file that
2024.23 + * by Oracle in the GPL Version 2 section of the License file that
2024.24 * accompanied this code. If applicable, add the following below the
2024.25 * License Header, with the fields enclosed by brackets [] replaced by
2024.26 * your own identifying information:
2025.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/TabbedDataBindingPanel.java Fri Jul 16 11:47:36 2010 -0400
2025.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/data/TabbedDataBindingPanel.java Fri Jul 16 14:21:50 2010 -0400
2025.3 @@ -1,7 +1,10 @@
2025.4 /*
2025.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2025.6 *
2025.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2025.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2025.9 + *
2025.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2025.11 + * Other names may be trademarks of their respective owners.
2025.12 *
2025.13 * The contents of this file are subject to the terms of either the GNU
2025.14 * General Public License Version 2 only ("GPL") or the Common
2025.15 @@ -13,9 +16,9 @@
2025.16 * specific language governing permissions and limitations under the
2025.17 * License. When distributing the software, include this License Header
2025.18 * Notice in each file and include the License file at
2025.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2025.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2025.21 * particular file as subject to the "Classpath" exception as provided
2025.22 - * by Sun in the GPL Version 2 section of the License file that
2025.23 + * by Oracle in the GPL Version 2 section of the License file that
2025.24 * accompanied this code. If applicable, add the following below the
2025.25 * License Header, with the fields enclosed by brackets [] replaced by
2025.26 * your own identifying information:
2026.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2026.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2026.3 @@ -1,6 +1,9 @@
2026.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2026.5 #
2026.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2026.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2026.8 +#
2026.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2026.10 +# Other names may be trademarks of their respective owners.
2026.11 #
2026.12 # The contents of this file are subject to the terms of either the GNU
2026.13 # General Public License Version 2 only ("GPL") or the Common
2026.14 @@ -12,9 +15,9 @@
2026.15 # specific language governing permissions and limitations under the
2026.16 # License. When distributing the software, include this License Header
2026.17 # Notice in each file and include the License file at
2026.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2026.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2026.20 # particular file as subject to the "Classpath" exception as provided
2026.21 -# by Sun in the GPL Version 2 section of the License file that
2026.22 +# by Oracle in the GPL Version 2 section of the License file that
2026.23 # accompanied this code. If applicable, add the following below the
2026.24 # License Header, with the fields enclosed by brackets [] replaced by
2026.25 # your own identifying information:
2027.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/ContextTargetNode.java Fri Jul 16 11:47:36 2010 -0400
2027.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/ContextTargetNode.java Fri Jul 16 14:21:50 2010 -0400
2027.3 @@ -1,7 +1,10 @@
2027.4 /*
2027.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2027.6 *
2027.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2027.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2027.9 + *
2027.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2027.11 + * Other names may be trademarks of their respective owners.
2027.12 *
2027.13 * The contents of this file are subject to the terms of either the GNU
2027.14 * General Public License Version 2 only ("GPL") or the Common
2027.15 @@ -13,9 +16,9 @@
2027.16 * specific language governing permissions and limitations under the
2027.17 * License. When distributing the software, include this License Header
2027.18 * Notice in each file and include the License file at
2027.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2027.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2027.21 * particular file as subject to the "Classpath" exception as provided
2027.22 - * by Sun in the GPL Version 2 section of the License file that
2027.23 + * by Oracle in the GPL Version 2 section of the License file that
2027.24 * accompanied this code. If applicable, add the following below the
2027.25 * License Header, with the fields enclosed by brackets [] replaced by
2027.26 * your own identifying information:
2028.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/DataProviderTargetNodeFactory.java Fri Jul 16 11:47:36 2010 -0400
2028.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/DataProviderTargetNodeFactory.java Fri Jul 16 14:21:50 2010 -0400
2028.3 @@ -1,7 +1,10 @@
2028.4 /*
2028.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2028.6 *
2028.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2028.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2028.9 + *
2028.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2028.11 + * Other names may be trademarks of their respective owners.
2028.12 *
2028.13 * The contents of this file are subject to the terms of either the GNU
2028.14 * General Public License Version 2 only ("GPL") or the Common
2028.15 @@ -13,9 +16,9 @@
2028.16 * specific language governing permissions and limitations under the
2028.17 * License. When distributing the software, include this License Header
2028.18 * Notice in each file and include the License file at
2028.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2028.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2028.21 * particular file as subject to the "Classpath" exception as provided
2028.22 - * by Sun in the GPL Version 2 section of the License file that
2028.23 + * by Oracle in the GPL Version 2 section of the License file that
2028.24 * accompanied this code. If applicable, add the following below the
2028.25 * License Header, with the fields enclosed by brackets [] replaced by
2028.26 * your own identifying information:
2029.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/MapTargetNodeFactory.java Fri Jul 16 11:47:36 2010 -0400
2029.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/MapTargetNodeFactory.java Fri Jul 16 14:21:50 2010 -0400
2029.3 @@ -1,7 +1,10 @@
2029.4 /*
2029.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2029.6 *
2029.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2029.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2029.9 + *
2029.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2029.11 + * Other names may be trademarks of their respective owners.
2029.12 *
2029.13 * The contents of this file are subject to the terms of either the GNU
2029.14 * General Public License Version 2 only ("GPL") or the Common
2029.15 @@ -13,9 +16,9 @@
2029.16 * specific language governing permissions and limitations under the
2029.17 * License. When distributing the software, include this License Header
2029.18 * Notice in each file and include the License file at
2029.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2029.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2029.21 * particular file as subject to the "Classpath" exception as provided
2029.22 - * by Sun in the GPL Version 2 section of the License file that
2029.23 + * by Oracle in the GPL Version 2 section of the License file that
2029.24 * accompanied this code. If applicable, add the following below the
2029.25 * License Header, with the fields enclosed by brackets [] replaced by
2029.26 * your own identifying information:
2030.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/PropertyTargetNode.java Fri Jul 16 11:47:36 2010 -0400
2030.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/PropertyTargetNode.java Fri Jul 16 14:21:50 2010 -0400
2030.3 @@ -1,7 +1,10 @@
2030.4 /*
2030.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2030.6 *
2030.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2030.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2030.9 + *
2030.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2030.11 + * Other names may be trademarks of their respective owners.
2030.12 *
2030.13 * The contents of this file are subject to the terms of either the GNU
2030.14 * General Public License Version 2 only ("GPL") or the Common
2030.15 @@ -13,9 +16,9 @@
2030.16 * specific language governing permissions and limitations under the
2030.17 * License. When distributing the software, include this License Header
2030.18 * Notice in each file and include the License file at
2030.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2030.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2030.21 * particular file as subject to the "Classpath" exception as provided
2030.22 - * by Sun in the GPL Version 2 section of the License file that
2030.23 + * by Oracle in the GPL Version 2 section of the License file that
2030.24 * accompanied this code. If applicable, add the following below the
2030.25 * License Header, with the fields enclosed by brackets [] replaced by
2030.26 * your own identifying information:
2031.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/ResultSetTargetNodeFactory.java Fri Jul 16 11:47:36 2010 -0400
2031.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/ResultSetTargetNodeFactory.java Fri Jul 16 14:21:50 2010 -0400
2031.3 @@ -1,7 +1,10 @@
2031.4 /*
2031.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2031.6 *
2031.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2031.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2031.9 + *
2031.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2031.11 + * Other names may be trademarks of their respective owners.
2031.12 *
2031.13 * The contents of this file are subject to the terms of either the GNU
2031.14 * General Public License Version 2 only ("GPL") or the Common
2031.15 @@ -13,9 +16,9 @@
2031.16 * specific language governing permissions and limitations under the
2031.17 * License. When distributing the software, include this License Header
2031.18 * Notice in each file and include the License file at
2031.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2031.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2031.21 * particular file as subject to the "Classpath" exception as provided
2031.22 - * by Sun in the GPL Version 2 section of the License file that
2031.23 + * by Oracle in the GPL Version 2 section of the License file that
2031.24 * accompanied this code. If applicable, add the following below the
2031.25 * License Header, with the fields enclosed by brackets [] replaced by
2031.26 * your own identifying information:
2032.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/UIDataVarNode.java Fri Jul 16 11:47:36 2010 -0400
2032.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/binding/nodes/UIDataVarNode.java Fri Jul 16 14:21:50 2010 -0400
2032.3 @@ -1,7 +1,10 @@
2032.4 /*
2032.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2032.6 *
2032.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2032.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2032.9 + *
2032.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2032.11 + * Other names may be trademarks of their respective owners.
2032.12 *
2032.13 * The contents of this file are subject to the terms of either the GNU
2032.14 * General Public License Version 2 only ("GPL") or the Common
2032.15 @@ -13,9 +16,9 @@
2032.16 * specific language governing permissions and limitations under the
2032.17 * License. When distributing the software, include this License Header
2032.18 * Notice in each file and include the License file at
2032.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2032.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2032.21 * particular file as subject to the "Classpath" exception as provided
2032.22 - * by Sun in the GPL Version 2 section of the License file that
2032.23 + * by Oracle in the GPL Version 2 section of the License file that
2032.24 * accompanied this code. If applicable, add the following below the
2032.25 * License Header, with the fields enclosed by brackets [] replaced by
2032.26 * your own identifying information:
2033.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BackgroundImageUrlDialog.java Fri Jul 16 11:47:36 2010 -0400
2033.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BackgroundImageUrlDialog.java Fri Jul 16 14:21:50 2010 -0400
2033.3 @@ -1,7 +1,10 @@
2033.4 /*
2033.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2033.6 *
2033.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2033.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2033.9 + *
2033.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2033.11 + * Other names may be trademarks of their respective owners.
2033.12 *
2033.13 * The contents of this file are subject to the terms of either the GNU
2033.14 * General Public License Version 2 only ("GPL") or the Common
2033.15 @@ -13,9 +16,9 @@
2033.16 * specific language governing permissions and limitations under the
2033.17 * License. When distributing the software, include this License Header
2033.18 * Notice in each file and include the License file at
2033.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2033.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2033.21 * particular file as subject to the "Classpath" exception as provided
2033.22 - * by Sun in the GPL Version 2 section of the License file that
2033.23 + * by Oracle in the GPL Version 2 section of the License file that
2033.24 * accompanied this code. If applicable, add the following below the
2033.25 * License Header, with the fields enclosed by brackets [] replaced by
2033.26 * your own identifying information:
2034.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BackgroundStyleEditor.java Fri Jul 16 11:47:36 2010 -0400
2034.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BackgroundStyleEditor.java Fri Jul 16 14:21:50 2010 -0400
2034.3 @@ -1,7 +1,10 @@
2034.4 /*
2034.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2034.6 *
2034.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2034.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2034.9 + *
2034.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2034.11 + * Other names may be trademarks of their respective owners.
2034.12 *
2034.13 * The contents of this file are subject to the terms of either the GNU
2034.14 * General Public License Version 2 only ("GPL") or the Common
2034.15 @@ -13,9 +16,9 @@
2034.16 * specific language governing permissions and limitations under the
2034.17 * License. When distributing the software, include this License Header
2034.18 * Notice in each file and include the License file at
2034.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2034.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2034.21 * particular file as subject to the "Classpath" exception as provided
2034.22 - * by Sun in the GPL Version 2 section of the License file that
2034.23 + * by Oracle in the GPL Version 2 section of the License file that
2034.24 * accompanied this code. If applicable, add the following below the
2034.25 * License Header, with the fields enclosed by brackets [] replaced by
2034.26 * your own identifying information:
2035.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BorderDataTable.java Fri Jul 16 11:47:36 2010 -0400
2035.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BorderDataTable.java Fri Jul 16 14:21:50 2010 -0400
2035.3 @@ -1,7 +1,10 @@
2035.4 /*
2035.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2035.6 *
2035.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2035.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2035.9 + *
2035.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2035.11 + * Other names may be trademarks of their respective owners.
2035.12 *
2035.13 * The contents of this file are subject to the terms of either the GNU
2035.14 * General Public License Version 2 only ("GPL") or the Common
2035.15 @@ -13,9 +16,9 @@
2035.16 * specific language governing permissions and limitations under the
2035.17 * License. When distributing the software, include this License Header
2035.18 * Notice in each file and include the License file at
2035.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2035.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2035.21 * particular file as subject to the "Classpath" exception as provided
2035.22 - * by Sun in the GPL Version 2 section of the License file that
2035.23 + * by Oracle in the GPL Version 2 section of the License file that
2035.24 * accompanied this code. If applicable, add the following below the
2035.25 * License Header, with the fields enclosed by brackets [] replaced by
2035.26 * your own identifying information:
2036.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BorderStyleEditor.java Fri Jul 16 11:47:36 2010 -0400
2036.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BorderStyleEditor.java Fri Jul 16 14:21:50 2010 -0400
2036.3 @@ -1,7 +1,10 @@
2036.4 /*
2036.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2036.6 *
2036.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2036.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2036.9 + *
2036.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2036.11 + * Other names may be trademarks of their respective owners.
2036.12 *
2036.13 * The contents of this file are subject to the terms of either the GNU
2036.14 * General Public License Version 2 only ("GPL") or the Common
2036.15 @@ -13,9 +16,9 @@
2036.16 * specific language governing permissions and limitations under the
2036.17 * License. When distributing the software, include this License Header
2036.18 * Notice in each file and include the License file at
2036.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2036.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2036.21 * particular file as subject to the "Classpath" exception as provided
2036.22 - * by Sun in the GPL Version 2 section of the License file that
2036.23 + * by Oracle in the GPL Version 2 section of the License file that
2036.24 * accompanied this code. If applicable, add the following below the
2036.25 * License Header, with the fields enclosed by brackets [] replaced by
2036.26 * your own identifying information:
2037.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BorderWidthField.java Fri Jul 16 11:47:36 2010 -0400
2037.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/BorderWidthField.java Fri Jul 16 14:21:50 2010 -0400
2037.3 @@ -1,7 +1,10 @@
2037.4 /*
2037.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2037.6 *
2037.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2037.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2037.9 + *
2037.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2037.11 + * Other names may be trademarks of their respective owners.
2037.12 *
2037.13 * The contents of this file are subject to the terms of either the GNU
2037.14 * General Public License Version 2 only ("GPL") or the Common
2037.15 @@ -13,9 +16,9 @@
2037.16 * specific language governing permissions and limitations under the
2037.17 * License. When distributing the software, include this License Header
2037.18 * Notice in each file and include the License file at
2037.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2037.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2037.21 * particular file as subject to the "Classpath" exception as provided
2037.22 - * by Sun in the GPL Version 2 section of the License file that
2037.23 + * by Oracle in the GPL Version 2 section of the License file that
2037.24 * accompanied this code. If applicable, add the following below the
2037.25 * License Header, with the fields enclosed by brackets [] replaced by
2037.26 * your own identifying information:
2038.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2038.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2038.3 @@ -1,6 +1,9 @@
2038.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2038.5 #
2038.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2038.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2038.8 +#
2038.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2038.10 +# Other names may be trademarks of their respective owners.
2038.11 #
2038.12 # The contents of this file are subject to the terms of either the GNU
2038.13 # General Public License Version 2 only ("GPL") or the Common
2038.14 @@ -12,9 +15,9 @@
2038.15 # specific language governing permissions and limitations under the
2038.16 # License. When distributing the software, include this License Header
2038.17 # Notice in each file and include the License file at
2038.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2038.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2038.20 # particular file as subject to the "Classpath" exception as provided
2038.21 -# by Sun in the GPL Version 2 section of the License file that
2038.22 +# by Oracle in the GPL Version 2 section of the License file that
2038.23 # accompanied this code. If applicable, add the following below the
2038.24 # License Header, with the fields enclosed by brackets [] replaced by
2038.25 # your own identifying information:
2039.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/ColorSelectionField.java Fri Jul 16 11:47:36 2010 -0400
2039.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/ColorSelectionField.java Fri Jul 16 14:21:50 2010 -0400
2039.3 @@ -1,7 +1,10 @@
2039.4 /*
2039.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2039.6 *
2039.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2039.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2039.9 + *
2039.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2039.11 + * Other names may be trademarks of their respective owners.
2039.12 *
2039.13 * The contents of this file are subject to the terms of either the GNU
2039.14 * General Public License Version 2 only ("GPL") or the Common
2039.15 @@ -13,9 +16,9 @@
2039.16 * specific language governing permissions and limitations under the
2039.17 * License. When distributing the software, include this License Header
2039.18 * Notice in each file and include the License file at
2039.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2039.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2039.21 * particular file as subject to the "Classpath" exception as provided
2039.22 - * by Sun in the GPL Version 2 section of the License file that
2039.23 + * by Oracle in the GPL Version 2 section of the License file that
2039.24 * accompanied this code. If applicable, add the following below the
2039.25 * License Header, with the fields enclosed by brackets [] replaced by
2039.26 * your own identifying information:
2040.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/CssStylePropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2040.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/CssStylePropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2040.3 @@ -1,7 +1,10 @@
2040.4 /*
2040.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2040.6 *
2040.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2040.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2040.9 + *
2040.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2040.11 + * Other names may be trademarks of their respective owners.
2040.12 *
2040.13 * The contents of this file are subject to the terms of either the GNU
2040.14 * General Public License Version 2 only ("GPL") or the Common
2040.15 @@ -13,9 +16,9 @@
2040.16 * specific language governing permissions and limitations under the
2040.17 * License. When distributing the software, include this License Header
2040.18 * Notice in each file and include the License file at
2040.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2040.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2040.21 * particular file as subject to the "Classpath" exception as provided
2040.22 - * by Sun in the GPL Version 2 section of the License file that
2040.23 + * by Oracle in the GPL Version 2 section of the License file that
2040.24 * accompanied this code. If applicable, add the following below the
2040.25 * License Header, with the fields enclosed by brackets [] replaced by
2040.26 * your own identifying information:
2041.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/FontFamilyEditorDialog.java Fri Jul 16 11:47:36 2010 -0400
2041.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/FontFamilyEditorDialog.java Fri Jul 16 14:21:50 2010 -0400
2041.3 @@ -1,7 +1,10 @@
2041.4 /*
2041.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2041.6 *
2041.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2041.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2041.9 + *
2041.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2041.11 + * Other names may be trademarks of their respective owners.
2041.12 *
2041.13 * The contents of this file are subject to the terms of either the GNU
2041.14 * General Public License Version 2 only ("GPL") or the Common
2041.15 @@ -13,9 +16,9 @@
2041.16 * specific language governing permissions and limitations under the
2041.17 * License. When distributing the software, include this License Header
2041.18 * Notice in each file and include the License file at
2041.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2041.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2041.21 * particular file as subject to the "Classpath" exception as provided
2041.22 - * by Sun in the GPL Version 2 section of the License file that
2041.23 + * by Oracle in the GPL Version 2 section of the License file that
2041.24 * accompanied this code. If applicable, add the following below the
2041.25 * License Header, with the fields enclosed by brackets [] replaced by
2041.26 * your own identifying information:
2042.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/FontStyleEditor.java Fri Jul 16 11:47:36 2010 -0400
2042.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/FontStyleEditor.java Fri Jul 16 14:21:50 2010 -0400
2042.3 @@ -1,7 +1,10 @@
2042.4 /*
2042.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2042.6 *
2042.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2042.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2042.9 + *
2042.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2042.11 + * Other names may be trademarks of their respective owners.
2042.12 *
2042.13 * The contents of this file are subject to the terms of either the GNU
2042.14 * General Public License Version 2 only ("GPL") or the Common
2042.15 @@ -13,9 +16,9 @@
2042.16 * specific language governing permissions and limitations under the
2042.17 * License. When distributing the software, include this License Header
2042.18 * Notice in each file and include the License file at
2042.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2042.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2042.21 * particular file as subject to the "Classpath" exception as provided
2042.22 - * by Sun in the GPL Version 2 section of the License file that
2042.23 + * by Oracle in the GPL Version 2 section of the License file that
2042.24 * accompanied this code. If applicable, add the following below the
2042.25 * License Header, with the fields enclosed by brackets [] replaced by
2042.26 * your own identifying information:
2043.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/ListStyleEditor.java Fri Jul 16 11:47:36 2010 -0400
2043.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/ListStyleEditor.java Fri Jul 16 14:21:50 2010 -0400
2043.3 @@ -1,7 +1,10 @@
2043.4 /*
2043.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2043.6 *
2043.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2043.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2043.9 + *
2043.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2043.11 + * Other names may be trademarks of their respective owners.
2043.12 *
2043.13 * The contents of this file are subject to the terms of either the GNU
2043.14 * General Public License Version 2 only ("GPL") or the Common
2043.15 @@ -13,9 +16,9 @@
2043.16 * specific language governing permissions and limitations under the
2043.17 * License. When distributing the software, include this License Header
2043.18 * Notice in each file and include the License file at
2043.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2043.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2043.21 * particular file as subject to the "Classpath" exception as provided
2043.22 - * by Sun in the GPL Version 2 section of the License file that
2043.23 + * by Oracle in the GPL Version 2 section of the License file that
2043.24 * accompanied this code. If applicable, add the following below the
2043.25 * License Header, with the fields enclosed by brackets [] replaced by
2043.26 * your own identifying information:
2044.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/MarginDataTable.java Fri Jul 16 11:47:36 2010 -0400
2044.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/MarginDataTable.java Fri Jul 16 14:21:50 2010 -0400
2044.3 @@ -1,7 +1,10 @@
2044.4 /*
2044.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2044.6 *
2044.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2044.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2044.9 + *
2044.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2044.11 + * Other names may be trademarks of their respective owners.
2044.12 *
2044.13 * The contents of this file are subject to the terms of either the GNU
2044.14 * General Public License Version 2 only ("GPL") or the Common
2044.15 @@ -13,9 +16,9 @@
2044.16 * specific language governing permissions and limitations under the
2044.17 * License. When distributing the software, include this License Header
2044.18 * Notice in each file and include the License file at
2044.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2044.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2044.21 * particular file as subject to the "Classpath" exception as provided
2044.22 - * by Sun in the GPL Version 2 section of the License file that
2044.23 + * by Oracle in the GPL Version 2 section of the License file that
2044.24 * accompanied this code. If applicable, add the following below the
2044.25 * License Header, with the fields enclosed by brackets [] replaced by
2044.26 * your own identifying information:
2045.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/MarginStyleEditor.java Fri Jul 16 11:47:36 2010 -0400
2045.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/MarginStyleEditor.java Fri Jul 16 14:21:50 2010 -0400
2045.3 @@ -1,7 +1,10 @@
2045.4 /*
2045.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2045.6 *
2045.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2045.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2045.9 + *
2045.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2045.11 + * Other names may be trademarks of their respective owners.
2045.12 *
2045.13 * The contents of this file are subject to the terms of either the GNU
2045.14 * General Public License Version 2 only ("GPL") or the Common
2045.15 @@ -13,9 +16,9 @@
2045.16 * specific language governing permissions and limitations under the
2045.17 * License. When distributing the software, include this License Header
2045.18 * Notice in each file and include the License file at
2045.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2045.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2045.21 * particular file as subject to the "Classpath" exception as provided
2045.22 - * by Sun in the GPL Version 2 section of the License file that
2045.23 + * by Oracle in the GPL Version 2 section of the License file that
2045.24 * accompanied this code. If applicable, add the following below the
2045.25 * License Header, with the fields enclosed by brackets [] replaced by
2045.26 * your own identifying information:
2046.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/MarginWidthField.java Fri Jul 16 11:47:36 2010 -0400
2046.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/MarginWidthField.java Fri Jul 16 14:21:50 2010 -0400
2046.3 @@ -1,7 +1,10 @@
2046.4 /*
2046.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2046.6 *
2046.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2046.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2046.9 + *
2046.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2046.11 + * Other names may be trademarks of their respective owners.
2046.12 *
2046.13 * The contents of this file are subject to the terms of either the GNU
2046.14 * General Public License Version 2 only ("GPL") or the Common
2046.15 @@ -13,9 +16,9 @@
2046.16 * specific language governing permissions and limitations under the
2046.17 * License. When distributing the software, include this License Header
2046.18 * Notice in each file and include the License file at
2046.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2046.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2046.21 * particular file as subject to the "Classpath" exception as provided
2046.22 - * by Sun in the GPL Version 2 section of the License file that
2046.23 + * by Oracle in the GPL Version 2 section of the License file that
2046.24 * accompanied this code. If applicable, add the following below the
2046.25 * License Header, with the fields enclosed by brackets [] replaced by
2046.26 * your own identifying information:
2047.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/OtherStyleEditor.java Fri Jul 16 11:47:36 2010 -0400
2047.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/OtherStyleEditor.java Fri Jul 16 14:21:50 2010 -0400
2047.3 @@ -1,7 +1,10 @@
2047.4 /*
2047.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2047.6 *
2047.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2047.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2047.9 + *
2047.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2047.11 + * Other names may be trademarks of their respective owners.
2047.12 *
2047.13 * The contents of this file are subject to the terms of either the GNU
2047.14 * General Public License Version 2 only ("GPL") or the Common
2047.15 @@ -13,9 +16,9 @@
2047.16 * specific language governing permissions and limitations under the
2047.17 * License. When distributing the software, include this License Header
2047.18 * Notice in each file and include the License file at
2047.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2047.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2047.21 * particular file as subject to the "Classpath" exception as provided
2047.22 - * by Sun in the GPL Version 2 section of the License file that
2047.23 + * by Oracle in the GPL Version 2 section of the License file that
2047.24 * accompanied this code. If applicable, add the following below the
2047.25 * License Header, with the fields enclosed by brackets [] replaced by
2047.26 * your own identifying information:
2048.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/PaddingWidthField.java Fri Jul 16 11:47:36 2010 -0400
2048.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/PaddingWidthField.java Fri Jul 16 14:21:50 2010 -0400
2048.3 @@ -1,7 +1,10 @@
2048.4 /*
2048.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2048.6 *
2048.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2048.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2048.9 + *
2048.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2048.11 + * Other names may be trademarks of their respective owners.
2048.12 *
2048.13 * The contents of this file are subject to the terms of either the GNU
2048.14 * General Public License Version 2 only ("GPL") or the Common
2048.15 @@ -13,9 +16,9 @@
2048.16 * specific language governing permissions and limitations under the
2048.17 * License. When distributing the software, include this License Header
2048.18 * Notice in each file and include the License file at
2048.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2048.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2048.21 * particular file as subject to the "Classpath" exception as provided
2048.22 - * by Sun in the GPL Version 2 section of the License file that
2048.23 + * by Oracle in the GPL Version 2 section of the License file that
2048.24 * accompanied this code. If applicable, add the following below the
2048.25 * License Header, with the fields enclosed by brackets [] replaced by
2048.26 * your own identifying information:
2049.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/PositionStyleEditor.java Fri Jul 16 11:47:36 2010 -0400
2049.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/PositionStyleEditor.java Fri Jul 16 14:21:50 2010 -0400
2049.3 @@ -1,7 +1,10 @@
2049.4 /*
2049.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2049.6 *
2049.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2049.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2049.9 + *
2049.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2049.11 + * Other names may be trademarks of their respective owners.
2049.12 *
2049.13 * The contents of this file are subject to the terms of either the GNU
2049.14 * General Public License Version 2 only ("GPL") or the Common
2049.15 @@ -13,9 +16,9 @@
2049.16 * specific language governing permissions and limitations under the
2049.17 * License. When distributing the software, include this License Header
2049.18 * Notice in each file and include the License file at
2049.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2049.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2049.21 * particular file as subject to the "Classpath" exception as provided
2049.22 - * by Sun in the GPL Version 2 section of the License file that
2049.23 + * by Oracle in the GPL Version 2 section of the License file that
2049.24 * accompanied this code. If applicable, add the following below the
2049.25 * License Header, with the fields enclosed by brackets [] replaced by
2049.26 * your own identifying information:
2050.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/StyleBuilderDialog.java Fri Jul 16 11:47:36 2010 -0400
2050.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/StyleBuilderDialog.java Fri Jul 16 14:21:50 2010 -0400
2050.3 @@ -1,7 +1,10 @@
2050.4 /*
2050.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2050.6 *
2050.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2050.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2050.9 + *
2050.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2050.11 + * Other names may be trademarks of their respective owners.
2050.12 *
2050.13 * The contents of this file are subject to the terms of either the GNU
2050.14 * General Public License Version 2 only ("GPL") or the Common
2050.15 @@ -13,9 +16,9 @@
2050.16 * specific language governing permissions and limitations under the
2050.17 * License. When distributing the software, include this License Header
2050.18 * Notice in each file and include the License file at
2050.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2050.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2050.21 * particular file as subject to the "Classpath" exception as provided
2050.22 - * by Sun in the GPL Version 2 section of the License file that
2050.23 + * by Oracle in the GPL Version 2 section of the License file that
2050.24 * accompanied this code. If applicable, add the following below the
2050.25 * License Header, with the fields enclosed by brackets [] replaced by
2050.26 * your own identifying information:
2051.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/StyleBuilderPanel.java Fri Jul 16 11:47:36 2010 -0400
2051.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/StyleBuilderPanel.java Fri Jul 16 14:21:50 2010 -0400
2051.3 @@ -1,7 +1,10 @@
2051.4 /*
2051.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2051.6 *
2051.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2051.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2051.9 + *
2051.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2051.11 + * Other names may be trademarks of their respective owners.
2051.12 *
2051.13 * The contents of this file are subject to the terms of either the GNU
2051.14 * General Public License Version 2 only ("GPL") or the Common
2051.15 @@ -13,9 +16,9 @@
2051.16 * specific language governing permissions and limitations under the
2051.17 * License. When distributing the software, include this License Header
2051.18 * Notice in each file and include the License file at
2051.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2051.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2051.21 * particular file as subject to the "Classpath" exception as provided
2051.22 - * by Sun in the GPL Version 2 section of the License file that
2051.23 + * by Oracle in the GPL Version 2 section of the License file that
2051.24 * accompanied this code. If applicable, add the following below the
2051.25 * License Header, with the fields enclosed by brackets [] replaced by
2051.26 * your own identifying information:
2052.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/StyleEditor.java Fri Jul 16 11:47:36 2010 -0400
2052.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/StyleEditor.java Fri Jul 16 14:21:50 2010 -0400
2052.3 @@ -1,7 +1,10 @@
2052.4 /*
2052.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2052.6 *
2052.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2052.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2052.9 + *
2052.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2052.11 + * Other names may be trademarks of their respective owners.
2052.12 *
2052.13 * The contents of this file are subject to the terms of either the GNU
2052.14 * General Public License Version 2 only ("GPL") or the Common
2052.15 @@ -13,9 +16,9 @@
2052.16 * specific language governing permissions and limitations under the
2052.17 * License. When distributing the software, include this License Header
2052.18 * Notice in each file and include the License file at
2052.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2052.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2052.21 * particular file as subject to the "Classpath" exception as provided
2052.22 - * by Sun in the GPL Version 2 section of the License file that
2052.23 + * by Oracle in the GPL Version 2 section of the License file that
2052.24 * accompanied this code. If applicable, add the following below the
2052.25 * License Header, with the fields enclosed by brackets [] replaced by
2052.26 * your own identifying information:
2053.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/StyleEditorListPanel.java Fri Jul 16 11:47:36 2010 -0400
2053.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/StyleEditorListPanel.java Fri Jul 16 14:21:50 2010 -0400
2053.3 @@ -1,7 +1,10 @@
2053.4 /*
2053.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2053.6 *
2053.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2053.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2053.9 + *
2053.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2053.11 + * Other names may be trademarks of their respective owners.
2053.12 *
2053.13 * The contents of this file are subject to the terms of either the GNU
2053.14 * General Public License Version 2 only ("GPL") or the Common
2053.15 @@ -13,9 +16,9 @@
2053.16 * specific language governing permissions and limitations under the
2053.17 * License. When distributing the software, include this License Header
2053.18 * Notice in each file and include the License file at
2053.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2053.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2053.21 * particular file as subject to the "Classpath" exception as provided
2053.22 - * by Sun in the GPL Version 2 section of the License file that
2053.23 + * by Oracle in the GPL Version 2 section of the License file that
2053.24 * accompanied this code. If applicable, add the following below the
2053.25 * License Header, with the fields enclosed by brackets [] replaced by
2053.26 * your own identifying information:
2054.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/TextBlockStyleEditor.java Fri Jul 16 11:47:36 2010 -0400
2054.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/TextBlockStyleEditor.java Fri Jul 16 14:21:50 2010 -0400
2054.3 @@ -1,7 +1,10 @@
2054.4 /*
2054.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2054.6 *
2054.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2054.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2054.9 + *
2054.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2054.11 + * Other names may be trademarks of their respective owners.
2054.12 *
2054.13 * The contents of this file are subject to the terms of either the GNU
2054.14 * General Public License Version 2 only ("GPL") or the Common
2054.15 @@ -13,9 +16,9 @@
2054.16 * specific language governing permissions and limitations under the
2054.17 * License. When distributing the software, include this License Header
2054.18 * Notice in each file and include the License file at
2054.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2054.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2054.21 * particular file as subject to the "Classpath" exception as provided
2054.22 - * by Sun in the GPL Version 2 section of the License file that
2054.23 + * by Oracle in the GPL Version 2 section of the License file that
2054.24 * accompanied this code. If applicable, add the following below the
2054.25 * License Header, with the fields enclosed by brackets [] replaced by
2054.26 * your own identifying information:
2055.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/BackgroundModel.java Fri Jul 16 11:47:36 2010 -0400
2055.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/BackgroundModel.java Fri Jul 16 14:21:50 2010 -0400
2055.3 @@ -1,7 +1,10 @@
2055.4 /*
2055.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2055.6 *
2055.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2055.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2055.9 + *
2055.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2055.11 + * Other names may be trademarks of their respective owners.
2055.12 *
2055.13 * The contents of this file are subject to the terms of either the GNU
2055.14 * General Public License Version 2 only ("GPL") or the Common
2055.15 @@ -13,9 +16,9 @@
2055.16 * specific language governing permissions and limitations under the
2055.17 * License. When distributing the software, include this License Header
2055.18 * Notice in each file and include the License file at
2055.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2055.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2055.21 * particular file as subject to the "Classpath" exception as provided
2055.22 - * by Sun in the GPL Version 2 section of the License file that
2055.23 + * by Oracle in the GPL Version 2 section of the License file that
2055.24 * accompanied this code. If applicable, add the following below the
2055.25 * License Header, with the fields enclosed by brackets [] replaced by
2055.26 * your own identifying information:
2056.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/BackgroundPositionData.java Fri Jul 16 11:47:36 2010 -0400
2056.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/BackgroundPositionData.java Fri Jul 16 14:21:50 2010 -0400
2056.3 @@ -1,7 +1,10 @@
2056.4 /*
2056.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2056.6 *
2056.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2056.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2056.9 + *
2056.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2056.11 + * Other names may be trademarks of their respective owners.
2056.12 *
2056.13 * The contents of this file are subject to the terms of either the GNU
2056.14 * General Public License Version 2 only ("GPL") or the Common
2056.15 @@ -13,9 +16,9 @@
2056.16 * specific language governing permissions and limitations under the
2056.17 * License. When distributing the software, include this License Header
2056.18 * Notice in each file and include the License file at
2056.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2056.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2056.21 * particular file as subject to the "Classpath" exception as provided
2056.22 - * by Sun in the GPL Version 2 section of the License file that
2056.23 + * by Oracle in the GPL Version 2 section of the License file that
2056.24 * accompanied this code. If applicable, add the following below the
2056.25 * License Header, with the fields enclosed by brackets [] replaced by
2056.26 * your own identifying information:
2057.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/BorderData.java Fri Jul 16 11:47:36 2010 -0400
2057.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/BorderData.java Fri Jul 16 14:21:50 2010 -0400
2057.3 @@ -1,7 +1,10 @@
2057.4 /*
2057.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2057.6 *
2057.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2057.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2057.9 + *
2057.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2057.11 + * Other names may be trademarks of their respective owners.
2057.12 *
2057.13 * The contents of this file are subject to the terms of either the GNU
2057.14 * General Public License Version 2 only ("GPL") or the Common
2057.15 @@ -13,9 +16,9 @@
2057.16 * specific language governing permissions and limitations under the
2057.17 * License. When distributing the software, include this License Header
2057.18 * Notice in each file and include the License file at
2057.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2057.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2057.21 * particular file as subject to the "Classpath" exception as provided
2057.22 - * by Sun in the GPL Version 2 section of the License file that
2057.23 + * by Oracle in the GPL Version 2 section of the License file that
2057.24 * accompanied this code. If applicable, add the following below the
2057.25 * License Header, with the fields enclosed by brackets [] replaced by
2057.26 * your own identifying information:
2058.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/BorderModel.java Fri Jul 16 11:47:36 2010 -0400
2058.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/BorderModel.java Fri Jul 16 14:21:50 2010 -0400
2058.3 @@ -1,7 +1,10 @@
2058.4 /*
2058.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2058.6 *
2058.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2058.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2058.9 + *
2058.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2058.11 + * Other names may be trademarks of their respective owners.
2058.12 *
2058.13 * The contents of this file are subject to the terms of either the GNU
2058.14 * General Public License Version 2 only ("GPL") or the Common
2058.15 @@ -13,9 +16,9 @@
2058.16 * specific language governing permissions and limitations under the
2058.17 * License. When distributing the software, include this License Header
2058.18 * Notice in each file and include the License file at
2058.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2058.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2058.21 * particular file as subject to the "Classpath" exception as provided
2058.22 - * by Sun in the GPL Version 2 section of the License file that
2058.23 + * by Oracle in the GPL Version 2 section of the License file that
2058.24 * accompanied this code. If applicable, add the following below the
2058.25 * License Header, with the fields enclosed by brackets [] replaced by
2058.26 * your own identifying information:
2059.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2059.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2059.3 @@ -1,6 +1,9 @@
2059.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2059.5 #
2059.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2059.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2059.8 +#
2059.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2059.10 +# Other names may be trademarks of their respective owners.
2059.11 #
2059.12 # The contents of this file are subject to the terms of either the GNU
2059.13 # General Public License Version 2 only ("GPL") or the Common
2059.14 @@ -12,9 +15,9 @@
2059.15 # specific language governing permissions and limitations under the
2059.16 # License. When distributing the software, include this License Header
2059.17 # Notice in each file and include the License file at
2059.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2059.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2059.20 # particular file as subject to the "Classpath" exception as provided
2059.21 -# by Sun in the GPL Version 2 section of the License file that
2059.22 +# by Oracle in the GPL Version 2 section of the License file that
2059.23 # accompanied this code. If applicable, add the following below the
2059.24 # License Header, with the fields enclosed by brackets [] replaced by
2059.25 # your own identifying information:
2060.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/ClipData.java Fri Jul 16 11:47:36 2010 -0400
2060.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/ClipData.java Fri Jul 16 14:21:50 2010 -0400
2060.3 @@ -1,7 +1,10 @@
2060.4 /*
2060.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2060.6 *
2060.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2060.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2060.9 + *
2060.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2060.11 + * Other names may be trademarks of their respective owners.
2060.12 *
2060.13 * The contents of this file are subject to the terms of either the GNU
2060.14 * General Public License Version 2 only ("GPL") or the Common
2060.15 @@ -13,9 +16,9 @@
2060.16 * specific language governing permissions and limitations under the
2060.17 * License. When distributing the software, include this License Header
2060.18 * Notice in each file and include the License file at
2060.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2060.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2060.21 * particular file as subject to the "Classpath" exception as provided
2060.22 - * by Sun in the GPL Version 2 section of the License file that
2060.23 + * by Oracle in the GPL Version 2 section of the License file that
2060.24 * accompanied this code. If applicable, add the following below the
2060.25 * License Header, with the fields enclosed by brackets [] replaced by
2060.26 * your own identifying information:
2061.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/ClipModel.java Fri Jul 16 11:47:36 2010 -0400
2061.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/ClipModel.java Fri Jul 16 14:21:50 2010 -0400
2061.3 @@ -1,7 +1,10 @@
2061.4 /*
2061.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2061.6 *
2061.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2061.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2061.9 + *
2061.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2061.11 + * Other names may be trademarks of their respective owners.
2061.12 *
2061.13 * The contents of this file are subject to the terms of either the GNU
2061.14 * General Public License Version 2 only ("GPL") or the Common
2061.15 @@ -13,9 +16,9 @@
2061.16 * specific language governing permissions and limitations under the
2061.17 * License. When distributing the software, include this License Header
2061.18 * Notice in each file and include the License file at
2061.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2061.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2061.21 * particular file as subject to the "Classpath" exception as provided
2061.22 - * by Sun in the GPL Version 2 section of the License file that
2061.23 + * by Oracle in the GPL Version 2 section of the License file that
2061.24 * accompanied this code. If applicable, add the following below the
2061.25 * License Header, with the fields enclosed by brackets [] replaced by
2061.26 * your own identifying information:
2062.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/ColorModel.java Fri Jul 16 11:47:36 2010 -0400
2062.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/ColorModel.java Fri Jul 16 14:21:50 2010 -0400
2062.3 @@ -1,7 +1,10 @@
2062.4 /*
2062.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2062.6 *
2062.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2062.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2062.9 + *
2062.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2062.11 + * Other names may be trademarks of their respective owners.
2062.12 *
2062.13 * The contents of this file are subject to the terms of either the GNU
2062.14 * General Public License Version 2 only ("GPL") or the Common
2062.15 @@ -13,9 +16,9 @@
2062.16 * specific language governing permissions and limitations under the
2062.17 * License. When distributing the software, include this License Header
2062.18 * Notice in each file and include the License file at
2062.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2062.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2062.21 * particular file as subject to the "Classpath" exception as provided
2062.22 - * by Sun in the GPL Version 2 section of the License file that
2062.23 + * by Oracle in the GPL Version 2 section of the License file that
2062.24 * accompanied this code. If applicable, add the following below the
2062.25 * License Header, with the fields enclosed by brackets [] replaced by
2062.26 * your own identifying information:
2063.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/CssStyleData.java Fri Jul 16 11:47:36 2010 -0400
2063.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/CssStyleData.java Fri Jul 16 14:21:50 2010 -0400
2063.3 @@ -1,7 +1,10 @@
2063.4 /*
2063.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2063.6 *
2063.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2063.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2063.9 + *
2063.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2063.11 + * Other names may be trademarks of their respective owners.
2063.12 *
2063.13 * The contents of this file are subject to the terms of either the GNU
2063.14 * General Public License Version 2 only ("GPL") or the Common
2063.15 @@ -13,9 +16,9 @@
2063.16 * specific language governing permissions and limitations under the
2063.17 * License. When distributing the software, include this License Header
2063.18 * Notice in each file and include the License file at
2063.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2063.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2063.21 * particular file as subject to the "Classpath" exception as provided
2063.22 - * by Sun in the GPL Version 2 section of the License file that
2063.23 + * by Oracle in the GPL Version 2 section of the License file that
2063.24 * accompanied this code. If applicable, add the following below the
2063.25 * License Header, with the fields enclosed by brackets [] replaced by
2063.26 * your own identifying information:
2064.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/CssStyleParser.java Fri Jul 16 11:47:36 2010 -0400
2064.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/CssStyleParser.java Fri Jul 16 14:21:50 2010 -0400
2064.3 @@ -1,7 +1,10 @@
2064.4 /*
2064.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2064.6 *
2064.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2064.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2064.9 + *
2064.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2064.11 + * Other names may be trademarks of their respective owners.
2064.12 *
2064.13 * The contents of this file are subject to the terms of either the GNU
2064.14 * General Public License Version 2 only ("GPL") or the Common
2064.15 @@ -13,9 +16,9 @@
2064.16 * specific language governing permissions and limitations under the
2064.17 * License. When distributing the software, include this License Header
2064.18 * Notice in each file and include the License file at
2064.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2064.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2064.21 * particular file as subject to the "Classpath" exception as provided
2064.22 - * by Sun in the GPL Version 2 section of the License file that
2064.23 + * by Oracle in the GPL Version 2 section of the License file that
2064.24 * accompanied this code. If applicable, add the following below the
2064.25 * License Header, with the fields enclosed by brackets [] replaced by
2064.26 * your own identifying information:
2065.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/FontModel.java Fri Jul 16 11:47:36 2010 -0400
2065.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/FontModel.java Fri Jul 16 14:21:50 2010 -0400
2065.3 @@ -1,7 +1,10 @@
2065.4 /*
2065.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2065.6 *
2065.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2065.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2065.9 + *
2065.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2065.11 + * Other names may be trademarks of their respective owners.
2065.12 *
2065.13 * The contents of this file are subject to the terms of either the GNU
2065.14 * General Public License Version 2 only ("GPL") or the Common
2065.15 @@ -13,9 +16,9 @@
2065.16 * specific language governing permissions and limitations under the
2065.17 * License. When distributing the software, include this License Header
2065.18 * Notice in each file and include the License file at
2065.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2065.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2065.21 * particular file as subject to the "Classpath" exception as provided
2065.22 - * by Sun in the GPL Version 2 section of the License file that
2065.23 + * by Oracle in the GPL Version 2 section of the License file that
2065.24 * accompanied this code. If applicable, add the following below the
2065.25 * License Header, with the fields enclosed by brackets [] replaced by
2065.26 * your own identifying information:
2066.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/MarginPaddingModel.java Fri Jul 16 11:47:36 2010 -0400
2066.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/MarginPaddingModel.java Fri Jul 16 14:21:50 2010 -0400
2066.3 @@ -1,7 +1,10 @@
2066.4 /*
2066.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2066.6 *
2066.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2066.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2066.9 + *
2066.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2066.11 + * Other names may be trademarks of their respective owners.
2066.12 *
2066.13 * The contents of this file are subject to the terms of either the GNU
2066.14 * General Public License Version 2 only ("GPL") or the Common
2066.15 @@ -13,9 +16,9 @@
2066.16 * specific language governing permissions and limitations under the
2066.17 * License. When distributing the software, include this License Header
2066.18 * Notice in each file and include the License file at
2066.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2066.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2066.21 * particular file as subject to the "Classpath" exception as provided
2066.22 - * by Sun in the GPL Version 2 section of the License file that
2066.23 + * by Oracle in the GPL Version 2 section of the License file that
2066.24 * accompanied this code. If applicable, add the following below the
2066.25 * License Header, with the fields enclosed by brackets [] replaced by
2066.26 * your own identifying information:
2067.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/PositionData.java Fri Jul 16 11:47:36 2010 -0400
2067.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/PositionData.java Fri Jul 16 14:21:50 2010 -0400
2067.3 @@ -1,7 +1,10 @@
2067.4 /*
2067.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2067.6 *
2067.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2067.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2067.9 + *
2067.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2067.11 + * Other names may be trademarks of their respective owners.
2067.12 *
2067.13 * The contents of this file are subject to the terms of either the GNU
2067.14 * General Public License Version 2 only ("GPL") or the Common
2067.15 @@ -13,9 +16,9 @@
2067.16 * specific language governing permissions and limitations under the
2067.17 * License. When distributing the software, include this License Header
2067.18 * Notice in each file and include the License file at
2067.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2067.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2067.21 * particular file as subject to the "Classpath" exception as provided
2067.22 - * by Sun in the GPL Version 2 section of the License file that
2067.23 + * by Oracle in the GPL Version 2 section of the License file that
2067.24 * accompanied this code. If applicable, add the following below the
2067.25 * License Header, with the fields enclosed by brackets [] replaced by
2067.26 * your own identifying information:
2068.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/PositionModel.java Fri Jul 16 11:47:36 2010 -0400
2068.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/PositionModel.java Fri Jul 16 14:21:50 2010 -0400
2068.3 @@ -1,7 +1,10 @@
2068.4 /*
2068.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2068.6 *
2068.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2068.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2068.9 + *
2068.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2068.11 + * Other names may be trademarks of their respective owners.
2068.12 *
2068.13 * The contents of this file are subject to the terms of either the GNU
2068.14 * General Public License Version 2 only ("GPL") or the Common
2068.15 @@ -13,9 +16,9 @@
2068.16 * specific language governing permissions and limitations under the
2068.17 * License. When distributing the software, include this License Header
2068.18 * Notice in each file and include the License file at
2068.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2068.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2068.21 * particular file as subject to the "Classpath" exception as provided
2068.22 - * by Sun in the GPL Version 2 section of the License file that
2068.23 + * by Oracle in the GPL Version 2 section of the License file that
2068.24 * accompanied this code. If applicable, add the following below the
2068.25 * License Header, with the fields enclosed by brackets [] replaced by
2068.26 * your own identifying information:
2069.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/PropertyData.java Fri Jul 16 11:47:36 2010 -0400
2069.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/PropertyData.java Fri Jul 16 14:21:50 2010 -0400
2069.3 @@ -1,7 +1,10 @@
2069.4 /*
2069.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2069.6 *
2069.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2069.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2069.9 + *
2069.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2069.11 + * Other names may be trademarks of their respective owners.
2069.12 *
2069.13 * The contents of this file are subject to the terms of either the GNU
2069.14 * General Public License Version 2 only ("GPL") or the Common
2069.15 @@ -13,9 +16,9 @@
2069.16 * specific language governing permissions and limitations under the
2069.17 * License. When distributing the software, include this License Header
2069.18 * Notice in each file and include the License file at
2069.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2069.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2069.21 * particular file as subject to the "Classpath" exception as provided
2069.22 - * by Sun in the GPL Version 2 section of the License file that
2069.23 + * by Oracle in the GPL Version 2 section of the License file that
2069.24 * accompanied this code. If applicable, add the following below the
2069.25 * License Header, with the fields enclosed by brackets [] replaced by
2069.26 * your own identifying information:
2070.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/PropertyWithUnitData.java Fri Jul 16 11:47:36 2010 -0400
2070.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/PropertyWithUnitData.java Fri Jul 16 14:21:50 2010 -0400
2070.3 @@ -1,7 +1,10 @@
2070.4 /*
2070.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2070.6 *
2070.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2070.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2070.9 + *
2070.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2070.11 + * Other names may be trademarks of their respective owners.
2070.12 *
2070.13 * The contents of this file are subject to the terms of either the GNU
2070.14 * General Public License Version 2 only ("GPL") or the Common
2070.15 @@ -13,9 +16,9 @@
2070.16 * specific language governing permissions and limitations under the
2070.17 * License. When distributing the software, include this License Header
2070.18 * Notice in each file and include the License file at
2070.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2070.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2070.21 * particular file as subject to the "Classpath" exception as provided
2070.22 - * by Sun in the GPL Version 2 section of the License file that
2070.23 + * by Oracle in the GPL Version 2 section of the License file that
2070.24 * accompanied this code. If applicable, add the following below the
2070.25 * License Header, with the fields enclosed by brackets [] replaced by
2070.26 * your own identifying information:
2071.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/TextBlockData.java Fri Jul 16 11:47:36 2010 -0400
2071.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/TextBlockData.java Fri Jul 16 14:21:50 2010 -0400
2071.3 @@ -1,7 +1,10 @@
2071.4 /*
2071.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2071.6 *
2071.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2071.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2071.9 + *
2071.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2071.11 + * Other names may be trademarks of their respective owners.
2071.12 *
2071.13 * The contents of this file are subject to the terms of either the GNU
2071.14 * General Public License Version 2 only ("GPL") or the Common
2071.15 @@ -13,9 +16,9 @@
2071.16 * specific language governing permissions and limitations under the
2071.17 * License. When distributing the software, include this License Header
2071.18 * Notice in each file and include the License file at
2071.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2071.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2071.21 * particular file as subject to the "Classpath" exception as provided
2071.22 - * by Sun in the GPL Version 2 section of the License file that
2071.23 + * by Oracle in the GPL Version 2 section of the License file that
2071.24 * accompanied this code. If applicable, add the following below the
2071.25 * License Header, with the fields enclosed by brackets [] replaced by
2071.26 * your own identifying information:
2072.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/TextBlockModel.java Fri Jul 16 11:47:36 2010 -0400
2072.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/TextBlockModel.java Fri Jul 16 14:21:50 2010 -0400
2072.3 @@ -1,7 +1,10 @@
2072.4 /*
2072.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2072.6 *
2072.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2072.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2072.9 + *
2072.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2072.11 + * Other names may be trademarks of their respective owners.
2072.12 *
2072.13 * The contents of this file are subject to the terms of either the GNU
2072.14 * General Public License Version 2 only ("GPL") or the Common
2072.15 @@ -13,9 +16,9 @@
2072.16 * specific language governing permissions and limitations under the
2072.17 * License. When distributing the software, include this License Header
2072.18 * Notice in each file and include the License file at
2072.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2072.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2072.21 * particular file as subject to the "Classpath" exception as provided
2072.22 - * by Sun in the GPL Version 2 section of the License file that
2072.23 + * by Oracle in the GPL Version 2 section of the License file that
2072.24 * accompanied this code. If applicable, add the following below the
2072.25 * License Header, with the fields enclosed by brackets [] replaced by
2072.26 * your own identifying information:
2073.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/TextDecorationData.java Fri Jul 16 11:47:36 2010 -0400
2073.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/TextDecorationData.java Fri Jul 16 14:21:50 2010 -0400
2073.3 @@ -1,7 +1,10 @@
2073.4 /*
2073.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2073.6 *
2073.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2073.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2073.9 + *
2073.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2073.11 + * Other names may be trademarks of their respective owners.
2073.12 *
2073.13 * The contents of this file are subject to the terms of either the GNU
2073.14 * General Public License Version 2 only ("GPL") or the Common
2073.15 @@ -13,9 +16,9 @@
2073.16 * specific language governing permissions and limitations under the
2073.17 * License. When distributing the software, include this License Header
2073.18 * Notice in each file and include the License file at
2073.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2073.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2073.21 * particular file as subject to the "Classpath" exception as provided
2073.22 - * by Sun in the GPL Version 2 section of the License file that
2073.23 + * by Oracle in the GPL Version 2 section of the License file that
2073.24 * accompanied this code. If applicable, add the following below the
2073.25 * License Header, with the fields enclosed by brackets [] replaced by
2073.26 * your own identifying information:
2074.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/Utils.java Fri Jul 16 11:47:36 2010 -0400
2074.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/css/model/Utils.java Fri Jul 16 14:21:50 2010 -0400
2074.3 @@ -1,7 +1,10 @@
2074.4 /*
2074.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2074.6 *
2074.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2074.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2074.9 + *
2074.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2074.11 + * Other names may be trademarks of their respective owners.
2074.12 *
2074.13 * The contents of this file are subject to the terms of either the GNU
2074.14 * General Public License Version 2 only ("GPL") or the Common
2074.15 @@ -13,9 +16,9 @@
2074.16 * specific language governing permissions and limitations under the
2074.17 * License. When distributing the software, include this License Header
2074.18 * Notice in each file and include the License file at
2074.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2074.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2074.21 * particular file as subject to the "Classpath" exception as provided
2074.22 - * by Sun in the GPL Version 2 section of the License file that
2074.23 + * by Oracle in the GPL Version 2 section of the License file that
2074.24 * accompanied this code. If applicable, add the following below the
2074.25 * License Header, with the fields enclosed by brackets [] replaced by
2074.26 * your own identifying information:
2075.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/module/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2075.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/module/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2075.3 @@ -1,6 +1,9 @@
2075.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2075.5 #
2075.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2075.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2075.8 +#
2075.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2075.10 +# Other names may be trademarks of their respective owners.
2075.11 #
2075.12 # The contents of this file are subject to the terms of either the GNU
2075.13 # General Public License Version 2 only ("GPL") or the Common
2075.14 @@ -12,9 +15,9 @@
2075.15 # specific language governing permissions and limitations under the
2075.16 # License. When distributing the software, include this License Header
2075.17 # Notice in each file and include the License file at
2075.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2075.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2075.20 # particular file as subject to the "Classpath" exception as provided
2075.21 -# by Sun in the GPL Version 2 section of the License file that
2075.22 +# by Oracle in the GPL Version 2 section of the License file that
2075.23 # accompanied this code. If applicable, add the following below the
2075.24 # License Header, with the fields enclosed by brackets [] replaced by
2075.25 # your own identifying information:
2076.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/module/Install.java Fri Jul 16 11:47:36 2010 -0400
2076.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/module/Install.java Fri Jul 16 14:21:50 2010 -0400
2076.3 @@ -1,7 +1,10 @@
2076.4 /*
2076.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2076.6 *
2076.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2076.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2076.9 + *
2076.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2076.11 + * Other names may be trademarks of their respective owners.
2076.12 *
2076.13 * The contents of this file are subject to the terms of either the GNU
2076.14 * General Public License Version 2 only ("GPL") or the Common
2076.15 @@ -13,9 +16,9 @@
2076.16 * specific language governing permissions and limitations under the
2076.17 * License. When distributing the software, include this License Header
2076.18 * Notice in each file and include the License file at
2076.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2076.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2076.21 * particular file as subject to the "Classpath" exception as provided
2076.22 - * by Sun in the GPL Version 2 section of the License file that
2076.23 + * by Oracle in the GPL Version 2 section of the License file that
2076.24 * accompanied this code. If applicable, add the following below the
2076.25 * License Header, with the fields enclosed by brackets [] replaced by
2076.26 * your own identifying information:
2077.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/resolver/PropertyEditorResolverImpl.java Fri Jul 16 11:47:36 2010 -0400
2077.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/resolver/PropertyEditorResolverImpl.java Fri Jul 16 14:21:50 2010 -0400
2077.3 @@ -1,7 +1,10 @@
2077.4 /*
2077.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2077.6 *
2077.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2077.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2077.9 + *
2077.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2077.11 + * Other names may be trademarks of their respective owners.
2077.12 *
2077.13 * The contents of this file are subject to the terms of either the GNU
2077.14 * General Public License Version 2 only ("GPL") or the Common
2077.15 @@ -13,9 +16,9 @@
2077.16 * specific language governing permissions and limitations under the
2077.17 * License. When distributing the software, include this License Header
2077.18 * Notice in each file and include the License file at
2077.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2077.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2077.21 * particular file as subject to the "Classpath" exception as provided
2077.22 - * by Sun in the GPL Version 2 section of the License file that
2077.23 + * by Oracle in the GPL Version 2 section of the License file that
2077.24 * accompanied this code. If applicable, add the following below the
2077.25 * License Header, with the fields enclosed by brackets [] replaced by
2077.26 * your own identifying information:
2078.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/resolver/PropertyEditorResolverImpl.properties Fri Jul 16 11:47:36 2010 -0400
2078.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/resolver/PropertyEditorResolverImpl.properties Fri Jul 16 14:21:50 2010 -0400
2078.3 @@ -1,6 +1,9 @@
2078.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2078.5 #
2078.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2078.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2078.8 +#
2078.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2078.10 +# Other names may be trademarks of their respective owners.
2078.11 #
2078.12 # The contents of this file are subject to the terms of either the GNU
2078.13 # General Public License Version 2 only ("GPL") or the Common
2078.14 @@ -12,9 +15,9 @@
2078.15 # specific language governing permissions and limitations under the
2078.16 # License. When distributing the software, include this License Header
2078.17 # Notice in each file and include the License file at
2078.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2078.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2078.20 # particular file as subject to the "Classpath" exception as provided
2078.21 -# by Sun in the GPL Version 2 section of the License file that
2078.22 +# by Oracle in the GPL Version 2 section of the License file that
2078.23 # accompanied this code. If applicable, add the following below the
2078.24 # License Header, with the fields enclosed by brackets [] replaced by
2078.25 # your own identifying information:
2079.1 --- a/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/util/Bundle.java Fri Jul 16 11:47:36 2010 -0400
2079.2 +++ b/visualweb.propertyeditors/src/org/netbeans/modules/visualweb/propertyeditors/util/Bundle.java Fri Jul 16 14:21:50 2010 -0400
2079.3 @@ -1,7 +1,10 @@
2079.4 /*
2079.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2079.6 *
2079.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2079.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2079.9 + *
2079.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2079.11 + * Other names may be trademarks of their respective owners.
2079.12 *
2079.13 * The contents of this file are subject to the terms of either the GNU
2079.14 * General Public License Version 2 only ("GPL") or the Common
2079.15 @@ -13,9 +16,9 @@
2079.16 * specific language governing permissions and limitations under the
2079.17 * License. When distributing the software, include this License Header
2079.18 * Notice in each file and include the License file at
2079.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2079.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2079.21 * particular file as subject to the "Classpath" exception as provided
2079.22 - * by Sun in the GPL Version 2 section of the License file that
2079.23 + * by Oracle in the GPL Version 2 section of the License file that
2079.24 * accompanied this code. If applicable, add the following below the
2079.25 * License Header, with the fields enclosed by brackets [] replaced by
2079.26 * your own identifying information:
2080.1 --- a/visualweb.propertyeditors/test/unit/src/org/netbeans/modules/visualweb/propertyeditors/ConverterTest.java Fri Jul 16 11:47:36 2010 -0400
2080.2 +++ b/visualweb.propertyeditors/test/unit/src/org/netbeans/modules/visualweb/propertyeditors/ConverterTest.java Fri Jul 16 14:21:50 2010 -0400
2080.3 @@ -1,9 +1,12 @@
2080.4 package org.netbeans.modules.visualweb.propertyeditors;
2080.5 /*
2080.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2080.7 - *
2080.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2080.9 - *
2080.10 + *
2080.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2080.12 + *
2080.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2080.14 + * Other names may be trademarks of their respective owners.
2080.15 + *
2080.16 * The contents of this file are subject to the terms of either the GNU
2080.17 * General Public License Version 2 only ("GPL") or the Common
2080.18 * Development and Distribution License("CDDL") (collectively, the
2080.19 @@ -14,9 +17,9 @@
2080.20 * specific language governing permissions and limitations under the
2080.21 * License. When distributing the software, include this License Header
2080.22 * Notice in each file and include the License file at
2080.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2080.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2080.25 * particular file as subject to the "Classpath" exception as provided
2080.26 - * by Sun in the GPL Version 2 section of the License file that
2080.27 + * by Oracle in the GPL Version 2 section of the License file that
2080.28 * accompanied this code. If applicable, add the following below the
2080.29 * License Header, with the fields enclosed by brackets [] replaced by
2080.30 * your own identifying information:
2081.1 --- a/visualweb.ravehelp.rave_nbpack/build.xml Fri Jul 16 11:47:36 2010 -0400
2081.2 +++ b/visualweb.ravehelp.rave_nbpack/build.xml Fri Jul 16 14:21:50 2010 -0400
2081.3 @@ -2,7 +2,10 @@
2081.4 <!--
2081.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2081.6
2081.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2081.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2081.9 +
2081.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2081.11 +Other names may be trademarks of their respective owners.
2081.12
2081.13
2081.14 The contents of this file are subject to the terms of either the GNU
2081.15 @@ -15,9 +18,9 @@
2081.16 specific language governing permissions and limitations under the
2081.17 License. When distributing the software, include this License Header
2081.18 Notice in each file and include the License file at
2081.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2081.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2081.21 particular file as subject to the "Classpath" exception as provided
2081.22 -by Sun in the GPL Version 2 section of the License file that
2081.23 +by Oracle in the GPL Version 2 section of the License file that
2081.24 accompanied this code. If applicable, add the following below the
2081.25 License Header, with the fields enclosed by brackets [] replaced by
2081.26 your own identifying information:
2082.1 --- a/visualweb.ravehelp.rave_nbpack/javahelp/org/netbeans/modules/visualweb/ravehelp/rave_nbpack/docs/credits.html Fri Jul 16 11:47:36 2010 -0400
2082.2 +++ b/visualweb.ravehelp.rave_nbpack/javahelp/org/netbeans/modules/visualweb/ravehelp/rave_nbpack/docs/credits.html Fri Jul 16 14:21:50 2010 -0400
2082.3 @@ -1,7 +1,6 @@
2082.4 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2082.5 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
2082.6 <!--
2082.7 -* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
2082.8 -* Use is subject to license terms.
2082.9 +* Copyright © 1997, 2010, Oracle and/or its affiliates. All rights reserved.
2082.10 -->
2082.11 <html>
2082.12 <head>
2082.13 @@ -13,46 +12,37 @@
2082.14
2082.15 <p>DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.</p>
2082.16
2082.17 -<p>Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.</p>
2082.18 +<p> Copyright © 1997, 2010, Oracle and/or its affiliates. All rights reserved.</p>
2082.19
2082.20 -<p>The contents of this file are subject to the terms of either the GNU
2082.21 -General Public License Version 2 only ("GPL") or the Common
2082.22 -Development and Distribution License("CDDL") (collectively, the
2082.23 -"License"). You may not use this file except in compliance with the
2082.24 -License. You can obtain a copy of the License at
2082.25 -http://www.netbeans.org/cddl-gplv2.html
2082.26 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
2082.27 -specific language governing permissions and limitations under the
2082.28 -License. When distributing the software, include this License Header
2082.29 -Notice in each file and include the License file at
2082.30 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2082.31 -particular file as subject to the "Classpath" exception as provided
2082.32 -by Sun in the GPL Version 2 section of the License file that
2082.33 -accompanied this code. If applicable, add the following below the
2082.34 -License Header, with the fields enclosed by brackets [] replaced by
2082.35 -your own identifying information:<br>
2082.36 -"Portions Copyrighted [year] [name of copyright owner]"</p>
2082.37 -
2082.38 -<p>Contributor(s):</p>
2082.39 -
2082.40 -<p>The Original Software is NetBeans. The Initial Developer of the Original
2082.41 -Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.</p>
2082.42 +<p> Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may
2082.43 + be trademarks of their respective owners.</p>
2082.44 +<p> The contents of this file are subject to the terms of either the GNU
2082.45 + General Public License Version 2 only ("GPL") or the Common
2082.46 + Development and Distribution License("CDDL") (collectively, the "License"). You may not use this file except in compliance with the
2082.47 + License. You can obtain a copy of the License at
2082.48 + <a href="http://www.netbeans.org/cddl-gplv2.html">http://www.netbeans.org/cddl-gplv2.html</a> or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
2082.49 + specific language governing permissions and limitations under the
2082.50 + License. When distributing the software, include this License Header<br>
2082.51 + Notice in each file and include the License file at
2082.52 + nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2082.53 + particular file as subject to the "Classpath" exception as provided
2082.54 + by Oracle in the GPL Version 2 section of the License file that
2082.55 + accompanied this code. If applicable, add the following below the
2082.56 + License Header, with the fields enclosed by brackets [] replaced by
2082.57 + your own identifying information:<br>
2082.58 +"Portions Copyrighted [year] [name of copyright owner]"</p>
2082.59 +<p> Contributor(s):</p>
2082.60 +<p> The original software is NetBeans. The initial developer of the original
2082.61 + software was Sun Microsystems, Inc.; portions copyright 1997-2006 Sun Microsystems, Inc. All rights reserved. </p>
2082.62 <p>If you wish your version of this file to be governed by only the CDDL
2082.63 -or only the GPL Version 2, indicate your decision by adding
2082.64 -"[Contributor] elects to include this software in this distribution
2082.65 -under the [CDDL or GPL Version 2] license." If you do not indicate a
2082.66 -single choice of license, a recipient has the option to distribute
2082.67 -your version of this file under either the CDDL, the GPL Version 2 or
2082.68 + or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution
2082.69 + under the [CDDL or GPL Version 2] license." If you do not indicate a<br>
2082.70 + single choice of license, a recipient has the option to distribute
2082.71 +your version of this file under either the CDDL, the GPL Version 2 or<br>
2082.72 to extend the choice of license to its licensees as provided above.
2082.73 -However, if you add GPL Version 2 code and therefore, elected the GPL
2082.74 +However, if you add GPL Version 2 code and therefore, elected the GPL<br>
2082.75 Version 2 license, then the option applies only if the new code is
2082.76 -made subject to such option by the copyright holder.
2082.77 -</p>
2082.78 -
2082.79 -<p><b>Note:</b> Sun is not responsible for the availability of third-party web
2082.80 -sites mentioned in this document and does not endorse and is not
2082.81 -responsible or liable for any content, advertising, products, or other
2082.82 -materials on or available from such sites or resources. Sun will not be
2082.83 -responsible or liable for any damage or loss caused or alleged to be
2082.84 -caused by or in connection with use of or reliance on any such content,
2082.85 -goods, or services available on or through any such sites or resources.</p>
2082.86 +made subject to such option by the copyright holder.</p>
2082.87 +<p> Oracle is not responsible for the availability of third-party Web sites mentioned in this document. Oracle does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Oracle will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.</p>
2082.88 +</body>
2082.89 +</html>
2083.1 --- a/visualweb.ravehelp.rave_nbpack/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2083.2 +++ b/visualweb.ravehelp.rave_nbpack/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2083.3 @@ -1,6 +1,9 @@
2083.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2083.5 #
2083.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2083.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2083.8 +#
2083.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2083.10 +# Other names may be trademarks of their respective owners.
2083.11 #
2083.12 # The contents of this file are subject to the terms of either the GNU
2083.13 # General Public License Version 2 only ("GPL") or the Common
2083.14 @@ -12,9 +15,9 @@
2083.15 # specific language governing permissions and limitations under the
2083.16 # License. When distributing the software, include this License Header
2083.17 # Notice in each file and include the License file at
2083.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2083.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2083.20 # particular file as subject to the "Classpath" exception as provided
2083.21 -# by Sun in the GPL Version 2 section of the License file that
2083.22 +# by Oracle in the GPL Version 2 section of the License file that
2083.23 # accompanied this code. If applicable, add the following below the
2083.24 # License Header, with the fields enclosed by brackets [] replaced by
2083.25 # your own identifying information:
2084.1 --- a/visualweb.ravehelp.rave_nbpack/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2084.2 +++ b/visualweb.ravehelp.rave_nbpack/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2084.3 @@ -2,7 +2,10 @@
2084.4 <!--
2084.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2084.6
2084.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2084.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2084.9 +
2084.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2084.11 +Other names may be trademarks of their respective owners.
2084.12
2084.13
2084.14 The contents of this file are subject to the terms of either the GNU
2084.15 @@ -15,9 +18,9 @@
2084.16 specific language governing permissions and limitations under the
2084.17 License. When distributing the software, include this License Header
2084.18 Notice in each file and include the License file at
2084.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2084.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2084.21 particular file as subject to the "Classpath" exception as provided
2084.22 -by Sun in the GPL Version 2 section of the License file that
2084.23 +by Oracle in the GPL Version 2 section of the License file that
2084.24 accompanied this code. If applicable, add the following below the
2084.25 License Header, with the fields enclosed by brackets [] replaced by
2084.26 your own identifying information:
2085.1 --- a/visualweb.ravehelp.rave_nbpack/src/org/netbeans/modules/visualweb/ravehelp/rave_nbpack/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2085.2 +++ b/visualweb.ravehelp.rave_nbpack/src/org/netbeans/modules/visualweb/ravehelp/rave_nbpack/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2085.3 @@ -1,6 +1,9 @@
2085.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2085.5 #
2085.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2085.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2085.8 +#
2085.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2085.10 +# Other names may be trademarks of their respective owners.
2085.11 #
2085.12 # The contents of this file are subject to the terms of either the GNU
2085.13 # General Public License Version 2 only ("GPL") or the Common
2085.14 @@ -12,9 +15,9 @@
2085.15 # specific language governing permissions and limitations under the
2085.16 # License. When distributing the software, include this License Header
2085.17 # Notice in each file and include the License file at
2085.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2085.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2085.20 # particular file as subject to the "Classpath" exception as provided
2085.21 -# by Sun in the GPL Version 2 section of the License file that
2085.22 +# by Oracle in the GPL Version 2 section of the License file that
2085.23 # accompanied this code. If applicable, add the following below the
2085.24 # License Header, with the fields enclosed by brackets [] replaced by
2085.25 # your own identifying information:
2086.1 --- a/visualweb.ravehelp.rave_nbpack/src/org/netbeans/modules/visualweb/ravehelp/rave_nbpack/helpsetref.xml Fri Jul 16 11:47:36 2010 -0400
2086.2 +++ b/visualweb.ravehelp.rave_nbpack/src/org/netbeans/modules/visualweb/ravehelp/rave_nbpack/helpsetref.xml Fri Jul 16 14:21:50 2010 -0400
2086.3 @@ -2,7 +2,10 @@
2086.4 <!--
2086.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2086.6
2086.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2086.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2086.9 +
2086.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2086.11 +Other names may be trademarks of their respective owners.
2086.12
2086.13
2086.14 The contents of this file are subject to the terms of either the GNU
2086.15 @@ -15,9 +18,9 @@
2086.16 specific language governing permissions and limitations under the
2086.17 License. When distributing the software, include this License Header
2086.18 Notice in each file and include the License file at
2086.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2086.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2086.21 particular file as subject to the "Classpath" exception as provided
2086.22 -by Sun in the GPL Version 2 section of the License file that
2086.23 +by Oracle in the GPL Version 2 section of the License file that
2086.24 accompanied this code. If applicable, add the following below the
2086.25 License Header, with the fields enclosed by brackets [] replaced by
2086.26 your own identifying information:
2087.1 --- a/visualweb.ravehelp.rave_nbpack/src/org/netbeans/modules/visualweb/ravehelp/rave_nbpack/layer.xml Fri Jul 16 11:47:36 2010 -0400
2087.2 +++ b/visualweb.ravehelp.rave_nbpack/src/org/netbeans/modules/visualweb/ravehelp/rave_nbpack/layer.xml Fri Jul 16 14:21:50 2010 -0400
2087.3 @@ -2,7 +2,10 @@
2087.4 <!--
2087.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2087.6
2087.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2087.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2087.9 +
2087.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2087.11 +Other names may be trademarks of their respective owners.
2087.12
2087.13
2087.14 The contents of this file are subject to the terms of either the GNU
2087.15 @@ -15,9 +18,9 @@
2087.16 specific language governing permissions and limitations under the
2087.17 License. When distributing the software, include this License Header
2087.18 Notice in each file and include the License file at
2087.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2087.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2087.21 particular file as subject to the "Classpath" exception as provided
2087.22 -by Sun in the GPL Version 2 section of the License file that
2087.23 +by Oracle in the GPL Version 2 section of the License file that
2087.24 accompanied this code. If applicable, add the following below the
2087.25 License Header, with the fields enclosed by brackets [] replaced by
2087.26 your own identifying information:
2088.1 --- a/visualweb.rowset/build.xml Fri Jul 16 11:47:36 2010 -0400
2088.2 +++ b/visualweb.rowset/build.xml Fri Jul 16 14:21:50 2010 -0400
2088.3 @@ -2,7 +2,10 @@
2088.4 <!--
2088.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2088.6
2088.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2088.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2088.9 +
2088.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2088.11 +Other names may be trademarks of their respective owners.
2088.12
2088.13
2088.14 The contents of this file are subject to the terms of either the GNU
2088.15 @@ -15,9 +18,9 @@
2088.16 specific language governing permissions and limitations under the
2088.17 License. When distributing the software, include this License Header
2088.18 Notice in each file and include the License file at
2088.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2088.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2088.21 particular file as subject to the "Classpath" exception as provided
2088.22 -by Sun in the GPL Version 2 section of the License file that
2088.23 +by Oracle in the GPL Version 2 section of the License file that
2088.24 accompanied this code. If applicable, add the following below the
2088.25 License Header, with the fields enclosed by brackets [] replaced by
2088.26 your own identifying information:
2089.1 --- a/visualweb.rowset/library/build.xml Fri Jul 16 11:47:36 2010 -0400
2089.2 +++ b/visualweb.rowset/library/build.xml Fri Jul 16 14:21:50 2010 -0400
2089.3 @@ -2,7 +2,10 @@
2089.4 <!--
2089.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2089.6
2089.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2089.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2089.9 +
2089.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2089.11 +Other names may be trademarks of their respective owners.
2089.12
2089.13
2089.14 The contents of this file are subject to the terms of either the GNU
2089.15 @@ -15,9 +18,9 @@
2089.16 specific language governing permissions and limitations under the
2089.17 License. When distributing the software, include this License Header
2089.18 Notice in each file and include the License file at
2089.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2089.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2089.21 particular file as subject to the "Classpath" exception as provided
2089.22 -by Sun in the GPL Version 2 section of the License file that
2089.23 +by Oracle in the GPL Version 2 section of the License file that
2089.24 accompanied this code. If applicable, add the following below the
2089.25 License Header, with the fields enclosed by brackets [] replaced by
2089.26 your own identifying information:
2090.1 --- a/visualweb.rowset/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2090.2 +++ b/visualweb.rowset/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2090.3 @@ -1,6 +1,9 @@
2090.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2090.5 #
2090.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2090.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2090.8 +#
2090.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2090.10 +# Other names may be trademarks of their respective owners.
2090.11 #
2090.12 # The contents of this file are subject to the terms of either the GNU
2090.13 # General Public License Version 2 only ("GPL") or the Common
2090.14 @@ -12,9 +15,9 @@
2090.15 # specific language governing permissions and limitations under the
2090.16 # License. When distributing the software, include this License Header
2090.17 # Notice in each file and include the License file at
2090.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2090.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2090.20 # particular file as subject to the "Classpath" exception as provided
2090.21 -# by Sun in the GPL Version 2 section of the License file that
2090.22 +# by Oracle in the GPL Version 2 section of the License file that
2090.23 # accompanied this code. If applicable, add the following below the
2090.24 # License Header, with the fields enclosed by brackets [] replaced by
2090.25 # your own identifying information:
2091.1 --- a/visualweb.rowset/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2091.2 +++ b/visualweb.rowset/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2091.3 @@ -2,7 +2,10 @@
2091.4 <!--
2091.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2091.6
2091.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2091.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2091.9 +
2091.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2091.11 +Other names may be trademarks of their respective owners.
2091.12
2091.13
2091.14 The contents of this file are subject to the terms of either the GNU
2091.15 @@ -15,9 +18,9 @@
2091.16 specific language governing permissions and limitations under the
2091.17 License. When distributing the software, include this License Header
2091.18 Notice in each file and include the License file at
2091.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2091.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2091.21 particular file as subject to the "Classpath" exception as provided
2091.22 -by Sun in the GPL Version 2 section of the License file that
2091.23 +by Oracle in the GPL Version 2 section of the License file that
2091.24 accompanied this code. If applicable, add the following below the
2091.25 License Header, with the fields enclosed by brackets [] replaced by
2091.26 your own identifying information:
2092.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/BaseRowSetX.java Fri Jul 16 11:47:36 2010 -0400
2092.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/BaseRowSetX.java Fri Jul 16 14:21:50 2010 -0400
2092.3 @@ -1,7 +1,10 @@
2092.4 /*
2092.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2092.6 *
2092.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2092.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2092.9 + *
2092.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2092.11 + * Other names may be trademarks of their respective owners.
2092.12 *
2092.13 * The contents of this file are subject to the terms of either the GNU
2092.14 * General Public License Version 2 only ("GPL") or the Common
2092.15 @@ -13,9 +16,9 @@
2092.16 * specific language governing permissions and limitations under the
2092.17 * License. When distributing the software, include this License Header
2092.18 * Notice in each file and include the License file at
2092.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2092.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2092.21 * particular file as subject to the "Classpath" exception as provided
2092.22 - * by Sun in the GPL Version 2 section of the License file that
2092.23 + * by Oracle in the GPL Version 2 section of the License file that
2092.24 * accompanied this code. If applicable, add the following below the
2092.25 * License Header, with the fields enclosed by brackets [] replaced by
2092.26 * your own identifying information:
2093.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2093.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2093.3 @@ -1,6 +1,9 @@
2093.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2093.5 #
2093.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2093.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2093.8 +#
2093.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2093.10 +# Other names may be trademarks of their respective owners.
2093.11 #
2093.12 # The contents of this file are subject to the terms of either the GNU
2093.13 # General Public License Version 2 only ("GPL") or the Common
2093.14 @@ -12,9 +15,9 @@
2093.15 # specific language governing permissions and limitations under the
2093.16 # License. When distributing the software, include this License Header
2093.17 # Notice in each file and include the License file at
2093.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2093.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2093.20 # particular file as subject to the "Classpath" exception as provided
2093.21 -# by Sun in the GPL Version 2 section of the License file that
2093.22 +# by Oracle in the GPL Version 2 section of the License file that
2093.23 # accompanied this code. If applicable, add the following below the
2093.24 # License Header, with the fields enclosed by brackets [] replaced by
2093.25 # your own identifying information:
2094.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/CachedRowSetX.java Fri Jul 16 11:47:36 2010 -0400
2094.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/CachedRowSetX.java Fri Jul 16 14:21:50 2010 -0400
2094.3 @@ -1,7 +1,10 @@
2094.4 /*
2094.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2094.6 *
2094.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2094.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2094.9 + *
2094.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2094.11 + * Other names may be trademarks of their respective owners.
2094.12 *
2094.13 * The contents of this file are subject to the terms of either the GNU
2094.14 * General Public License Version 2 only ("GPL") or the Common
2094.15 @@ -13,9 +16,9 @@
2094.16 * specific language governing permissions and limitations under the
2094.17 * License. When distributing the software, include this License Header
2094.18 * Notice in each file and include the License file at
2094.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2094.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2094.21 * particular file as subject to the "Classpath" exception as provided
2094.22 - * by Sun in the GPL Version 2 section of the License file that
2094.23 + * by Oracle in the GPL Version 2 section of the License file that
2094.24 * accompanied this code. If applicable, add the following below the
2094.25 * License Header, with the fields enclosed by brackets [] replaced by
2094.26 * your own identifying information:
2095.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/CachedRowSetXImpl.java Fri Jul 16 11:47:36 2010 -0400
2095.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/CachedRowSetXImpl.java Fri Jul 16 14:21:50 2010 -0400
2095.3 @@ -1,7 +1,10 @@
2095.4 /*
2095.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2095.6 *
2095.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2095.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2095.9 + *
2095.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2095.11 + * Other names may be trademarks of their respective owners.
2095.12 *
2095.13 * The contents of this file are subject to the terms of either the GNU
2095.14 * General Public License Version 2 only ("GPL") or the Common
2095.15 @@ -13,9 +16,9 @@
2095.16 * specific language governing permissions and limitations under the
2095.17 * License. When distributing the software, include this License Header
2095.18 * Notice in each file and include the License file at
2095.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2095.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2095.21 * particular file as subject to the "Classpath" exception as provided
2095.22 - * by Sun in the GPL Version 2 section of the License file that
2095.23 + * by Oracle in the GPL Version 2 section of the License file that
2095.24 * accompanied this code. If applicable, add the following below the
2095.25 * License Header, with the fields enclosed by brackets [] replaced by
2095.26 * your own identifying information:
2096.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/CachedRowSetXImpl5.java Fri Jul 16 11:47:36 2010 -0400
2096.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/CachedRowSetXImpl5.java Fri Jul 16 14:21:50 2010 -0400
2096.3 @@ -1,7 +1,10 @@
2096.4 /*
2096.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2096.6 *
2096.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2096.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2096.9 + *
2096.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2096.11 + * Other names may be trademarks of their respective owners.
2096.12 *
2096.13 * The contents of this file are subject to the terms of either the GNU
2096.14 * General Public License Version 2 only ("GPL") or the Common
2096.15 @@ -13,9 +16,9 @@
2096.16 * specific language governing permissions and limitations under the
2096.17 * License. When distributing the software, include this License Header
2096.18 * Notice in each file and include the License file at
2096.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2096.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2096.21 * particular file as subject to the "Classpath" exception as provided
2096.22 - * by Sun in the GPL Version 2 section of the License file that
2096.23 + * by Oracle in the GPL Version 2 section of the License file that
2096.24 * accompanied this code. If applicable, add the following below the
2096.25 * License Header, with the fields enclosed by brackets [] replaced by
2096.26 * your own identifying information:
2097.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/Log.java Fri Jul 16 11:47:36 2010 -0400
2097.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/Log.java Fri Jul 16 14:21:50 2010 -0400
2097.3 @@ -1,7 +1,10 @@
2097.4 /*
2097.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2097.6 *
2097.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2097.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2097.9 + *
2097.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2097.11 + * Other names may be trademarks of their respective owners.
2097.12 *
2097.13 * The contents of this file are subject to the terms of either the GNU
2097.14 * General Public License Version 2 only ("GPL") or the Common
2097.15 @@ -13,9 +16,9 @@
2097.16 * specific language governing permissions and limitations under the
2097.17 * License. When distributing the software, include this License Header
2097.18 * Notice in each file and include the License file at
2097.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2097.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2097.21 * particular file as subject to the "Classpath" exception as provided
2097.22 - * by Sun in the GPL Version 2 section of the License file that
2097.23 + * by Oracle in the GPL Version 2 section of the License file that
2097.24 * accompanied this code. If applicable, add the following below the
2097.25 * License Header, with the fields enclosed by brackets [] replaced by
2097.26 * your own identifying information:
2098.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/RowSetMetaDataX.java Fri Jul 16 11:47:36 2010 -0400
2098.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/RowSetMetaDataX.java Fri Jul 16 14:21:50 2010 -0400
2098.3 @@ -1,7 +1,10 @@
2098.4 /*
2098.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2098.6 *
2098.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2098.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2098.9 + *
2098.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2098.11 + * Other names may be trademarks of their respective owners.
2098.12 *
2098.13 * The contents of this file are subject to the terms of either the GNU
2098.14 * General Public License Version 2 only ("GPL") or the Common
2098.15 @@ -13,9 +16,9 @@
2098.16 * specific language governing permissions and limitations under the
2098.17 * License. When distributing the software, include this License Header
2098.18 * Notice in each file and include the License file at
2098.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2098.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2098.21 * particular file as subject to the "Classpath" exception as provided
2098.22 - * by Sun in the GPL Version 2 section of the License file that
2098.23 + * by Oracle in the GPL Version 2 section of the License file that
2098.24 * accompanied this code. If applicable, add the following below the
2098.25 * License Header, with the fields enclosed by brackets [] replaced by
2098.26 * your own identifying information:
2099.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/RowSetMetaDataXImpl.java Fri Jul 16 11:47:36 2010 -0400
2099.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/RowSetMetaDataXImpl.java Fri Jul 16 14:21:50 2010 -0400
2099.3 @@ -1,7 +1,10 @@
2099.4 /*
2099.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2099.6 *
2099.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2099.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2099.9 + *
2099.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2099.11 + * Other names may be trademarks of their respective owners.
2099.12 *
2099.13 * The contents of this file are subject to the terms of either the GNU
2099.14 * General Public License Version 2 only ("GPL") or the Common
2099.15 @@ -13,9 +16,9 @@
2099.16 * specific language governing permissions and limitations under the
2099.17 * License. When distributing the software, include this License Header
2099.18 * Notice in each file and include the License file at
2099.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2099.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2099.21 * particular file as subject to the "Classpath" exception as provided
2099.22 - * by Sun in the GPL Version 2 section of the License file that
2099.23 + * by Oracle in the GPL Version 2 section of the License file that
2099.24 * accompanied this code. If applicable, add the following below the
2099.25 * License Header, with the fields enclosed by brackets [] replaced by
2099.26 * your own identifying information:
2100.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/SyncResolverX.java Fri Jul 16 11:47:36 2010 -0400
2100.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/SyncResolverX.java Fri Jul 16 14:21:50 2010 -0400
2100.3 @@ -1,7 +1,10 @@
2100.4 /*
2100.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2100.6 *
2100.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2100.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2100.9 + *
2100.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2100.11 + * Other names may be trademarks of their respective owners.
2100.12 *
2100.13 * The contents of this file are subject to the terms of either the GNU
2100.14 * General Public License Version 2 only ("GPL") or the Common
2100.15 @@ -13,9 +16,9 @@
2100.16 * specific language governing permissions and limitations under the
2100.17 * License. When distributing the software, include this License Header
2100.18 * Notice in each file and include the License file at
2100.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2100.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2100.21 * particular file as subject to the "Classpath" exception as provided
2100.22 - * by Sun in the GPL Version 2 section of the License file that
2100.23 + * by Oracle in the GPL Version 2 section of the License file that
2100.24 * accompanied this code. If applicable, add the following below the
2100.25 * License Header, with the fields enclosed by brackets [] replaced by
2100.26 * your own identifying information:
2101.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/internal/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2101.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/internal/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2101.3 @@ -1,6 +1,9 @@
2101.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2101.5 #
2101.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2101.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2101.8 +#
2101.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2101.10 +# Other names may be trademarks of their respective owners.
2101.11 #
2101.12 # The contents of this file are subject to the terms of either the GNU
2101.13 # General Public License Version 2 only ("GPL") or the Common
2101.14 @@ -12,9 +15,9 @@
2101.15 # specific language governing permissions and limitations under the
2101.16 # License. When distributing the software, include this License Header
2101.17 # Notice in each file and include the License file at
2101.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2101.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2101.20 # particular file as subject to the "Classpath" exception as provided
2101.21 -# by Sun in the GPL Version 2 section of the License file that
2101.22 +# by Oracle in the GPL Version 2 section of the License file that
2101.23 # accompanied this code. If applicable, add the following below the
2101.24 # License Header, with the fields enclosed by brackets [] replaced by
2101.25 # your own identifying information:
2102.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/internal/CachedRowSetXReader.java Fri Jul 16 11:47:36 2010 -0400
2102.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/internal/CachedRowSetXReader.java Fri Jul 16 14:21:50 2010 -0400
2102.3 @@ -1,7 +1,10 @@
2102.4 /*
2102.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2102.6 *
2102.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2102.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2102.9 + *
2102.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2102.11 + * Other names may be trademarks of their respective owners.
2102.12 *
2102.13 * The contents of this file are subject to the terms of either the GNU
2102.14 * General Public License Version 2 only ("GPL") or the Common
2102.15 @@ -13,9 +16,9 @@
2102.16 * specific language governing permissions and limitations under the
2102.17 * License. When distributing the software, include this License Header
2102.18 * Notice in each file and include the License file at
2102.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2102.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2102.21 * particular file as subject to the "Classpath" exception as provided
2102.22 - * by Sun in the GPL Version 2 section of the License file that
2102.23 + * by Oracle in the GPL Version 2 section of the License file that
2102.24 * accompanied this code. If applicable, add the following below the
2102.25 * License Header, with the fields enclosed by brackets [] replaced by
2102.26 * your own identifying information:
2103.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/internal/CachedRowSetXWriter.java Fri Jul 16 11:47:36 2010 -0400
2103.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/internal/CachedRowSetXWriter.java Fri Jul 16 14:21:50 2010 -0400
2103.3 @@ -1,7 +1,10 @@
2103.4 /*
2103.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2103.6 *
2103.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2103.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2103.9 + *
2103.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2103.11 + * Other names may be trademarks of their respective owners.
2103.12 *
2103.13 * The contents of this file are subject to the terms of either the GNU
2103.14 * General Public License Version 2 only ("GPL") or the Common
2103.15 @@ -13,9 +16,9 @@
2103.16 * specific language governing permissions and limitations under the
2103.17 * License. When distributing the software, include this License Header
2103.18 * Notice in each file and include the License file at
2103.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2103.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2103.21 * particular file as subject to the "Classpath" exception as provided
2103.22 - * by Sun in the GPL Version 2 section of the License file that
2103.23 + * by Oracle in the GPL Version 2 section of the License file that
2103.24 * accompanied this code. If applicable, add the following below the
2103.25 * License Header, with the fields enclosed by brackets [] replaced by
2103.26 * your own identifying information:
2104.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/internal/SyncResolverXImpl.java Fri Jul 16 11:47:36 2010 -0400
2104.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/internal/SyncResolverXImpl.java Fri Jul 16 14:21:50 2010 -0400
2104.3 @@ -1,7 +1,10 @@
2104.4 /*
2104.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2104.6 *
2104.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2104.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2104.9 + *
2104.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2104.11 + * Other names may be trademarks of their respective owners.
2104.12 *
2104.13 * The contents of this file are subject to the terms of either the GNU
2104.14 * General Public License Version 2 only ("GPL") or the Common
2104.15 @@ -13,9 +16,9 @@
2104.16 * specific language governing permissions and limitations under the
2104.17 * License. When distributing the software, include this License Header
2104.18 * Notice in each file and include the License file at
2104.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2104.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2104.21 * particular file as subject to the "Classpath" exception as provided
2104.22 - * by Sun in the GPL Version 2 section of the License file that
2104.23 + * by Oracle in the GPL Version 2 section of the License file that
2104.24 * accompanied this code. If applicable, add the following below the
2104.25 * License Header, with the fields enclosed by brackets [] replaced by
2104.26 * your own identifying information:
2105.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/providers/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2105.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/providers/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2105.3 @@ -1,6 +1,9 @@
2105.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2105.5 #
2105.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2105.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2105.8 +#
2105.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2105.10 +# Other names may be trademarks of their respective owners.
2105.11 #
2105.12 # The contents of this file are subject to the terms of either the GNU
2105.13 # General Public License Version 2 only ("GPL") or the Common
2105.14 @@ -12,9 +15,9 @@
2105.15 # specific language governing permissions and limitations under the
2105.16 # License. When distributing the software, include this License Header
2105.17 # Notice in each file and include the License file at
2105.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2105.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2105.20 # particular file as subject to the "Classpath" exception as provided
2105.21 -# by Sun in the GPL Version 2 section of the License file that
2105.22 +# by Oracle in the GPL Version 2 section of the License file that
2105.23 # accompanied this code. If applicable, add the following below the
2105.24 # License Header, with the fields enclosed by brackets [] replaced by
2105.25 # your own identifying information:
2106.1 --- a/visualweb.rowset/library/src/com/sun/sql/rowset/providers/RIOptimisticProvider.java Fri Jul 16 11:47:36 2010 -0400
2106.2 +++ b/visualweb.rowset/library/src/com/sun/sql/rowset/providers/RIOptimisticProvider.java Fri Jul 16 14:21:50 2010 -0400
2106.3 @@ -1,7 +1,10 @@
2106.4 /*
2106.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2106.6 *
2106.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2106.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2106.9 + *
2106.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2106.11 + * Other names may be trademarks of their respective owners.
2106.12 *
2106.13 * The contents of this file are subject to the terms of either the GNU
2106.14 * General Public License Version 2 only ("GPL") or the Common
2106.15 @@ -13,9 +16,9 @@
2106.16 * specific language governing permissions and limitations under the
2106.17 * License. When distributing the software, include this License Header
2106.18 * Notice in each file and include the License file at
2106.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2106.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2106.21 * particular file as subject to the "Classpath" exception as provided
2106.22 - * by Sun in the GPL Version 2 section of the License file that
2106.23 + * by Oracle in the GPL Version 2 section of the License file that
2106.24 * accompanied this code. If applicable, add the following below the
2106.25 * License Header, with the fields enclosed by brackets [] replaced by
2106.26 * your own identifying information:
2107.1 --- a/visualweb.rowset/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2107.2 +++ b/visualweb.rowset/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2107.3 @@ -1,6 +1,9 @@
2107.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2107.5 #
2107.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2107.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2107.8 +#
2107.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2107.10 +# Other names may be trademarks of their respective owners.
2107.11 #
2107.12 # The contents of this file are subject to the terms of either the GNU
2107.13 # General Public License Version 2 only ("GPL") or the Common
2107.14 @@ -12,9 +15,9 @@
2107.15 # specific language governing permissions and limitations under the
2107.16 # License. When distributing the software, include this License Header
2107.17 # Notice in each file and include the License file at
2107.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2107.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2107.20 # particular file as subject to the "Classpath" exception as provided
2107.21 -# by Sun in the GPL Version 2 section of the License file that
2107.22 +# by Oracle in the GPL Version 2 section of the License file that
2107.23 # accompanied this code. If applicable, add the following below the
2107.24 # License Header, with the fields enclosed by brackets [] replaced by
2107.25 # your own identifying information:
2108.1 --- a/visualweb.rowset/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2108.2 +++ b/visualweb.rowset/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2108.3 @@ -2,7 +2,10 @@
2108.4 <!--
2108.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2108.6
2108.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2108.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2108.9 +
2108.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2108.11 +Other names may be trademarks of their respective owners.
2108.12
2108.13
2108.14 The contents of this file are subject to the terms of either the GNU
2108.15 @@ -15,9 +18,9 @@
2108.16 specific language governing permissions and limitations under the
2108.17 License. When distributing the software, include this License Header
2108.18 Notice in each file and include the License file at
2108.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2108.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2108.21 particular file as subject to the "Classpath" exception as provided
2108.22 -by Sun in the GPL Version 2 section of the License file that
2108.23 +by Oracle in the GPL Version 2 section of the License file that
2108.24 accompanied this code. If applicable, add the following below the
2108.25 License Header, with the fields enclosed by brackets [] replaced by
2108.26 your own identifying information:
2109.1 --- a/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2109.2 +++ b/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2109.3 @@ -1,6 +1,9 @@
2109.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2109.5 #
2109.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2109.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2109.8 +#
2109.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2109.10 +# Other names may be trademarks of their respective owners.
2109.11 #
2109.12 # The contents of this file are subject to the terms of either the GNU
2109.13 # General Public License Version 2 only ("GPL") or the Common
2109.14 @@ -12,9 +15,9 @@
2109.15 # specific language governing permissions and limitations under the
2109.16 # License. When distributing the software, include this License Header
2109.17 # Notice in each file and include the License file at
2109.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2109.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2109.20 # particular file as subject to the "Classpath" exception as provided
2109.21 -# by Sun in the GPL Version 2 section of the License file that
2109.22 +# by Oracle in the GPL Version 2 section of the License file that
2109.23 # accompanied this code. If applicable, add the following below the
2109.24 # License Header, with the fields enclosed by brackets [] replaced by
2109.25 # your own identifying information:
2110.1 --- a/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2110.2 +++ b/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2110.3 @@ -1,6 +1,9 @@
2110.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2110.5 #
2110.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2110.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2110.8 +#
2110.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2110.10 +# Other names may be trademarks of their respective owners.
2110.11 #
2110.12 # The contents of this file are subject to the terms of either the GNU
2110.13 # General Public License Version 2 only ("GPL") or the Common
2110.14 @@ -12,9 +15,9 @@
2110.15 # specific language governing permissions and limitations under the
2110.16 # License. When distributing the software, include this License Header
2110.17 # Notice in each file and include the License file at
2110.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2110.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2110.20 # particular file as subject to the "Classpath" exception as provided
2110.21 -# by Sun in the GPL Version 2 section of the License file that
2110.22 +# by Oracle in the GPL Version 2 section of the License file that
2110.23 # accompanied this code. If applicable, add the following below the
2110.24 # License Header, with the fields enclosed by brackets [] replaced by
2110.25 # your own identifying information:
2111.1 --- a/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/resources/jdbcsupport-designtime.xml Fri Jul 16 11:47:36 2010 -0400
2111.2 +++ b/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/resources/jdbcsupport-designtime.xml Fri Jul 16 14:21:50 2010 -0400
2111.3 @@ -2,7 +2,10 @@
2111.4 <!--
2111.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2111.6
2111.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2111.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2111.9 +
2111.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2111.11 +Other names may be trademarks of their respective owners.
2111.12
2111.13
2111.14 The contents of this file are subject to the terms of either the GNU
2111.15 @@ -15,9 +18,9 @@
2111.16 specific language governing permissions and limitations under the
2111.17 License. When distributing the software, include this License Header
2111.18 Notice in each file and include the License file at
2111.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2111.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2111.21 particular file as subject to the "Classpath" exception as provided
2111.22 -by Sun in the GPL Version 2 section of the License file that
2111.23 +by Oracle in the GPL Version 2 section of the License file that
2111.24 accompanied this code. If applicable, add the following below the
2111.25 License Header, with the fields enclosed by brackets [] replaced by
2111.26 your own identifying information:
2111.27 @@ -48,6 +51,6 @@
2111.28 <localizing-bundle>org.netbeans.modules.visualweb.rowset.resources.Bundle</localizing-bundle>
2111.29 <volume>
2111.30 <type>classpath</type>
2111.31 - <resource>jar:nbinst:///modules/ext/sqlx.jar!/</resource>
2111.32 + <resource>jar:nbinst://org.netbeans.modules.visualweb.rowset/modules/ext/sqlx.jar!/</resource>
2111.33 </volume>
2111.34 </library>
2112.1 --- a/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/resources/jdbcsupport-runtime.xml Fri Jul 16 11:47:36 2010 -0400
2112.2 +++ b/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/resources/jdbcsupport-runtime.xml Fri Jul 16 14:21:50 2010 -0400
2112.3 @@ -2,7 +2,10 @@
2112.4 <!--
2112.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2112.6
2112.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2112.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2112.9 +
2112.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2112.11 +Other names may be trademarks of their respective owners.
2112.12
2112.13
2112.14 The contents of this file are subject to the terms of either the GNU
2112.15 @@ -15,9 +18,9 @@
2112.16 specific language governing permissions and limitations under the
2112.17 License. When distributing the software, include this License Header
2112.18 Notice in each file and include the License file at
2112.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2112.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2112.21 particular file as subject to the "Classpath" exception as provided
2112.22 -by Sun in the GPL Version 2 section of the License file that
2112.23 +by Oracle in the GPL Version 2 section of the License file that
2112.24 accompanied this code. If applicable, add the following below the
2112.25 License Header, with the fields enclosed by brackets [] replaced by
2112.26 your own identifying information:
2112.27 @@ -48,6 +51,6 @@
2112.28 <localizing-bundle>org.netbeans.modules.visualweb.rowset.resources.Bundle</localizing-bundle>
2112.29 <volume>
2112.30 <type>classpath</type>
2112.31 - <resource>jar:nbinst:///modules/ext/sqlx.jar!/</resource>
2112.32 + <resource>jar:nbinst://org.netbeans.modules.visualweb.rowset/modules/ext/sqlx.jar!/</resource>
2112.33 </volume>
2112.34 </library>
2113.1 --- a/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
2113.2 +++ b/visualweb.rowset/src/org/netbeans/modules/visualweb/rowset/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
2113.3 @@ -2,7 +2,10 @@
2113.4 <!--
2113.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2113.6
2113.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2113.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2113.9 +
2113.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2113.11 +Other names may be trademarks of their respective owners.
2113.12
2113.13
2113.14 The contents of this file are subject to the terms of either the GNU
2113.15 @@ -15,9 +18,9 @@
2113.16 specific language governing permissions and limitations under the
2113.17 License. When distributing the software, include this License Header
2113.18 Notice in each file and include the License file at
2113.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2113.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2113.21 particular file as subject to the "Classpath" exception as provided
2113.22 -by Sun in the GPL Version 2 section of the License file that
2113.23 +by Oracle in the GPL Version 2 section of the License file that
2113.24 accompanied this code. If applicable, add the following below the
2113.25 License Header, with the fields enclosed by brackets [] replaced by
2113.26 your own identifying information:
2114.1 --- a/visualweb.runtime.kit/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2114.2 +++ b/visualweb.runtime.kit/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2114.3 @@ -1,6 +1,9 @@
2114.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2114.5 #
2114.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2114.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2114.8 +#
2114.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2114.10 +# Other names may be trademarks of their respective owners.
2114.11 #
2114.12 # The contents of this file are subject to the terms of either the GNU
2114.13 # General Public License Version 2 only ("GPL") or the Common
2114.14 @@ -12,9 +15,9 @@
2114.15 # specific language governing permissions and limitations under the
2114.16 # License. When distributing the software, include this License Header
2114.17 # Notice in each file and include the License file at
2114.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2114.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2114.20 # particular file as subject to the "Classpath" exception as provided
2114.21 -# by Sun in the GPL Version 2 section of the License file that
2114.22 +# by Oracle in the GPL Version 2 section of the License file that
2114.23 # accompanied this code. If applicable, add the following below the
2114.24 # License Header, with the fields enclosed by brackets [] replaced by
2114.25 # your own identifying information:
2114.26 @@ -37,5 +40,5 @@
2114.27 # Version 2 license, then the option applies only if the new code is
2114.28 # made subject to such option by the copyright holder.
2114.29
2114.30 -javac.source=1.5
2114.31 +javac.source=1.6
2114.32 javac.compilerargs=-Xlint -Xlint:-serial
2115.1 --- a/visualweb.runtime.kit/src/org/netbeans/modules/visualweb/runtime/kit/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2115.2 +++ b/visualweb.runtime.kit/src/org/netbeans/modules/visualweb/runtime/kit/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2115.3 @@ -1,6 +1,9 @@
2115.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2115.5 #
2115.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2115.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2115.8 +#
2115.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2115.10 +# Other names may be trademarks of their respective owners.
2115.11 #
2115.12 # The contents of this file are subject to the terms of either the GNU
2115.13 # General Public License Version 2 only ("GPL") or the Common
2115.14 @@ -12,9 +15,9 @@
2115.15 # specific language governing permissions and limitations under the
2115.16 # License. When distributing the software, include this License Header
2115.17 # Notice in each file and include the License file at
2115.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2115.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2115.20 # particular file as subject to the "Classpath" exception as provided
2115.21 -# by Sun in the GPL Version 2 section of the License file that
2115.22 +# by Oracle in the GPL Version 2 section of the License file that
2115.23 # accompanied this code. If applicable, add the following below the
2115.24 # License Header, with the fields enclosed by brackets [] replaced by
2115.25 # your own identifying information:
2116.1 --- a/visualweb.samples.bundled/build.xml Fri Jul 16 11:47:36 2010 -0400
2116.2 +++ b/visualweb.samples.bundled/build.xml Fri Jul 16 14:21:50 2010 -0400
2116.3 @@ -2,7 +2,10 @@
2116.4 <!--
2116.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2116.6
2116.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2116.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2116.9 +
2116.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2116.11 +Other names may be trademarks of their respective owners.
2116.12
2116.13
2116.14 The contents of this file are subject to the terms of either the GNU
2116.15 @@ -15,9 +18,9 @@
2116.16 specific language governing permissions and limitations under the
2116.17 License. When distributing the software, include this License Header
2116.18 Notice in each file and include the License file at
2116.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2116.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2116.21 particular file as subject to the "Classpath" exception as provided
2116.22 -by Sun in the GPL Version 2 section of the License file that
2116.23 +by Oracle in the GPL Version 2 section of the License file that
2116.24 accompanied this code. If applicable, add the following below the
2116.25 License Header, with the fields enclosed by brackets [] replaced by
2116.26 your own identifying information:
2117.1 --- a/visualweb.samples.bundled/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2117.2 +++ b/visualweb.samples.bundled/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2117.3 @@ -1,6 +1,9 @@
2117.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2117.5 #
2117.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2117.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2117.8 +#
2117.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2117.10 +# Other names may be trademarks of their respective owners.
2117.11 #
2117.12 # The contents of this file are subject to the terms of either the GNU
2117.13 # General Public License Version 2 only ("GPL") or the Common
2117.14 @@ -12,9 +15,9 @@
2117.15 # specific language governing permissions and limitations under the
2117.16 # License. When distributing the software, include this License Header
2117.17 # Notice in each file and include the License file at
2117.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2117.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2117.20 # particular file as subject to the "Classpath" exception as provided
2117.21 -# by Sun in the GPL Version 2 section of the License file that
2117.22 +# by Oracle in the GPL Version 2 section of the License file that
2117.23 # accompanied this code. If applicable, add the following below the
2117.24 # License Header, with the fields enclosed by brackets [] replaced by
2117.25 # your own identifying information:
2117.26 @@ -37,4 +40,4 @@
2117.27 # Version 2 license, then the option applies only if the new code is
2117.28 # made subject to such option by the copyright holder.
2117.29 javac.compilerargs=-Xlint:unchecked
2117.30 -javac.source=1.5
2117.31 +javac.source=1.6
2118.1 --- a/visualweb.samples.bundled/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2118.2 +++ b/visualweb.samples.bundled/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2118.3 @@ -2,7 +2,10 @@
2118.4 <!--
2118.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2118.6
2118.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2118.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2118.9 +
2118.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2118.11 +Other names may be trademarks of their respective owners.
2118.12
2118.13
2118.14 The contents of this file are subject to the terms of either the GNU
2118.15 @@ -15,9 +18,9 @@
2118.16 specific language governing permissions and limitations under the
2118.17 License. When distributing the software, include this License Header
2118.18 Notice in each file and include the License file at
2118.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2118.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2118.21 particular file as subject to the "Classpath" exception as provided
2118.22 -by Sun in the GPL Version 2 section of the License file that
2118.23 +by Oracle in the GPL Version 2 section of the License file that
2118.24 accompanied this code. If applicable, add the following below the
2118.25 License Header, with the fields enclosed by brackets [] replaced by
2118.26 your own identifying information:
2118.27 @@ -132,7 +135,15 @@
2118.28 <build-prerequisite/>
2118.29 <compile-dependency/>
2118.30 <run-dependency>
2118.31 - <specification-version>7.4.1</specification-version>
2118.32 + <specification-version>8.0</specification-version>
2118.33 + </run-dependency>
2118.34 + </dependency>
2118.35 + <dependency>
2118.36 + <code-name-base>org.openide.util.lookup</code-name-base>
2118.37 + <build-prerequisite/>
2118.38 + <compile-dependency/>
2118.39 + <run-dependency>
2118.40 + <specification-version>8.0</specification-version>
2118.41 </run-dependency>
2118.42 </dependency>
2118.43 </module-dependencies>
2119.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2119.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2119.3 @@ -1,6 +1,9 @@
2119.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2119.5 #
2119.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2119.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2119.8 +#
2119.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2119.10 +# Other names may be trademarks of their respective owners.
2119.11 #
2119.12 # The contents of this file are subject to the terms of either the GNU
2119.13 # General Public License Version 2 only ("GPL") or the Common
2119.14 @@ -12,9 +15,9 @@
2119.15 # specific language governing permissions and limitations under the
2119.16 # License. When distributing the software, include this License Header
2119.17 # Notice in each file and include the License file at
2119.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2119.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2119.20 # particular file as subject to the "Classpath" exception as provided
2119.21 -# by Sun in the GPL Version 2 section of the License file that
2119.22 +# by Oracle in the GPL Version 2 section of the License file that
2119.23 # accompanied this code. If applicable, add the following below the
2119.24 # License Header, with the fields enclosed by brackets [] replaced by
2119.25 # your own identifying information:
2120.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/BundledModuleInstaller.java Fri Jul 16 11:47:36 2010 -0400
2120.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/BundledModuleInstaller.java Fri Jul 16 14:21:50 2010 -0400
2120.3 @@ -1,7 +1,10 @@
2120.4 /*
2120.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2120.6 *
2120.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2120.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2120.9 + *
2120.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2120.11 + * Other names may be trademarks of their respective owners.
2120.12 *
2120.13 * The contents of this file are subject to the terms of either the GNU
2120.14 * General Public License Version 2 only ("GPL") or the Common
2120.15 @@ -13,9 +16,9 @@
2120.16 * specific language governing permissions and limitations under the
2120.17 * License. When distributing the software, include this License Header
2120.18 * Notice in each file and include the License file at
2120.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2120.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2120.21 * particular file as subject to the "Classpath" exception as provided
2120.22 - * by Sun in the GPL Version 2 section of the License file that
2120.23 + * by Oracle in the GPL Version 2 section of the License file that
2120.24 * accompanied this code. If applicable, add the following below the
2120.25 * License Header, with the fields enclosed by brackets [] replaced by
2120.26 * your own identifying information:
2121.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/codeclips/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2121.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/codeclips/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2121.3 @@ -1,6 +1,9 @@
2121.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2121.5 #
2121.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2121.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2121.8 +#
2121.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2121.10 +# Other names may be trademarks of their respective owners.
2121.11 #
2121.12 # The contents of this file are subject to the terms of either the GNU
2121.13 # General Public License Version 2 only ("GPL") or the Common
2121.14 @@ -12,9 +15,9 @@
2121.15 # specific language governing permissions and limitations under the
2121.16 # License. When distributing the software, include this License Header
2121.17 # Notice in each file and include the License file at
2121.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2121.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2121.20 # particular file as subject to the "Classpath" exception as provided
2121.21 -# by Sun in the GPL Version 2 section of the License file that
2121.22 +# by Oracle in the GPL Version 2 section of the License file that
2121.23 # accompanied this code. If applicable, add the following below the
2121.24 # License Header, with the fields enclosed by brackets [] replaced by
2121.25 # your own identifying information:
2122.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/codeclips/TravelPrerender.xml Fri Jul 16 11:47:36 2010 -0400
2122.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/codeclips/TravelPrerender.xml Fri Jul 16 14:21:50 2010 -0400
2122.3 @@ -2,7 +2,10 @@
2122.4 <!--
2122.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2122.6
2122.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2122.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2122.9 +
2122.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2122.11 +Other names may be trademarks of their respective owners.
2122.12
2122.13
2122.14 The contents of this file are subject to the terms of either the GNU
2122.15 @@ -15,9 +18,9 @@
2122.16 specific language governing permissions and limitations under the
2122.17 License. When distributing the software, include this License Header
2122.18 Notice in each file and include the License file at
2122.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2122.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2122.21 particular file as subject to the "Classpath" exception as provided
2122.22 -by Sun in the GPL Version 2 section of the License file that
2122.23 +by Oracle in the GPL Version 2 section of the License file that
2122.24 accompanied this code. If applicable, add the following below the
2122.25 License Header, with the fields enclosed by brackets [] replaced by
2122.26 your own identifying information:
2123.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/layer.xml Fri Jul 16 11:47:36 2010 -0400
2123.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/layer.xml Fri Jul 16 14:21:50 2010 -0400
2123.3 @@ -2,7 +2,10 @@
2123.4 <!--
2123.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2123.6
2123.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2123.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2123.9 +
2123.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2123.11 +Other names may be trademarks of their respective owners.
2123.12
2123.13
2123.14 The contents of this file are subject to the terms of either the GNU
2123.15 @@ -15,9 +18,9 @@
2123.16 specific language governing permissions and limitations under the
2123.17 License. When distributing the software, include this License Header
2123.18 Notice in each file and include the License file at
2123.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2123.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2123.21 particular file as subject to the "Classpath" exception as provided
2123.22 -by Sun in the GPL Version 2 section of the License file that
2123.23 +by Oracle in the GPL Version 2 section of the License file that
2123.24 accompanied this code. If applicable, add the following below the
2123.25 License Header, with the fields enclosed by brackets [] replaced by
2123.26 your own identifying information:
2124.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2124.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2124.3 @@ -1,6 +1,9 @@
2124.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2124.5 #
2124.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2124.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2124.8 +#
2124.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2124.10 +# Other names may be trademarks of their respective owners.
2124.11 #
2124.12 # The contents of this file are subject to the terms of either the GNU
2124.13 # General Public License Version 2 only ("GPL") or the Common
2124.14 @@ -12,9 +15,9 @@
2124.15 # specific language governing permissions and limitations under the
2124.16 # License. When distributing the software, include this License Header
2124.17 # Notice in each file and include the License file at
2124.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2124.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2124.20 # particular file as subject to the "Classpath" exception as provided
2124.21 -# by Sun in the GPL Version 2 section of the License file that
2124.22 +# by Oracle in the GPL Version 2 section of the License file that
2124.23 # accompanied this code. If applicable, add the following below the
2124.24 # License Header, with the fields enclosed by brackets [] replaced by
2124.25 # your own identifying information:
2125.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/SamplesWebVisualPanel.java Fri Jul 16 11:47:36 2010 -0400
2125.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/SamplesWebVisualPanel.java Fri Jul 16 14:21:50 2010 -0400
2125.3 @@ -1,7 +1,10 @@
2125.4 /*
2125.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2125.6 *
2125.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2125.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2125.9 + *
2125.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2125.11 + * Other names may be trademarks of their respective owners.
2125.12 *
2125.13 * The contents of this file are subject to the terms of either the GNU
2125.14 * General Public License Version 2 only ("GPL") or the Common
2125.15 @@ -13,9 +16,9 @@
2125.16 * specific language governing permissions and limitations under the
2125.17 * License. When distributing the software, include this License Header
2125.18 * Notice in each file and include the License file at
2125.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2125.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2125.21 * particular file as subject to the "Classpath" exception as provided
2125.22 - * by Sun in the GPL Version 2 section of the License file that
2125.23 + * by Oracle in the GPL Version 2 section of the License file that
2125.24 * accompanied this code. If applicable, add the following below the
2125.25 * License Header, with the fields enclosed by brackets [] replaced by
2125.26 * your own identifying information:
2126.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/SamplesWebWizardIterator.java Fri Jul 16 11:47:36 2010 -0400
2126.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/SamplesWebWizardIterator.java Fri Jul 16 14:21:50 2010 -0400
2126.3 @@ -1,7 +1,10 @@
2126.4 /*
2126.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2126.6 *
2126.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2126.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2126.9 + *
2126.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2126.11 + * Other names may be trademarks of their respective owners.
2126.12 *
2126.13 * The contents of this file are subject to the terms of either the GNU
2126.14 * General Public License Version 2 only ("GPL") or the Common
2126.15 @@ -13,9 +16,9 @@
2126.16 * specific language governing permissions and limitations under the
2126.17 * License. When distributing the software, include this License Header
2126.18 * Notice in each file and include the License file at
2126.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2126.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2126.21 * particular file as subject to the "Classpath" exception as provided
2126.22 - * by Sun in the GPL Version 2 section of the License file that
2126.23 + * by Oracle in the GPL Version 2 section of the License file that
2126.24 * accompanied this code. If applicable, add the following below the
2126.25 * License Header, with the fields enclosed by brackets [] replaced by
2126.26 * your own identifying information:
2127.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/SamplesWebWizardPanel.java Fri Jul 16 11:47:36 2010 -0400
2127.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/SamplesWebWizardPanel.java Fri Jul 16 14:21:50 2010 -0400
2127.3 @@ -1,7 +1,10 @@
2127.4 /*
2127.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2127.6 *
2127.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2127.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2127.9 + *
2127.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2127.11 + * Other names may be trademarks of their respective owners.
2127.12 *
2127.13 * The contents of this file are subject to the terms of either the GNU
2127.14 * General Public License Version 2 only ("GPL") or the Common
2127.15 @@ -13,9 +16,9 @@
2127.16 * specific language governing permissions and limitations under the
2127.17 * License. When distributing the software, include this License Header
2127.18 * Notice in each file and include the License file at
2127.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2127.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2127.21 * particular file as subject to the "Classpath" exception as provided
2127.22 - * by Sun in the GPL Version 2 section of the License file that
2127.23 + * by Oracle in the GPL Version 2 section of the License file that
2127.24 * accompanied this code. If applicable, add the following below the
2127.25 * License Header, with the fields enclosed by brackets [] replaced by
2127.26 * your own identifying information:
2128.1 --- a/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/WizardProperties.java Fri Jul 16 11:47:36 2010 -0400
2128.2 +++ b/visualweb.samples.bundled/src/org/netbeans/modules/visualweb/samples/bundled/wizard/WizardProperties.java Fri Jul 16 14:21:50 2010 -0400
2128.3 @@ -1,7 +1,10 @@
2128.4 /*
2128.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2128.6 *
2128.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2128.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2128.9 + *
2128.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2128.11 + * Other names may be trademarks of their respective owners.
2128.12 *
2128.13 * The contents of this file are subject to the terms of either the GNU
2128.14 * General Public License Version 2 only ("GPL") or the Common
2128.15 @@ -13,9 +16,9 @@
2128.16 * specific language governing permissions and limitations under the
2128.17 * License. When distributing the software, include this License Header
2128.18 * Notice in each file and include the License file at
2128.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2128.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2128.21 * particular file as subject to the "Classpath" exception as provided
2128.22 - * by Sun in the GPL Version 2 section of the License file that
2128.23 + * by Oracle in the GPL Version 2 section of the License file that
2128.24 * accompanied this code. If applicable, add the following below the
2128.25 * License Header, with the fields enclosed by brackets [] replaced by
2128.26 * your own identifying information:
2129.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/build.xml Fri Jul 16 11:47:36 2010 -0400
2129.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/build.xml Fri Jul 16 14:21:50 2010 -0400
2129.3 @@ -2,7 +2,10 @@
2129.4 <!--
2129.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2129.6
2129.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2129.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2129.9 +
2129.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2129.11 +Other names may be trademarks of their respective owners.
2129.12
2129.13
2129.14 The contents of this file are subject to the terms of either the GNU
2129.15 @@ -15,9 +18,9 @@
2129.16 specific language governing permissions and limitations under the
2129.17 License. When distributing the software, include this License Header
2129.18 Notice in each file and include the License file at
2129.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2129.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2129.21 particular file as subject to the "Classpath" exception as provided
2129.22 -by Sun in the GPL Version 2 section of the License file that
2129.23 +by Oracle in the GPL Version 2 section of the License file that
2129.24 accompanied this code. If applicable, add the following below the
2129.25 License Header, with the fields enclosed by brackets [] replaced by
2129.26 your own identifying information:
2130.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2130.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2130.3 @@ -1,6 +1,9 @@
2130.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2130.5 #
2130.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2130.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2130.8 +#
2130.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2130.10 +# Other names may be trademarks of their respective owners.
2130.11 #
2130.12 # The contents of this file are subject to the terms of either the GNU
2130.13 # General Public License Version 2 only ("GPL") or the Common
2130.14 @@ -12,9 +15,9 @@
2130.15 # specific language governing permissions and limitations under the
2130.16 # License. When distributing the software, include this License Header
2130.17 # Notice in each file and include the License file at
2130.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2130.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2130.20 # particular file as subject to the "Classpath" exception as provided
2130.21 -# by Sun in the GPL Version 2 section of the License file that
2130.22 +# by Oracle in the GPL Version 2 section of the License file that
2130.23 # accompanied this code. If applicable, add the following below the
2130.24 # License Header, with the fields enclosed by brackets [] replaced by
2130.25 # your own identifying information:
2131.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2131.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2131.3 @@ -2,7 +2,10 @@
2131.4 <!--
2131.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2131.6
2131.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2131.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2131.9 +
2131.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2131.11 +Other names may be trademarks of their respective owners.
2131.12
2131.13
2131.14 The contents of this file are subject to the terms of either the GNU
2131.15 @@ -15,9 +18,9 @@
2131.16 specific language governing permissions and limitations under the
2131.17 License. When distributing the software, include this License Header
2131.18 Notice in each file and include the License file at
2131.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2131.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2131.21 particular file as subject to the "Classpath" exception as provided
2131.22 -by Sun in the GPL Version 2 section of the License file that
2131.23 +by Oracle in the GPL Version 2 section of the License file that
2131.24 accompanied this code. If applicable, add the following below the
2131.25 License Header, with the fields enclosed by brackets [] replaced by
2131.26 your own identifying information:
2132.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/ApplicationBean1.java Fri Jul 16 11:47:36 2010 -0400
2132.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/ApplicationBean1.java Fri Jul 16 14:21:50 2010 -0400
2132.3 @@ -1,7 +1,10 @@
2132.4 /*
2132.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2132.6 *
2132.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2132.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2132.9 + *
2132.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2132.11 + * Other names may be trademarks of their respective owners.
2132.12 *
2132.13 * The contents of this file are subject to the terms of either the GNU
2132.14 * General Public License Version 2 only ("GPL") or the Common
2132.15 @@ -13,9 +16,9 @@
2132.16 * specific language governing permissions and limitations under the
2132.17 * License. When distributing the software, include this License Header
2132.18 * Notice in each file and include the License file at
2132.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2132.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2132.21 * particular file as subject to the "Classpath" exception as provided
2132.22 - * by Sun in the GPL Version 2 section of the License file that
2132.23 + * by Oracle in the GPL Version 2 section of the License file that
2132.24 * accompanied this code. If applicable, add the following below the
2132.25 * License Header, with the fields enclosed by brackets [] replaced by
2132.26 * your own identifying information:
2133.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2133.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2133.3 @@ -1,6 +1,9 @@
2133.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2133.5 #
2133.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2133.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2133.8 +#
2133.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2133.10 +# Other names may be trademarks of their respective owners.
2133.11 #
2133.12 # The contents of this file are subject to the terms of either the GNU
2133.13 # General Public License Version 2 only ("GPL") or the Common
2133.14 @@ -12,9 +15,9 @@
2133.15 # specific language governing permissions and limitations under the
2133.16 # License. When distributing the software, include this License Header
2133.17 # Notice in each file and include the License file at
2133.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2133.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2133.20 # particular file as subject to the "Classpath" exception as provided
2133.21 -# by Sun in the GPL Version 2 section of the License file that
2133.22 +# by Oracle in the GPL Version 2 section of the License file that
2133.23 # accompanied this code. If applicable, add the following below the
2133.24 # License Header, with the fields enclosed by brackets [] replaced by
2133.25 # your own identifying information:
2134.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/Masthead.java Fri Jul 16 11:47:36 2010 -0400
2134.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/Masthead.java Fri Jul 16 14:21:50 2010 -0400
2134.3 @@ -1,7 +1,10 @@
2134.4 /*
2134.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2134.6 *
2134.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2134.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2134.9 + *
2134.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2134.11 + * Other names may be trademarks of their respective owners.
2134.12 *
2134.13 * The contents of this file are subject to the terms of either the GNU
2134.14 * General Public License Version 2 only ("GPL") or the Common
2134.15 @@ -13,9 +16,9 @@
2134.16 * specific language governing permissions and limitations under the
2134.17 * License. When distributing the software, include this License Header
2134.18 * Notice in each file and include the License file at
2134.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2134.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2134.21 * particular file as subject to the "Classpath" exception as provided
2134.22 - * by Sun in the GPL Version 2 section of the License file that
2134.23 + * by Oracle in the GPL Version 2 section of the License file that
2134.24 * accompanied this code. If applicable, add the following below the
2134.25 * License Header, with the fields enclosed by brackets [] replaced by
2134.26 * your own identifying information:
2135.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/Page1.java Fri Jul 16 11:47:36 2010 -0400
2135.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/Page1.java Fri Jul 16 14:21:50 2010 -0400
2135.3 @@ -1,7 +1,10 @@
2135.4 /*
2135.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2135.6 *
2135.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2135.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2135.9 + *
2135.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2135.11 + * Other names may be trademarks of their respective owners.
2135.12 *
2135.13 * The contents of this file are subject to the terms of either the GNU
2135.14 * General Public License Version 2 only ("GPL") or the Common
2135.15 @@ -13,9 +16,9 @@
2135.16 * specific language governing permissions and limitations under the
2135.17 * License. When distributing the software, include this License Header
2135.18 * Notice in each file and include the License file at
2135.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2135.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2135.21 * particular file as subject to the "Classpath" exception as provided
2135.22 - * by Sun in the GPL Version 2 section of the License file that
2135.23 + * by Oracle in the GPL Version 2 section of the License file that
2135.24 * accompanied this code. If applicable, add the following below the
2135.25 * License Header, with the fields enclosed by brackets [] replaced by
2135.26 * your own identifying information:
2136.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/Preview.java Fri Jul 16 11:47:36 2010 -0400
2136.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/Preview.java Fri Jul 16 14:21:50 2010 -0400
2136.3 @@ -1,7 +1,10 @@
2136.4 /*
2136.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2136.6 *
2136.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2136.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2136.9 + *
2136.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2136.11 + * Other names may be trademarks of their respective owners.
2136.12 *
2136.13 * The contents of this file are subject to the terms of either the GNU
2136.14 * General Public License Version 2 only ("GPL") or the Common
2136.15 @@ -13,9 +16,9 @@
2136.16 * specific language governing permissions and limitations under the
2136.17 * License. When distributing the software, include this License Header
2136.18 * Notice in each file and include the License file at
2136.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2136.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2136.21 * particular file as subject to the "Classpath" exception as provided
2136.22 - * by Sun in the GPL Version 2 section of the License file that
2136.23 + * by Oracle in the GPL Version 2 section of the License file that
2136.24 * accompanied this code. If applicable, add the following below the
2136.25 * License Header, with the fields enclosed by brackets [] replaced by
2136.26 * your own identifying information:
2137.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/RequestBean1.java Fri Jul 16 11:47:36 2010 -0400
2137.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/RequestBean1.java Fri Jul 16 14:21:50 2010 -0400
2137.3 @@ -1,7 +1,10 @@
2137.4 /*
2137.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2137.6 *
2137.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2137.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2137.9 + *
2137.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2137.11 + * Other names may be trademarks of their respective owners.
2137.12 *
2137.13 * The contents of this file are subject to the terms of either the GNU
2137.14 * General Public License Version 2 only ("GPL") or the Common
2137.15 @@ -13,9 +16,9 @@
2137.16 * specific language governing permissions and limitations under the
2137.17 * License. When distributing the software, include this License Header
2137.18 * Notice in each file and include the License file at
2137.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2137.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2137.21 * particular file as subject to the "Classpath" exception as provided
2137.22 - * by Sun in the GPL Version 2 section of the License file that
2137.23 + * by Oracle in the GPL Version 2 section of the License file that
2137.24 * accompanied this code. If applicable, add the following below the
2137.25 * License Header, with the fields enclosed by brackets [] replaced by
2137.26 * your own identifying information:
2138.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/SessionBean1.java Fri Jul 16 11:47:36 2010 -0400
2138.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieadmin/SessionBean1.java Fri Jul 16 14:21:50 2010 -0400
2138.3 @@ -1,7 +1,10 @@
2138.4 /*
2138.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2138.6 *
2138.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2138.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2138.9 + *
2138.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2138.11 + * Other names may be trademarks of their respective owners.
2138.12 *
2138.13 * The contents of this file are subject to the terms of either the GNU
2138.14 * General Public License Version 2 only ("GPL") or the Common
2138.15 @@ -13,9 +16,9 @@
2138.16 * specific language governing permissions and limitations under the
2138.17 * License. When distributing the software, include this License Header
2138.18 * Notice in each file and include the License file at
2138.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2138.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2138.21 * particular file as subject to the "Classpath" exception as provided
2138.22 - * by Sun in the GPL Version 2 section of the License file that
2138.23 + * by Oracle in the GPL Version 2 section of the License file that
2138.24 * accompanied this code. If applicable, add the following below the
2138.25 * License Header, with the fields enclosed by brackets [] replaced by
2138.26 * your own identifying information:
2139.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieslib/Movie.java Fri Jul 16 11:47:36 2010 -0400
2139.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieslib/Movie.java Fri Jul 16 14:21:50 2010 -0400
2139.3 @@ -1,7 +1,10 @@
2139.4 /*
2139.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2139.6 *
2139.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2139.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2139.9 + *
2139.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2139.11 + * Other names may be trademarks of their respective owners.
2139.12 *
2139.13 * The contents of this file are subject to the terms of either the GNU
2139.14 * General Public License Version 2 only ("GPL") or the Common
2139.15 @@ -13,9 +16,9 @@
2139.16 * specific language governing permissions and limitations under the
2139.17 * License. When distributing the software, include this License Header
2139.18 * Notice in each file and include the License file at
2139.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2139.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2139.21 * particular file as subject to the "Classpath" exception as provided
2139.22 - * by Sun in the GPL Version 2 section of the License file that
2139.23 + * by Oracle in the GPL Version 2 section of the License file that
2139.24 * accompanied this code. If applicable, add the following below the
2139.25 * License Header, with the fields enclosed by brackets [] replaced by
2139.26 * your own identifying information:
2140.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieslib/MovieListDataProvider.java Fri Jul 16 11:47:36 2010 -0400
2140.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/src/java/movieslib/MovieListDataProvider.java Fri Jul 16 14:21:50 2010 -0400
2140.3 @@ -1,7 +1,10 @@
2140.4 /*
2140.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2140.6 *
2140.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2140.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2140.9 + *
2140.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2140.11 + * Other names may be trademarks of their respective owners.
2140.12 *
2140.13 * The contents of this file are subject to the terms of either the GNU
2140.14 * General Public License Version 2 only ("GPL") or the Common
2140.15 @@ -13,9 +16,9 @@
2140.16 * specific language governing permissions and limitations under the
2140.17 * License. When distributing the software, include this License Header
2140.18 * Notice in each file and include the License file at
2140.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2140.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2140.21 * particular file as subject to the "Classpath" exception as provided
2140.22 - * by Sun in the GPL Version 2 section of the License file that
2140.23 + * by Oracle in the GPL Version 2 section of the License file that
2140.24 * accompanied this code. If applicable, add the following below the
2140.25 * License Header, with the fields enclosed by brackets [] replaced by
2140.26 * your own identifying information:
2141.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/web/Masthead.jspf Fri Jul 16 11:47:36 2010 -0400
2141.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/web/Masthead.jspf Fri Jul 16 14:21:50 2010 -0400
2141.3 @@ -2,7 +2,10 @@
2141.4 <!--
2141.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2141.6 *
2141.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
2141.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2141.9 + *
2141.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2141.11 + * Other names may be trademarks of their respective owners.
2141.12 *
2141.13 * The contents of this file are subject to the terms of either the GNU
2141.14 * General Public License Version 2 only ("GPL") or the Common
2141.15 @@ -14,9 +17,9 @@
2141.16 * specific language governing permissions and limitations under the
2141.17 * License. When distributing the software, include this License Header
2141.18 * Notice in each file and include the License file at
2141.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2141.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2141.21 * particular file as subject to the "Classpath" exception as provided
2141.22 - * by Sun in the GPL Version 2 section of the License file that
2141.23 + * by Oracle in the GPL Version 2 section of the License file that
2141.24 * accompanied this code. If applicable, add the following below the
2141.25 * License Header, with the fields enclosed by brackets [] replaced by
2141.26 * your own identifying information:
2142.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/web/Page1.jsp Fri Jul 16 11:47:36 2010 -0400
2142.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/web/Page1.jsp Fri Jul 16 14:21:50 2010 -0400
2142.3 @@ -1,6 +1,6 @@
2142.4 <?xml version="1.0" encoding="UTF-8"?>
2142.5 <!--
2142.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2142.7 + Copyright (c) 2010, Oracle. All rights reserved.
2142.8
2142.9 Redistribution and use in source and binary forms, with or without
2142.10 modification, are permitted provided that the following conditions are met:
2142.11 @@ -12,7 +12,7 @@
2142.12 this list of conditions and the following disclaimer in the documentation
2142.13 and/or other materials provided with the distribution.
2142.14
2142.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2142.16 + * Neither the name of Oracle nor the names of its contributors
2142.17 may be used to endorse or promote products derived from this software without
2142.18 specific prior written permission.
2142.19
2143.1 --- a/visualweb.samples.bundled/webapps/MovieAdmin/web/Preview.jsp Fri Jul 16 11:47:36 2010 -0400
2143.2 +++ b/visualweb.samples.bundled/webapps/MovieAdmin/web/Preview.jsp Fri Jul 16 14:21:50 2010 -0400
2143.3 @@ -1,6 +1,6 @@
2143.4 <?xml version="1.0" encoding="UTF-8"?>
2143.5 <!--
2143.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2143.7 + Copyright (c) 2010, Oracle. All rights reserved.
2143.8
2143.9 Redistribution and use in source and binary forms, with or without
2143.10 modification, are permitted provided that the following conditions are met:
2143.11 @@ -12,7 +12,7 @@
2143.12 this list of conditions and the following disclaimer in the documentation
2143.13 and/or other materials provided with the distribution.
2143.14
2143.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2143.16 + * Neither the name of Oracle nor the names of its contributors
2143.17 may be used to endorse or promote products derived from this software without
2143.18 specific prior written permission.
2143.19
2144.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/build.xml Fri Jul 16 11:47:36 2010 -0400
2144.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/build.xml Fri Jul 16 14:21:50 2010 -0400
2144.3 @@ -2,7 +2,10 @@
2144.4 <!--
2144.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2144.6
2144.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2144.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2144.9 +
2144.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2144.11 +Other names may be trademarks of their respective owners.
2144.12
2144.13
2144.14 The contents of this file are subject to the terms of either the GNU
2144.15 @@ -15,9 +18,9 @@
2144.16 specific language governing permissions and limitations under the
2144.17 License. When distributing the software, include this License Header
2144.18 Notice in each file and include the License file at
2144.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2144.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2144.21 particular file as subject to the "Classpath" exception as provided
2144.22 -by Sun in the GPL Version 2 section of the License file that
2144.23 +by Oracle in the GPL Version 2 section of the License file that
2144.24 accompanied this code. If applicable, add the following below the
2144.25 License Header, with the fields enclosed by brackets [] replaced by
2144.26 your own identifying information:
2145.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2145.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2145.3 @@ -1,6 +1,9 @@
2145.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2145.5 #
2145.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2145.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2145.8 +#
2145.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2145.10 +# Other names may be trademarks of their respective owners.
2145.11 #
2145.12 # The contents of this file are subject to the terms of either the GNU
2145.13 # General Public License Version 2 only ("GPL") or the Common
2145.14 @@ -12,9 +15,9 @@
2145.15 # specific language governing permissions and limitations under the
2145.16 # License. When distributing the software, include this License Header
2145.17 # Notice in each file and include the License file at
2145.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2145.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2145.20 # particular file as subject to the "Classpath" exception as provided
2145.21 -# by Sun in the GPL Version 2 section of the License file that
2145.22 +# by Oracle in the GPL Version 2 section of the License file that
2145.23 # accompanied this code. If applicable, add the following below the
2145.24 # License Header, with the fields enclosed by brackets [] replaced by
2145.25 # your own identifying information:
2146.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2146.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2146.3 @@ -2,7 +2,10 @@
2146.4 <!--
2146.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2146.6
2146.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2146.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2146.9 +
2146.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2146.11 +Other names may be trademarks of their respective owners.
2146.12
2146.13
2146.14 The contents of this file are subject to the terms of either the GNU
2146.15 @@ -15,9 +18,9 @@
2146.16 specific language governing permissions and limitations under the
2146.17 License. When distributing the software, include this License Header
2146.18 Notice in each file and include the License file at
2146.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2146.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2146.21 particular file as subject to the "Classpath" exception as provided
2146.22 -by Sun in the GPL Version 2 section of the License file that
2146.23 +by Oracle in the GPL Version 2 section of the License file that
2146.24 accompanied this code. If applicable, add the following below the
2146.25 License Header, with the fields enclosed by brackets [] replaced by
2146.26 your own identifying information:
2147.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/ApplicationBean1.java Fri Jul 16 11:47:36 2010 -0400
2147.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/ApplicationBean1.java Fri Jul 16 14:21:50 2010 -0400
2147.3 @@ -1,7 +1,10 @@
2147.4 /*
2147.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2147.6 *
2147.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2147.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2147.9 + *
2147.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2147.11 + * Other names may be trademarks of their respective owners.
2147.12 *
2147.13 * The contents of this file are subject to the terms of either the GNU
2147.14 * General Public License Version 2 only ("GPL") or the Common
2147.15 @@ -13,9 +16,9 @@
2147.16 * specific language governing permissions and limitations under the
2147.17 * License. When distributing the software, include this License Header
2147.18 * Notice in each file and include the License file at
2147.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2147.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2147.21 * particular file as subject to the "Classpath" exception as provided
2147.22 - * by Sun in the GPL Version 2 section of the License file that
2147.23 + * by Oracle in the GPL Version 2 section of the License file that
2147.24 * accompanied this code. If applicable, add the following below the
2147.25 * License Header, with the fields enclosed by brackets [] replaced by
2147.26 * your own identifying information:
2148.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2148.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2148.3 @@ -1,6 +1,9 @@
2148.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2148.5 #
2148.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2148.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2148.8 +#
2148.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2148.10 +# Other names may be trademarks of their respective owners.
2148.11 #
2148.12 # The contents of this file are subject to the terms of either the GNU
2148.13 # General Public License Version 2 only ("GPL") or the Common
2148.14 @@ -12,9 +15,9 @@
2148.15 # specific language governing permissions and limitations under the
2148.16 # License. When distributing the software, include this License Header
2148.17 # Notice in each file and include the License file at
2148.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2148.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2148.20 # particular file as subject to the "Classpath" exception as provided
2148.21 -# by Sun in the GPL Version 2 section of the License file that
2148.22 +# by Oracle in the GPL Version 2 section of the License file that
2148.23 # accompanied this code. If applicable, add the following below the
2148.24 # License Header, with the fields enclosed by brackets [] replaced by
2148.25 # your own identifying information:
2149.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/Masthead.java Fri Jul 16 11:47:36 2010 -0400
2149.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/Masthead.java Fri Jul 16 14:21:50 2010 -0400
2149.3 @@ -1,7 +1,10 @@
2149.4 /*
2149.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2149.6 *
2149.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2149.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2149.9 + *
2149.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2149.11 + * Other names may be trademarks of their respective owners.
2149.12 *
2149.13 * The contents of this file are subject to the terms of either the GNU
2149.14 * General Public License Version 2 only ("GPL") or the Common
2149.15 @@ -13,9 +16,9 @@
2149.16 * specific language governing permissions and limitations under the
2149.17 * License. When distributing the software, include this License Header
2149.18 * Notice in each file and include the License file at
2149.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2149.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2149.21 * particular file as subject to the "Classpath" exception as provided
2149.22 - * by Sun in the GPL Version 2 section of the License file that
2149.23 + * by Oracle in the GPL Version 2 section of the License file that
2149.24 * accompanied this code. If applicable, add the following below the
2149.25 * License Header, with the fields enclosed by brackets [] replaced by
2149.26 * your own identifying information:
2150.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/Page1.java Fri Jul 16 11:47:36 2010 -0400
2150.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/Page1.java Fri Jul 16 14:21:50 2010 -0400
2150.3 @@ -1,7 +1,10 @@
2150.4 /*
2150.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2150.6 *
2150.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2150.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2150.9 + *
2150.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2150.11 + * Other names may be trademarks of their respective owners.
2150.12 *
2150.13 * The contents of this file are subject to the terms of either the GNU
2150.14 * General Public License Version 2 only ("GPL") or the Common
2150.15 @@ -13,9 +16,9 @@
2150.16 * specific language governing permissions and limitations under the
2150.17 * License. When distributing the software, include this License Header
2150.18 * Notice in each file and include the License file at
2150.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2150.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2150.21 * particular file as subject to the "Classpath" exception as provided
2150.22 - * by Sun in the GPL Version 2 section of the License file that
2150.23 + * by Oracle in the GPL Version 2 section of the License file that
2150.24 * accompanied this code. If applicable, add the following below the
2150.25 * License Header, with the fields enclosed by brackets [] replaced by
2150.26 * your own identifying information:
2151.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/RequestBean1.java Fri Jul 16 11:47:36 2010 -0400
2151.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/RequestBean1.java Fri Jul 16 14:21:50 2010 -0400
2151.3 @@ -1,7 +1,10 @@
2151.4 /*
2151.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2151.6 *
2151.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2151.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2151.9 + *
2151.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2151.11 + * Other names may be trademarks of their respective owners.
2151.12 *
2151.13 * The contents of this file are subject to the terms of either the GNU
2151.14 * General Public License Version 2 only ("GPL") or the Common
2151.15 @@ -13,9 +16,9 @@
2151.16 * specific language governing permissions and limitations under the
2151.17 * License. When distributing the software, include this License Header
2151.18 * Notice in each file and include the License file at
2151.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2151.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2151.21 * particular file as subject to the "Classpath" exception as provided
2151.22 - * by Sun in the GPL Version 2 section of the License file that
2151.23 + * by Oracle in the GPL Version 2 section of the License file that
2151.24 * accompanied this code. If applicable, add the following below the
2151.25 * License Header, with the fields enclosed by brackets [] replaced by
2151.26 * your own identifying information:
2152.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/SessionBean1.java Fri Jul 16 11:47:36 2010 -0400
2152.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/src/java/singlepagecrudform/SessionBean1.java Fri Jul 16 14:21:50 2010 -0400
2152.3 @@ -1,7 +1,10 @@
2152.4 /*
2152.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2152.6 *
2152.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2152.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2152.9 + *
2152.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2152.11 + * Other names may be trademarks of their respective owners.
2152.12 *
2152.13 * The contents of this file are subject to the terms of either the GNU
2152.14 * General Public License Version 2 only ("GPL") or the Common
2152.15 @@ -13,9 +16,9 @@
2152.16 * specific language governing permissions and limitations under the
2152.17 * License. When distributing the software, include this License Header
2152.18 * Notice in each file and include the License file at
2152.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2152.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2152.21 * particular file as subject to the "Classpath" exception as provided
2152.22 - * by Sun in the GPL Version 2 section of the License file that
2152.23 + * by Oracle in the GPL Version 2 section of the License file that
2152.24 * accompanied this code. If applicable, add the following below the
2152.25 * License Header, with the fields enclosed by brackets [] replaced by
2152.26 * your own identifying information:
2153.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/web/Masthead.jspf Fri Jul 16 11:47:36 2010 -0400
2153.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/web/Masthead.jspf Fri Jul 16 14:21:50 2010 -0400
2153.3 @@ -1,6 +1,6 @@
2153.4 <?xml version="1.0" encoding="UTF-8"?>
2153.5 <!--
2153.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2153.7 + Copyright (c) 2010, Oracle. All rights reserved.
2153.8
2153.9 Redistribution and use in source and binary forms, with or without
2153.10 modification, are permitted provided that the following conditions are met:
2153.11 @@ -12,7 +12,7 @@
2153.12 this list of conditions and the following disclaimer in the documentation
2153.13 and/or other materials provided with the distribution.
2153.14
2153.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2153.16 + * Neither the name of Oracle nor the names of its contributors
2153.17 may be used to endorse or promote products derived from this software without
2153.18 specific prior written permission.
2153.19
2154.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudForm/web/Page1.jsp Fri Jul 16 11:47:36 2010 -0400
2154.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudForm/web/Page1.jsp Fri Jul 16 14:21:50 2010 -0400
2154.3 @@ -1,6 +1,6 @@
2154.4 <?xml version="1.0" encoding="UTF-8"?>
2154.5 <!--
2154.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2154.7 + Copyright (c) 2010, Oracle. All rights reserved.
2154.8
2154.9 Redistribution and use in source and binary forms, with or without
2154.10 modification, are permitted provided that the following conditions are met:
2154.11 @@ -12,7 +12,7 @@
2154.12 this list of conditions and the following disclaimer in the documentation
2154.13 and/or other materials provided with the distribution.
2154.14
2154.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2154.16 + * Neither the name of Oracle nor the names of its contributors
2154.17 may be used to endorse or promote products derived from this software without
2154.18 specific prior written permission.
2154.19
2155.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/build.xml Fri Jul 16 11:47:36 2010 -0400
2155.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/build.xml Fri Jul 16 14:21:50 2010 -0400
2155.3 @@ -2,7 +2,10 @@
2155.4 <!--
2155.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2155.6
2155.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2155.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2155.9 +
2155.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2155.11 +Other names may be trademarks of their respective owners.
2155.12
2155.13
2155.14 The contents of this file are subject to the terms of either the GNU
2155.15 @@ -15,9 +18,9 @@
2155.16 specific language governing permissions and limitations under the
2155.17 License. When distributing the software, include this License Header
2155.18 Notice in each file and include the License file at
2155.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2155.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2155.21 particular file as subject to the "Classpath" exception as provided
2155.22 -by Sun in the GPL Version 2 section of the License file that
2155.23 +by Oracle in the GPL Version 2 section of the License file that
2155.24 accompanied this code. If applicable, add the following below the
2155.25 License Header, with the fields enclosed by brackets [] replaced by
2155.26 your own identifying information:
2156.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2156.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2156.3 @@ -1,6 +1,9 @@
2156.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2156.5 #
2156.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2156.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2156.8 +#
2156.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2156.10 +# Other names may be trademarks of their respective owners.
2156.11 #
2156.12 # The contents of this file are subject to the terms of either the GNU
2156.13 # General Public License Version 2 only ("GPL") or the Common
2156.14 @@ -12,9 +15,9 @@
2156.15 # specific language governing permissions and limitations under the
2156.16 # License. When distributing the software, include this License Header
2156.17 # Notice in each file and include the License file at
2156.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2156.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2156.20 # particular file as subject to the "Classpath" exception as provided
2156.21 -# by Sun in the GPL Version 2 section of the License file that
2156.22 +# by Oracle in the GPL Version 2 section of the License file that
2156.23 # accompanied this code. If applicable, add the following below the
2156.24 # License Header, with the fields enclosed by brackets [] replaced by
2156.25 # your own identifying information:
2157.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2157.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2157.3 @@ -2,7 +2,10 @@
2157.4 <!--
2157.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2157.6
2157.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2157.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2157.9 +
2157.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2157.11 +Other names may be trademarks of their respective owners.
2157.12
2157.13
2157.14 The contents of this file are subject to the terms of either the GNU
2157.15 @@ -15,9 +18,9 @@
2157.16 specific language governing permissions and limitations under the
2157.17 License. When distributing the software, include this License Header
2157.18 Notice in each file and include the License file at
2157.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2157.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2157.21 particular file as subject to the "Classpath" exception as provided
2157.22 -by Sun in the GPL Version 2 section of the License file that
2157.23 +by Oracle in the GPL Version 2 section of the License file that
2157.24 accompanied this code. If applicable, add the following below the
2157.25 License Header, with the fields enclosed by brackets [] replaced by
2157.26 your own identifying information:
2158.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/ApplicationBean1.java Fri Jul 16 11:47:36 2010 -0400
2158.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/ApplicationBean1.java Fri Jul 16 14:21:50 2010 -0400
2158.3 @@ -1,7 +1,10 @@
2158.4 /*
2158.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2158.6 *
2158.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2158.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2158.9 + *
2158.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2158.11 + * Other names may be trademarks of their respective owners.
2158.12 *
2158.13 * The contents of this file are subject to the terms of either the GNU
2158.14 * General Public License Version 2 only ("GPL") or the Common
2158.15 @@ -13,9 +16,9 @@
2158.16 * specific language governing permissions and limitations under the
2158.17 * License. When distributing the software, include this License Header
2158.18 * Notice in each file and include the License file at
2158.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2158.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2158.21 * particular file as subject to the "Classpath" exception as provided
2158.22 - * by Sun in the GPL Version 2 section of the License file that
2158.23 + * by Oracle in the GPL Version 2 section of the License file that
2158.24 * accompanied this code. If applicable, add the following below the
2158.25 * License Header, with the fields enclosed by brackets [] replaced by
2158.26 * your own identifying information:
2159.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2159.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2159.3 @@ -1,6 +1,9 @@
2159.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2159.5 #
2159.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2159.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2159.8 +#
2159.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2159.10 +# Other names may be trademarks of their respective owners.
2159.11 #
2159.12 # The contents of this file are subject to the terms of either the GNU
2159.13 # General Public License Version 2 only ("GPL") or the Common
2159.14 @@ -12,9 +15,9 @@
2159.15 # specific language governing permissions and limitations under the
2159.16 # License. When distributing the software, include this License Header
2159.17 # Notice in each file and include the License file at
2159.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2159.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2159.20 # particular file as subject to the "Classpath" exception as provided
2159.21 -# by Sun in the GPL Version 2 section of the License file that
2159.22 +# by Oracle in the GPL Version 2 section of the License file that
2159.23 # accompanied this code. If applicable, add the following below the
2159.24 # License Header, with the fields enclosed by brackets [] replaced by
2159.25 # your own identifying information:
2160.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/Masthead.java Fri Jul 16 11:47:36 2010 -0400
2160.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/Masthead.java Fri Jul 16 14:21:50 2010 -0400
2160.3 @@ -1,7 +1,10 @@
2160.4 /*
2160.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2160.6 *
2160.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2160.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2160.9 + *
2160.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2160.11 + * Other names may be trademarks of their respective owners.
2160.12 *
2160.13 * The contents of this file are subject to the terms of either the GNU
2160.14 * General Public License Version 2 only ("GPL") or the Common
2160.15 @@ -13,9 +16,9 @@
2160.16 * specific language governing permissions and limitations under the
2160.17 * License. When distributing the software, include this License Header
2160.18 * Notice in each file and include the License file at
2160.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2160.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2160.21 * particular file as subject to the "Classpath" exception as provided
2160.22 - * by Sun in the GPL Version 2 section of the License file that
2160.23 + * by Oracle in the GPL Version 2 section of the License file that
2160.24 * accompanied this code. If applicable, add the following below the
2160.25 * License Header, with the fields enclosed by brackets [] replaced by
2160.26 * your own identifying information:
2161.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/Page1.java Fri Jul 16 11:47:36 2010 -0400
2161.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/Page1.java Fri Jul 16 14:21:50 2010 -0400
2161.3 @@ -1,7 +1,10 @@
2161.4 /*
2161.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2161.6 *
2161.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2161.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2161.9 + *
2161.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2161.11 + * Other names may be trademarks of their respective owners.
2161.12 *
2161.13 * The contents of this file are subject to the terms of either the GNU
2161.14 * General Public License Version 2 only ("GPL") or the Common
2161.15 @@ -13,9 +16,9 @@
2161.16 * specific language governing permissions and limitations under the
2161.17 * License. When distributing the software, include this License Header
2161.18 * Notice in each file and include the License file at
2161.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2161.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2161.21 * particular file as subject to the "Classpath" exception as provided
2161.22 - * by Sun in the GPL Version 2 section of the License file that
2161.23 + * by Oracle in the GPL Version 2 section of the License file that
2161.24 * accompanied this code. If applicable, add the following below the
2161.25 * License Header, with the fields enclosed by brackets [] replaced by
2161.26 * your own identifying information:
2162.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/RequestBean1.java Fri Jul 16 11:47:36 2010 -0400
2162.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/RequestBean1.java Fri Jul 16 14:21:50 2010 -0400
2162.3 @@ -1,7 +1,10 @@
2162.4 /*
2162.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2162.6 *
2162.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2162.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2162.9 + *
2162.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2162.11 + * Other names may be trademarks of their respective owners.
2162.12 *
2162.13 * The contents of this file are subject to the terms of either the GNU
2162.14 * General Public License Version 2 only ("GPL") or the Common
2162.15 @@ -13,9 +16,9 @@
2162.16 * specific language governing permissions and limitations under the
2162.17 * License. When distributing the software, include this License Header
2162.18 * Notice in each file and include the License file at
2162.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2162.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2162.21 * particular file as subject to the "Classpath" exception as provided
2162.22 - * by Sun in the GPL Version 2 section of the License file that
2162.23 + * by Oracle in the GPL Version 2 section of the License file that
2162.24 * accompanied this code. If applicable, add the following below the
2162.25 * License Header, with the fields enclosed by brackets [] replaced by
2162.26 * your own identifying information:
2163.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/SessionBean1.java Fri Jul 16 11:47:36 2010 -0400
2163.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/src/java/singlepagecrudtable/SessionBean1.java Fri Jul 16 14:21:50 2010 -0400
2163.3 @@ -1,7 +1,10 @@
2163.4 /*
2163.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2163.6 *
2163.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2163.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2163.9 + *
2163.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2163.11 + * Other names may be trademarks of their respective owners.
2163.12 *
2163.13 * The contents of this file are subject to the terms of either the GNU
2163.14 * General Public License Version 2 only ("GPL") or the Common
2163.15 @@ -13,9 +16,9 @@
2163.16 * specific language governing permissions and limitations under the
2163.17 * License. When distributing the software, include this License Header
2163.18 * Notice in each file and include the License file at
2163.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2163.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2163.21 * particular file as subject to the "Classpath" exception as provided
2163.22 - * by Sun in the GPL Version 2 section of the License file that
2163.23 + * by Oracle in the GPL Version 2 section of the License file that
2163.24 * accompanied this code. If applicable, add the following below the
2163.25 * License Header, with the fields enclosed by brackets [] replaced by
2163.26 * your own identifying information:
2164.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/web/Masthead.jspf Fri Jul 16 11:47:36 2010 -0400
2164.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/web/Masthead.jspf Fri Jul 16 14:21:50 2010 -0400
2164.3 @@ -2,7 +2,10 @@
2164.4 <!--
2164.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2164.6 *
2164.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
2164.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2164.9 + *
2164.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2164.11 + * Other names may be trademarks of their respective owners.
2164.12 *
2164.13 * The contents of this file are subject to the terms of either the GNU
2164.14 * General Public License Version 2 only ("GPL") or the Common
2164.15 @@ -14,9 +17,9 @@
2164.16 * specific language governing permissions and limitations under the
2164.17 * License. When distributing the software, include this License Header
2164.18 * Notice in each file and include the License file at
2164.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2164.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2164.21 * particular file as subject to the "Classpath" exception as provided
2164.22 - * by Sun in the GPL Version 2 section of the License file that
2164.23 + * by Oracle in the GPL Version 2 section of the License file that
2164.24 * accompanied this code. If applicable, add the following below the
2164.25 * License Header, with the fields enclosed by brackets [] replaced by
2164.26 * your own identifying information:
2165.1 --- a/visualweb.samples.bundled/webapps/SinglePageCrudTable/web/Page1.jsp Fri Jul 16 11:47:36 2010 -0400
2165.2 +++ b/visualweb.samples.bundled/webapps/SinglePageCrudTable/web/Page1.jsp Fri Jul 16 14:21:50 2010 -0400
2165.3 @@ -2,7 +2,10 @@
2165.4 <!--
2165.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2165.6 *
2165.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
2165.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2165.9 + *
2165.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2165.11 + * Other names may be trademarks of their respective owners.
2165.12 *
2165.13 * The contents of this file are subject to the terms of either the GNU
2165.14 * General Public License Version 2 only ("GPL") or the Common
2165.15 @@ -14,9 +17,9 @@
2165.16 * specific language governing permissions and limitations under the
2165.17 * License. When distributing the software, include this License Header
2165.18 * Notice in each file and include the License file at
2165.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2165.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2165.21 * particular file as subject to the "Classpath" exception as provided
2165.22 - * by Sun in the GPL Version 2 section of the License file that
2165.23 + * by Oracle in the GPL Version 2 section of the License file that
2165.24 * accompanied this code. If applicable, add the following below the
2165.25 * License Header, with the fields enclosed by brackets [] replaced by
2165.26 * your own identifying information:
2166.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/build.xml Fri Jul 16 11:47:36 2010 -0400
2166.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/build.xml Fri Jul 16 14:21:50 2010 -0400
2166.3 @@ -2,7 +2,10 @@
2166.4 <!--
2166.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2166.6
2166.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2166.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2166.9 +
2166.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2166.11 +Other names may be trademarks of their respective owners.
2166.12
2166.13
2166.14 The contents of this file are subject to the terms of either the GNU
2166.15 @@ -15,9 +18,9 @@
2166.16 specific language governing permissions and limitations under the
2166.17 License. When distributing the software, include this License Header
2166.18 Notice in each file and include the License file at
2166.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2166.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2166.21 particular file as subject to the "Classpath" exception as provided
2166.22 -by Sun in the GPL Version 2 section of the License file that
2166.23 +by Oracle in the GPL Version 2 section of the License file that
2166.24 accompanied this code. If applicable, add the following below the
2166.25 License Header, with the fields enclosed by brackets [] replaced by
2166.26 your own identifying information:
2167.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2167.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2167.3 @@ -1,6 +1,9 @@
2167.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2167.5 #
2167.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2167.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2167.8 +#
2167.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2167.10 +# Other names may be trademarks of their respective owners.
2167.11 #
2167.12 # The contents of this file are subject to the terms of either the GNU
2167.13 # General Public License Version 2 only ("GPL") or the Common
2167.14 @@ -12,9 +15,9 @@
2167.15 # specific language governing permissions and limitations under the
2167.16 # License. When distributing the software, include this License Header
2167.17 # Notice in each file and include the License file at
2167.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2167.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2167.20 # particular file as subject to the "Classpath" exception as provided
2167.21 -# by Sun in the GPL Version 2 section of the License file that
2167.22 +# by Oracle in the GPL Version 2 section of the License file that
2167.23 # accompanied this code. If applicable, add the following below the
2167.24 # License Header, with the fields enclosed by brackets [] replaced by
2167.25 # your own identifying information:
2168.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2168.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2168.3 @@ -2,7 +2,10 @@
2168.4 <!--
2168.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2168.6
2168.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2168.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2168.9 +
2168.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2168.11 +Other names may be trademarks of their respective owners.
2168.12
2168.13
2168.14 The contents of this file are subject to the terms of either the GNU
2168.15 @@ -15,9 +18,9 @@
2168.16 specific language governing permissions and limitations under the
2168.17 License. When distributing the software, include this License Header
2168.18 Notice in each file and include the License file at
2168.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2168.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2168.21 particular file as subject to the "Classpath" exception as provided
2168.22 -by Sun in the GPL Version 2 section of the License file that
2168.23 +by Oracle in the GPL Version 2 section of the License file that
2168.24 accompanied this code. If applicable, add the following below the
2168.25 License Header, with the fields enclosed by brackets [] replaced by
2168.26 your own identifying information:
2169.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/ApplicationBean1.java Fri Jul 16 11:47:36 2010 -0400
2169.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/ApplicationBean1.java Fri Jul 16 14:21:50 2010 -0400
2169.3 @@ -1,7 +1,10 @@
2169.4 /*
2169.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2169.6 *
2169.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2169.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2169.9 + *
2169.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2169.11 + * Other names may be trademarks of their respective owners.
2169.12 *
2169.13 * The contents of this file are subject to the terms of either the GNU
2169.14 * General Public License Version 2 only ("GPL") or the Common
2169.15 @@ -13,9 +16,9 @@
2169.16 * specific language governing permissions and limitations under the
2169.17 * License. When distributing the software, include this License Header
2169.18 * Notice in each file and include the License file at
2169.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2169.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2169.21 * particular file as subject to the "Classpath" exception as provided
2169.22 - * by Sun in the GPL Version 2 section of the License file that
2169.23 + * by Oracle in the GPL Version 2 section of the License file that
2169.24 * accompanied this code. If applicable, add the following below the
2169.25 * License Header, with the fields enclosed by brackets [] replaced by
2169.26 * your own identifying information:
2170.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2170.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2170.3 @@ -1,6 +1,9 @@
2170.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2170.5 #
2170.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2170.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2170.8 +#
2170.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2170.10 +# Other names may be trademarks of their respective owners.
2170.11 #
2170.12 # The contents of this file are subject to the terms of either the GNU
2170.13 # General Public License Version 2 only ("GPL") or the Common
2170.14 @@ -12,9 +15,9 @@
2170.15 # specific language governing permissions and limitations under the
2170.16 # License. When distributing the software, include this License Header
2170.17 # Notice in each file and include the License file at
2170.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2170.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2170.20 # particular file as subject to the "Classpath" exception as provided
2170.21 -# by Sun in the GPL Version 2 section of the License file that
2170.22 +# by Oracle in the GPL Version 2 section of the License file that
2170.23 # accompanied this code. If applicable, add the following below the
2170.24 # License Header, with the fields enclosed by brackets [] replaced by
2170.25 # your own identifying information:
2171.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Details.java Fri Jul 16 11:47:36 2010 -0400
2171.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Details.java Fri Jul 16 14:21:50 2010 -0400
2171.3 @@ -1,7 +1,10 @@
2171.4 /*
2171.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2171.6 *
2171.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2171.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2171.9 + *
2171.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2171.11 + * Other names may be trademarks of their respective owners.
2171.12 *
2171.13 * The contents of this file are subject to the terms of either the GNU
2171.14 * General Public License Version 2 only ("GPL") or the Common
2171.15 @@ -13,9 +16,9 @@
2171.16 * specific language governing permissions and limitations under the
2171.17 * License. When distributing the software, include this License Header
2171.18 * Notice in each file and include the License file at
2171.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2171.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2171.21 * particular file as subject to the "Classpath" exception as provided
2171.22 - * by Sun in the GPL Version 2 section of the License file that
2171.23 + * by Oracle in the GPL Version 2 section of the License file that
2171.24 * accompanied this code. If applicable, add the following below the
2171.25 * License Header, with the fields enclosed by brackets [] replaced by
2171.26 * your own identifying information:
2172.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Header.java Fri Jul 16 11:47:36 2010 -0400
2172.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Header.java Fri Jul 16 14:21:50 2010 -0400
2172.3 @@ -1,7 +1,10 @@
2172.4 /*
2172.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2172.6 *
2172.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2172.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2172.9 + *
2172.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2172.11 + * Other names may be trademarks of their respective owners.
2172.12 *
2172.13 * The contents of this file are subject to the terms of either the GNU
2172.14 * General Public License Version 2 only ("GPL") or the Common
2172.15 @@ -13,9 +16,9 @@
2172.16 * specific language governing permissions and limitations under the
2172.17 * License. When distributing the software, include this License Header
2172.18 * Notice in each file and include the License file at
2172.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2172.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2172.21 * particular file as subject to the "Classpath" exception as provided
2172.22 - * by Sun in the GPL Version 2 section of the License file that
2172.23 + * by Oracle in the GPL Version 2 section of the License file that
2172.24 * accompanied this code. If applicable, add the following below the
2172.25 * License Header, with the fields enclosed by brackets [] replaced by
2172.26 * your own identifying information:
2173.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Help.java Fri Jul 16 11:47:36 2010 -0400
2173.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Help.java Fri Jul 16 14:21:50 2010 -0400
2173.3 @@ -1,7 +1,10 @@
2173.4 /*
2173.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2173.6 *
2173.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2173.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2173.9 + *
2173.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2173.11 + * Other names may be trademarks of their respective owners.
2173.12 *
2173.13 * The contents of this file are subject to the terms of either the GNU
2173.14 * General Public License Version 2 only ("GPL") or the Common
2173.15 @@ -13,9 +16,9 @@
2173.16 * specific language governing permissions and limitations under the
2173.17 * License. When distributing the software, include this License Header
2173.18 * Notice in each file and include the License file at
2173.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2173.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2173.21 * particular file as subject to the "Classpath" exception as provided
2173.22 - * by Sun in the GPL Version 2 section of the License file that
2173.23 + * by Oracle in the GPL Version 2 section of the License file that
2173.24 * accompanied this code. If applicable, add the following below the
2173.25 * License Header, with the fields enclosed by brackets [] replaced by
2173.26 * your own identifying information:
2174.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Page1.java Fri Jul 16 11:47:36 2010 -0400
2174.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/Page1.java Fri Jul 16 14:21:50 2010 -0400
2174.3 @@ -1,7 +1,10 @@
2174.4 /*
2174.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2174.6 *
2174.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2174.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2174.9 + *
2174.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2174.11 + * Other names may be trademarks of their respective owners.
2174.12 *
2174.13 * The contents of this file are subject to the terms of either the GNU
2174.14 * General Public License Version 2 only ("GPL") or the Common
2174.15 @@ -13,9 +16,9 @@
2174.16 * specific language governing permissions and limitations under the
2174.17 * License. When distributing the software, include this License Header
2174.18 * Notice in each file and include the License file at
2174.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2174.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2174.21 * particular file as subject to the "Classpath" exception as provided
2174.22 - * by Sun in the GPL Version 2 section of the License file that
2174.23 + * by Oracle in the GPL Version 2 section of the License file that
2174.24 * accompanied this code. If applicable, add the following below the
2174.25 * License Header, with the fields enclosed by brackets [] replaced by
2174.26 * your own identifying information:
2175.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/RequestBean1.java Fri Jul 16 11:47:36 2010 -0400
2175.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/RequestBean1.java Fri Jul 16 14:21:50 2010 -0400
2175.3 @@ -1,7 +1,10 @@
2175.4 /*
2175.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2175.6 *
2175.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2175.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2175.9 + *
2175.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2175.11 + * Other names may be trademarks of their respective owners.
2175.12 *
2175.13 * The contents of this file are subject to the terms of either the GNU
2175.14 * General Public License Version 2 only ("GPL") or the Common
2175.15 @@ -13,9 +16,9 @@
2175.16 * specific language governing permissions and limitations under the
2175.17 * License. When distributing the software, include this License Header
2175.18 * Notice in each file and include the License file at
2175.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2175.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2175.21 * particular file as subject to the "Classpath" exception as provided
2175.22 - * by Sun in the GPL Version 2 section of the License file that
2175.23 + * by Oracle in the GPL Version 2 section of the License file that
2175.24 * accompanied this code. If applicable, add the following below the
2175.25 * License Header, with the fields enclosed by brackets [] replaced by
2175.26 * your own identifying information:
2176.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/SessionBean1.java Fri Jul 16 11:47:36 2010 -0400
2176.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/src/java/travelcenter/SessionBean1.java Fri Jul 16 14:21:50 2010 -0400
2176.3 @@ -1,7 +1,10 @@
2176.4 /*
2176.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2176.6 *
2176.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2176.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2176.9 + *
2176.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2176.11 + * Other names may be trademarks of their respective owners.
2176.12 *
2176.13 * The contents of this file are subject to the terms of either the GNU
2176.14 * General Public License Version 2 only ("GPL") or the Common
2176.15 @@ -13,9 +16,9 @@
2176.16 * specific language governing permissions and limitations under the
2176.17 * License. When distributing the software, include this License Header
2176.18 * Notice in each file and include the License file at
2176.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2176.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2176.21 * particular file as subject to the "Classpath" exception as provided
2176.22 - * by Sun in the GPL Version 2 section of the License file that
2176.23 + * by Oracle in the GPL Version 2 section of the License file that
2176.24 * accompanied this code. If applicable, add the following below the
2176.25 * License Header, with the fields enclosed by brackets [] replaced by
2176.26 * your own identifying information:
2177.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/web/Details.jsp Fri Jul 16 11:47:36 2010 -0400
2177.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/web/Details.jsp Fri Jul 16 14:21:50 2010 -0400
2177.3 @@ -1,6 +1,6 @@
2177.4 <?xml version="1.0" encoding="UTF-8"?>
2177.5 <!--
2177.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2177.7 + Copyright (c) 2010, Oracle. All rights reserved.
2177.8
2177.9 Redistribution and use in source and binary forms, with or without
2177.10 modification, are permitted provided that the following conditions are met:
2177.11 @@ -12,7 +12,7 @@
2177.12 this list of conditions and the following disclaimer in the documentation
2177.13 and/or other materials provided with the distribution.
2177.14
2177.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2177.16 + * Neither the name of Oracle nor the names of its contributors
2177.17 may be used to endorse or promote products derived from this software without
2177.18 specific prior written permission.
2177.19
2178.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/web/Header.jspf Fri Jul 16 11:47:36 2010 -0400
2178.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/web/Header.jspf Fri Jul 16 14:21:50 2010 -0400
2178.3 @@ -1,6 +1,6 @@
2178.4 <?xml version="1.0" encoding="UTF-8"?>
2178.5 <!--
2178.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2178.7 + Copyright (c) 2010, Oracle. All rights reserved.
2178.8
2178.9 Redistribution and use in source and binary forms, with or without
2178.10 modification, are permitted provided that the following conditions are met:
2178.11 @@ -12,7 +12,7 @@
2178.12 this list of conditions and the following disclaimer in the documentation
2178.13 and/or other materials provided with the distribution.
2178.14
2178.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2178.16 + * Neither the name of Oracle nor the names of its contributors
2178.17 may be used to endorse or promote products derived from this software without
2178.18 specific prior written permission.
2178.19
2179.1 --- a/visualweb.samples.bundled/webapps/TravelCenter/web/Page1.jsp Fri Jul 16 11:47:36 2010 -0400
2179.2 +++ b/visualweb.samples.bundled/webapps/TravelCenter/web/Page1.jsp Fri Jul 16 14:21:50 2010 -0400
2179.3 @@ -1,6 +1,6 @@
2179.4 <?xml version="1.0" encoding="UTF-8"?>
2179.5 <!--
2179.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2179.7 + Copyright (c) 2010, Oracle. All rights reserved.
2179.8
2179.9 Redistribution and use in source and binary forms, with or without
2179.10 modification, are permitted provided that the following conditions are met:
2179.11 @@ -12,7 +12,7 @@
2179.12 this list of conditions and the following disclaimer in the documentation
2179.13 and/or other materials provided with the distribution.
2179.14
2179.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2179.16 + * Neither the name of Oracle nor the names of its contributors
2179.17 may be used to endorse or promote products derived from this software without
2179.18 specific prior written permission.
2179.19
2180.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/build.xml Fri Jul 16 11:47:36 2010 -0400
2180.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/build.xml Fri Jul 16 14:21:50 2010 -0400
2180.3 @@ -2,7 +2,10 @@
2180.4 <!--
2180.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2180.6
2180.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2180.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2180.9 +
2180.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2180.11 +Other names may be trademarks of their respective owners.
2180.12
2180.13
2180.14 The contents of this file are subject to the terms of either the GNU
2180.15 @@ -15,9 +18,9 @@
2180.16 specific language governing permissions and limitations under the
2180.17 License. When distributing the software, include this License Header
2180.18 Notice in each file and include the License file at
2180.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2180.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2180.21 particular file as subject to the "Classpath" exception as provided
2180.22 -by Sun in the GPL Version 2 section of the License file that
2180.23 +by Oracle in the GPL Version 2 section of the License file that
2180.24 accompanied this code. If applicable, add the following below the
2180.25 License Header, with the fields enclosed by brackets [] replaced by
2180.26 your own identifying information:
2181.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2181.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2181.3 @@ -1,6 +1,9 @@
2181.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2181.5 #
2181.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2181.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2181.8 +#
2181.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2181.10 +# Other names may be trademarks of their respective owners.
2181.11 #
2181.12 # The contents of this file are subject to the terms of either the GNU
2181.13 # General Public License Version 2 only ("GPL") or the Common
2181.14 @@ -12,9 +15,9 @@
2181.15 # specific language governing permissions and limitations under the
2181.16 # License. When distributing the software, include this License Header
2181.17 # Notice in each file and include the License file at
2181.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2181.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2181.20 # particular file as subject to the "Classpath" exception as provided
2181.21 -# by Sun in the GPL Version 2 section of the License file that
2181.22 +# by Oracle in the GPL Version 2 section of the License file that
2181.23 # accompanied this code. If applicable, add the following below the
2181.24 # License Header, with the fields enclosed by brackets [] replaced by
2181.25 # your own identifying information:
2182.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2182.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2182.3 @@ -2,7 +2,10 @@
2182.4 <!--
2182.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2182.6
2182.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2182.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2182.9 +
2182.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2182.11 +Other names may be trademarks of their respective owners.
2182.12
2182.13
2182.14 The contents of this file are subject to the terms of either the GNU
2182.15 @@ -15,9 +18,9 @@
2182.16 specific language governing permissions and limitations under the
2182.17 License. When distributing the software, include this License Header
2182.18 Notice in each file and include the License file at
2182.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2182.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2182.21 particular file as subject to the "Classpath" exception as provided
2182.22 -by Sun in the GPL Version 2 section of the License file that
2182.23 +by Oracle in the GPL Version 2 section of the License file that
2182.24 accompanied this code. If applicable, add the following below the
2182.25 License Header, with the fields enclosed by brackets [] replaced by
2182.26 your own identifying information:
2183.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/ApplicationBean1.java Fri Jul 16 11:47:36 2010 -0400
2183.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/ApplicationBean1.java Fri Jul 16 14:21:50 2010 -0400
2183.3 @@ -1,7 +1,10 @@
2183.4 /*
2183.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2183.6 *
2183.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2183.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2183.9 + *
2183.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2183.11 + * Other names may be trademarks of their respective owners.
2183.12 *
2183.13 * The contents of this file are subject to the terms of either the GNU
2183.14 * General Public License Version 2 only ("GPL") or the Common
2183.15 @@ -13,9 +16,9 @@
2183.16 * specific language governing permissions and limitations under the
2183.17 * License. When distributing the software, include this License Header
2183.18 * Notice in each file and include the License file at
2183.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2183.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2183.21 * particular file as subject to the "Classpath" exception as provided
2183.22 - * by Sun in the GPL Version 2 section of the License file that
2183.23 + * by Oracle in the GPL Version 2 section of the License file that
2183.24 * accompanied this code. If applicable, add the following below the
2183.25 * License Header, with the fields enclosed by brackets [] replaced by
2183.26 * your own identifying information:
2184.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2184.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2184.3 @@ -1,6 +1,9 @@
2184.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2184.5 #
2184.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2184.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2184.8 +#
2184.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2184.10 +# Other names may be trademarks of their respective owners.
2184.11 #
2184.12 # The contents of this file are subject to the terms of either the GNU
2184.13 # General Public License Version 2 only ("GPL") or the Common
2184.14 @@ -12,9 +15,9 @@
2184.15 # specific language governing permissions and limitations under the
2184.16 # License. When distributing the software, include this License Header
2184.17 # Notice in each file and include the License file at
2184.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2184.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2184.20 # particular file as subject to the "Classpath" exception as provided
2184.21 -# by Sun in the GPL Version 2 section of the License file that
2184.22 +# by Oracle in the GPL Version 2 section of the License file that
2184.23 # accompanied this code. If applicable, add the following below the
2184.24 # License Header, with the fields enclosed by brackets [] replaced by
2184.25 # your own identifying information:
2185.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/CreatePage.java Fri Jul 16 11:47:36 2010 -0400
2185.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/CreatePage.java Fri Jul 16 14:21:50 2010 -0400
2185.3 @@ -1,7 +1,10 @@
2185.4 /*
2185.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2185.6 *
2185.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2185.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2185.9 + *
2185.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2185.11 + * Other names may be trademarks of their respective owners.
2185.12 *
2185.13 * The contents of this file are subject to the terms of either the GNU
2185.14 * General Public License Version 2 only ("GPL") or the Common
2185.15 @@ -13,9 +16,9 @@
2185.16 * specific language governing permissions and limitations under the
2185.17 * License. When distributing the software, include this License Header
2185.18 * Notice in each file and include the License file at
2185.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2185.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2185.21 * particular file as subject to the "Classpath" exception as provided
2185.22 - * by Sun in the GPL Version 2 section of the License file that
2185.23 + * by Oracle in the GPL Version 2 section of the License file that
2185.24 * accompanied this code. If applicable, add the following below the
2185.25 * License Header, with the fields enclosed by brackets [] replaced by
2185.26 * your own identifying information:
2186.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/Masthead.java Fri Jul 16 11:47:36 2010 -0400
2186.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/Masthead.java Fri Jul 16 14:21:50 2010 -0400
2186.3 @@ -1,7 +1,10 @@
2186.4 /*
2186.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2186.6 *
2186.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2186.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2186.9 + *
2186.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2186.11 + * Other names may be trademarks of their respective owners.
2186.12 *
2186.13 * The contents of this file are subject to the terms of either the GNU
2186.14 * General Public License Version 2 only ("GPL") or the Common
2186.15 @@ -13,9 +16,9 @@
2186.16 * specific language governing permissions and limitations under the
2186.17 * License. When distributing the software, include this License Header
2186.18 * Notice in each file and include the License file at
2186.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2186.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2186.21 * particular file as subject to the "Classpath" exception as provided
2186.22 - * by Sun in the GPL Version 2 section of the License file that
2186.23 + * by Oracle in the GPL Version 2 section of the License file that
2186.24 * accompanied this code. If applicable, add the following below the
2186.25 * License Header, with the fields enclosed by brackets [] replaced by
2186.26 * your own identifying information:
2187.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/Page1.java Fri Jul 16 11:47:36 2010 -0400
2187.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/Page1.java Fri Jul 16 14:21:50 2010 -0400
2187.3 @@ -1,7 +1,10 @@
2187.4 /*
2187.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2187.6 *
2187.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2187.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2187.9 + *
2187.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2187.11 + * Other names may be trademarks of their respective owners.
2187.12 *
2187.13 * The contents of this file are subject to the terms of either the GNU
2187.14 * General Public License Version 2 only ("GPL") or the Common
2187.15 @@ -13,9 +16,9 @@
2187.16 * specific language governing permissions and limitations under the
2187.17 * License. When distributing the software, include this License Header
2187.18 * Notice in each file and include the License file at
2187.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2187.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2187.21 * particular file as subject to the "Classpath" exception as provided
2187.22 - * by Sun in the GPL Version 2 section of the License file that
2187.23 + * by Oracle in the GPL Version 2 section of the License file that
2187.24 * accompanied this code. If applicable, add the following below the
2187.25 * License Header, with the fields enclosed by brackets [] replaced by
2187.26 * your own identifying information:
2188.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/RequestBean1.java Fri Jul 16 11:47:36 2010 -0400
2188.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/RequestBean1.java Fri Jul 16 14:21:50 2010 -0400
2188.3 @@ -1,7 +1,10 @@
2188.4 /*
2188.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2188.6 *
2188.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2188.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2188.9 + *
2188.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2188.11 + * Other names may be trademarks of their respective owners.
2188.12 *
2188.13 * The contents of this file are subject to the terms of either the GNU
2188.14 * General Public License Version 2 only ("GPL") or the Common
2188.15 @@ -13,9 +16,9 @@
2188.16 * specific language governing permissions and limitations under the
2188.17 * License. When distributing the software, include this License Header
2188.18 * Notice in each file and include the License file at
2188.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2188.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2188.21 * particular file as subject to the "Classpath" exception as provided
2188.22 - * by Sun in the GPL Version 2 section of the License file that
2188.23 + * by Oracle in the GPL Version 2 section of the License file that
2188.24 * accompanied this code. If applicable, add the following below the
2188.25 * License Header, with the fields enclosed by brackets [] replaced by
2188.26 * your own identifying information:
2189.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/SessionBean1.java Fri Jul 16 11:47:36 2010 -0400
2189.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/SessionBean1.java Fri Jul 16 14:21:50 2010 -0400
2189.3 @@ -1,7 +1,10 @@
2189.4 /*
2189.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2189.6 *
2189.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2189.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2189.9 + *
2189.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2189.11 + * Other names may be trademarks of their respective owners.
2189.12 *
2189.13 * The contents of this file are subject to the terms of either the GNU
2189.14 * General Public License Version 2 only ("GPL") or the Common
2189.15 @@ -13,9 +16,9 @@
2189.16 * specific language governing permissions and limitations under the
2189.17 * License. When distributing the software, include this License Header
2189.18 * Notice in each file and include the License file at
2189.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2189.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2189.21 * particular file as subject to the "Classpath" exception as provided
2189.22 - * by Sun in the GPL Version 2 section of the License file that
2189.23 + * by Oracle in the GPL Version 2 section of the License file that
2189.24 * accompanied this code. If applicable, add the following below the
2189.25 * License Header, with the fields enclosed by brackets [] replaced by
2189.26 * your own identifying information:
2190.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/UpdatePage.java Fri Jul 16 11:47:36 2010 -0400
2190.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/src/java/twopagecrudtable/UpdatePage.java Fri Jul 16 14:21:50 2010 -0400
2190.3 @@ -1,7 +1,10 @@
2190.4 /*
2190.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2190.6 *
2190.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2190.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2190.9 + *
2190.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2190.11 + * Other names may be trademarks of their respective owners.
2190.12 *
2190.13 * The contents of this file are subject to the terms of either the GNU
2190.14 * General Public License Version 2 only ("GPL") or the Common
2190.15 @@ -13,9 +16,9 @@
2190.16 * specific language governing permissions and limitations under the
2190.17 * License. When distributing the software, include this License Header
2190.18 * Notice in each file and include the License file at
2190.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2190.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2190.21 * particular file as subject to the "Classpath" exception as provided
2190.22 - * by Sun in the GPL Version 2 section of the License file that
2190.23 + * by Oracle in the GPL Version 2 section of the License file that
2190.24 * accompanied this code. If applicable, add the following below the
2190.25 * License Header, with the fields enclosed by brackets [] replaced by
2190.26 * your own identifying information:
2191.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/web/CreatePage.jsp Fri Jul 16 11:47:36 2010 -0400
2191.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/web/CreatePage.jsp Fri Jul 16 14:21:50 2010 -0400
2191.3 @@ -1,6 +1,6 @@
2191.4 <?xml version="1.0" encoding="UTF-8"?>
2191.5 <!--
2191.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2191.7 + Copyright (c) 2010, Oracle. All rights reserved.
2191.8
2191.9 Redistribution and use in source and binary forms, with or without
2191.10 modification, are permitted provided that the following conditions are met:
2191.11 @@ -12,7 +12,7 @@
2191.12 this list of conditions and the following disclaimer in the documentation
2191.13 and/or other materials provided with the distribution.
2191.14
2191.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2191.16 + * Neither the name of Oracle nor the names of its contributors
2191.17 may be used to endorse or promote products derived from this software without
2191.18 specific prior written permission.
2191.19
2192.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/web/Masthead.jspf Fri Jul 16 11:47:36 2010 -0400
2192.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/web/Masthead.jspf Fri Jul 16 14:21:50 2010 -0400
2192.3 @@ -1,6 +1,6 @@
2192.4 <?xml version="1.0" encoding="UTF-8"?>
2192.5 <!--
2192.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2192.7 + Copyright (c) 2010, Oracle. All rights reserved.
2192.8
2192.9 Redistribution and use in source and binary forms, with or without
2192.10 modification, are permitted provided that the following conditions are met:
2192.11 @@ -12,7 +12,7 @@
2192.12 this list of conditions and the following disclaimer in the documentation
2192.13 and/or other materials provided with the distribution.
2192.14
2192.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2192.16 + * Neither the name of Oracle nor the names of its contributors
2192.17 may be used to endorse or promote products derived from this software without
2192.18 specific prior written permission.
2192.19
2193.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/web/Page1.jsp Fri Jul 16 11:47:36 2010 -0400
2193.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/web/Page1.jsp Fri Jul 16 14:21:50 2010 -0400
2193.3 @@ -1,6 +1,6 @@
2193.4 <?xml version="1.0" encoding="UTF-8"?>
2193.5 <!--
2193.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2193.7 + Copyright (c) 2010, Oracle. All rights reserved.
2193.8
2193.9 Redistribution and use in source and binary forms, with or without
2193.10 modification, are permitted provided that the following conditions are met:
2193.11 @@ -12,7 +12,7 @@
2193.12 this list of conditions and the following disclaimer in the documentation
2193.13 and/or other materials provided with the distribution.
2193.14
2193.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2193.16 + * Neither the name of Oracle nor the names of its contributors
2193.17 may be used to endorse or promote products derived from this software without
2193.18 specific prior written permission.
2193.19
2194.1 --- a/visualweb.samples.bundled/webapps/TwoPageCrudTable/web/UpdatePage.jsp Fri Jul 16 11:47:36 2010 -0400
2194.2 +++ b/visualweb.samples.bundled/webapps/TwoPageCrudTable/web/UpdatePage.jsp Fri Jul 16 14:21:50 2010 -0400
2194.3 @@ -1,6 +1,6 @@
2194.4 <?xml version="1.0" encoding="UTF-8"?>
2194.5 <!--
2194.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2194.7 + Copyright (c) 2010, Oracle. All rights reserved.
2194.8
2194.9 Redistribution and use in source and binary forms, with or without
2194.10 modification, are permitted provided that the following conditions are met:
2194.11 @@ -12,7 +12,7 @@
2194.12 this list of conditions and the following disclaimer in the documentation
2194.13 and/or other materials provided with the distribution.
2194.14
2194.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2194.16 + * Neither the name of Oracle nor the names of its contributors
2194.17 may be used to endorse or promote products derived from this software without
2194.18 specific prior written permission.
2194.19
2195.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/build.xml Fri Jul 16 11:47:36 2010 -0400
2195.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/build.xml Fri Jul 16 14:21:50 2010 -0400
2195.3 @@ -2,7 +2,10 @@
2195.4 <!--
2195.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2195.6
2195.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2195.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2195.9 +
2195.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2195.11 +Other names may be trademarks of their respective owners.
2195.12
2195.13
2195.14 The contents of this file are subject to the terms of either the GNU
2195.15 @@ -15,9 +18,9 @@
2195.16 specific language governing permissions and limitations under the
2195.17 License. When distributing the software, include this License Header
2195.18 Notice in each file and include the License file at
2195.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2195.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2195.21 particular file as subject to the "Classpath" exception as provided
2195.22 -by Sun in the GPL Version 2 section of the License file that
2195.23 +by Oracle in the GPL Version 2 section of the License file that
2195.24 accompanied this code. If applicable, add the following below the
2195.25 License Header, with the fields enclosed by brackets [] replaced by
2195.26 your own identifying information:
2196.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2196.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2196.3 @@ -1,6 +1,9 @@
2196.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2196.5 #
2196.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2196.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2196.8 +#
2196.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2196.10 +# Other names may be trademarks of their respective owners.
2196.11 #
2196.12 # The contents of this file are subject to the terms of either the GNU
2196.13 # General Public License Version 2 only ("GPL") or the Common
2196.14 @@ -12,9 +15,9 @@
2196.15 # specific language governing permissions and limitations under the
2196.16 # License. When distributing the software, include this License Header
2196.17 # Notice in each file and include the License file at
2196.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2196.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2196.20 # particular file as subject to the "Classpath" exception as provided
2196.21 -# by Sun in the GPL Version 2 section of the License file that
2196.22 +# by Oracle in the GPL Version 2 section of the License file that
2196.23 # accompanied this code. If applicable, add the following below the
2196.24 # License Header, with the fields enclosed by brackets [] replaced by
2196.25 # your own identifying information:
2197.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2197.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2197.3 @@ -2,7 +2,10 @@
2197.4 <!--
2197.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2197.6
2197.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2197.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2197.9 +
2197.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2197.11 +Other names may be trademarks of their respective owners.
2197.12
2197.13
2197.14 The contents of this file are subject to the terms of either the GNU
2197.15 @@ -15,9 +18,9 @@
2197.16 specific language governing permissions and limitations under the
2197.17 License. When distributing the software, include this License Header
2197.18 Notice in each file and include the License file at
2197.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2197.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2197.21 particular file as subject to the "Classpath" exception as provided
2197.22 -by Sun in the GPL Version 2 section of the License file that
2197.23 +by Oracle in the GPL Version 2 section of the License file that
2197.24 accompanied this code. If applicable, add the following below the
2197.25 License Header, with the fields enclosed by brackets [] replaced by
2197.26 your own identifying information:
2198.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/AddVehicle.java Fri Jul 16 11:47:36 2010 -0400
2198.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/AddVehicle.java Fri Jul 16 14:21:50 2010 -0400
2198.3 @@ -1,7 +1,10 @@
2198.4 /*
2198.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2198.6 *
2198.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2198.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2198.9 + *
2198.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2198.11 + * Other names may be trademarks of their respective owners.
2198.12 *
2198.13 * The contents of this file are subject to the terms of either the GNU
2198.14 * General Public License Version 2 only ("GPL") or the Common
2198.15 @@ -13,9 +16,9 @@
2198.16 * specific language governing permissions and limitations under the
2198.17 * License. When distributing the software, include this License Header
2198.18 * Notice in each file and include the License file at
2198.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2198.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2198.21 * particular file as subject to the "Classpath" exception as provided
2198.22 - * by Sun in the GPL Version 2 section of the License file that
2198.23 + * by Oracle in the GPL Version 2 section of the License file that
2198.24 * accompanied this code. If applicable, add the following below the
2198.25 * License Header, with the fields enclosed by brackets [] replaced by
2198.26 * your own identifying information:
2199.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/ApplicationBean1.java Fri Jul 16 11:47:36 2010 -0400
2199.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/ApplicationBean1.java Fri Jul 16 14:21:50 2010 -0400
2199.3 @@ -1,7 +1,10 @@
2199.4 /*
2199.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2199.6 *
2199.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2199.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2199.9 + *
2199.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2199.11 + * Other names may be trademarks of their respective owners.
2199.12 *
2199.13 * The contents of this file are subject to the terms of either the GNU
2199.14 * General Public License Version 2 only ("GPL") or the Common
2199.15 @@ -13,9 +16,9 @@
2199.16 * specific language governing permissions and limitations under the
2199.17 * License. When distributing the software, include this License Header
2199.18 * Notice in each file and include the License file at
2199.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2199.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2199.21 * particular file as subject to the "Classpath" exception as provided
2199.22 - * by Sun in the GPL Version 2 section of the License file that
2199.23 + * by Oracle in the GPL Version 2 section of the License file that
2199.24 * accompanied this code. If applicable, add the following below the
2199.25 * License Header, with the fields enclosed by brackets [] replaced by
2199.26 * your own identifying information:
2200.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2200.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2200.3 @@ -1,6 +1,9 @@
2200.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2200.5 #
2200.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2200.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2200.8 +#
2200.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2200.10 +# Other names may be trademarks of their respective owners.
2200.11 #
2200.12 # The contents of this file are subject to the terms of either the GNU
2200.13 # General Public License Version 2 only ("GPL") or the Common
2200.14 @@ -12,9 +15,9 @@
2200.15 # specific language governing permissions and limitations under the
2200.16 # License. When distributing the software, include this License Header
2200.17 # Notice in each file and include the License file at
2200.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2200.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2200.20 # particular file as subject to the "Classpath" exception as provided
2200.21 -# by Sun in the GPL Version 2 section of the License file that
2200.22 +# by Oracle in the GPL Version 2 section of the License file that
2200.23 # accompanied this code. If applicable, add the following below the
2200.24 # License Header, with the fields enclosed by brackets [] replaced by
2200.25 # your own identifying information:
2201.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/ChooseVehicle.java Fri Jul 16 11:47:36 2010 -0400
2201.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/ChooseVehicle.java Fri Jul 16 14:21:50 2010 -0400
2201.3 @@ -1,7 +1,10 @@
2201.4 /*
2201.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2201.6 *
2201.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2201.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2201.9 + *
2201.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2201.11 + * Other names may be trademarks of their respective owners.
2201.12 *
2201.13 * The contents of this file are subject to the terms of either the GNU
2201.14 * General Public License Version 2 only ("GPL") or the Common
2201.15 @@ -13,9 +16,9 @@
2201.16 * specific language governing permissions and limitations under the
2201.17 * License. When distributing the software, include this License Header
2201.18 * Notice in each file and include the License file at
2201.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2201.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2201.21 * particular file as subject to the "Classpath" exception as provided
2201.22 - * by Sun in the GPL Version 2 section of the License file that
2201.23 + * by Oracle in the GPL Version 2 section of the License file that
2201.24 * accompanied this code. If applicable, add the following below the
2201.25 * License Header, with the fields enclosed by brackets [] replaced by
2201.26 * your own identifying information:
2202.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/FindVehicle.java Fri Jul 16 11:47:36 2010 -0400
2202.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/FindVehicle.java Fri Jul 16 14:21:50 2010 -0400
2202.3 @@ -1,7 +1,10 @@
2202.4 /*
2202.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2202.6 *
2202.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2202.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2202.9 + *
2202.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2202.11 + * Other names may be trademarks of their respective owners.
2202.12 *
2202.13 * The contents of this file are subject to the terms of either the GNU
2202.14 * General Public License Version 2 only ("GPL") or the Common
2202.15 @@ -13,9 +16,9 @@
2202.16 * specific language governing permissions and limitations under the
2202.17 * License. When distributing the software, include this License Header
2202.18 * Notice in each file and include the License file at
2202.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2202.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2202.21 * particular file as subject to the "Classpath" exception as provided
2202.22 - * by Sun in the GPL Version 2 section of the License file that
2202.23 + * by Oracle in the GPL Version 2 section of the License file that
2202.24 * accompanied this code. If applicable, add the following below the
2202.25 * License Header, with the fields enclosed by brackets [] replaced by
2202.26 * your own identifying information:
2203.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Footer.java Fri Jul 16 11:47:36 2010 -0400
2203.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Footer.java Fri Jul 16 14:21:50 2010 -0400
2203.3 @@ -1,7 +1,10 @@
2203.4 /*
2203.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2203.6 *
2203.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2203.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2203.9 + *
2203.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2203.11 + * Other names may be trademarks of their respective owners.
2203.12 *
2203.13 * The contents of this file are subject to the terms of either the GNU
2203.14 * General Public License Version 2 only ("GPL") or the Common
2203.15 @@ -13,9 +16,9 @@
2203.16 * specific language governing permissions and limitations under the
2203.17 * License. When distributing the software, include this License Header
2203.18 * Notice in each file and include the License file at
2203.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2203.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2203.21 * particular file as subject to the "Classpath" exception as provided
2203.22 - * by Sun in the GPL Version 2 section of the License file that
2203.23 + * by Oracle in the GPL Version 2 section of the License file that
2203.24 * accompanied this code. If applicable, add the following below the
2203.25 * License Header, with the fields enclosed by brackets [] replaced by
2203.26 * your own identifying information:
2204.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Header.java Fri Jul 16 11:47:36 2010 -0400
2204.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Header.java Fri Jul 16 14:21:50 2010 -0400
2204.3 @@ -1,7 +1,10 @@
2204.4 /*
2204.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2204.6 *
2204.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2204.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2204.9 + *
2204.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2204.11 + * Other names may be trademarks of their respective owners.
2204.12 *
2204.13 * The contents of this file are subject to the terms of either the GNU
2204.14 * General Public License Version 2 only ("GPL") or the Common
2204.15 @@ -13,9 +16,9 @@
2204.16 * specific language governing permissions and limitations under the
2204.17 * License. When distributing the software, include this License Header
2204.18 * Notice in each file and include the License file at
2204.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2204.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2204.21 * particular file as subject to the "Classpath" exception as provided
2204.22 - * by Sun in the GPL Version 2 section of the License file that
2204.23 + * by Oracle in the GPL Version 2 section of the License file that
2204.24 * accompanied this code. If applicable, add the following below the
2204.25 * License Header, with the fields enclosed by brackets [] replaced by
2204.26 * your own identifying information:
2205.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Help.java Fri Jul 16 11:47:36 2010 -0400
2205.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Help.java Fri Jul 16 14:21:50 2010 -0400
2205.3 @@ -1,7 +1,10 @@
2205.4 /*
2205.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2205.6 *
2205.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2205.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2205.9 + *
2205.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2205.11 + * Other names may be trademarks of their respective owners.
2205.12 *
2205.13 * The contents of this file are subject to the terms of either the GNU
2205.14 * General Public License Version 2 only ("GPL") or the Common
2205.15 @@ -13,9 +16,9 @@
2205.16 * specific language governing permissions and limitations under the
2205.17 * License. When distributing the software, include this License Header
2205.18 * Notice in each file and include the License file at
2205.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2205.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2205.21 * particular file as subject to the "Classpath" exception as provided
2205.22 - * by Sun in the GPL Version 2 section of the License file that
2205.23 + * by Oracle in the GPL Version 2 section of the License file that
2205.24 * accompanied this code. If applicable, add the following below the
2205.25 * License Header, with the fields enclosed by brackets [] replaced by
2205.26 * your own identifying information:
2206.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/IncidentReported.java Fri Jul 16 11:47:36 2010 -0400
2206.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/IncidentReported.java Fri Jul 16 14:21:50 2010 -0400
2206.3 @@ -1,7 +1,10 @@
2206.4 /*
2206.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2206.6 *
2206.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2206.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2206.9 + *
2206.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2206.11 + * Other names may be trademarks of their respective owners.
2206.12 *
2206.13 * The contents of this file are subject to the terms of either the GNU
2206.14 * General Public License Version 2 only ("GPL") or the Common
2206.15 @@ -13,9 +16,9 @@
2206.16 * specific language governing permissions and limitations under the
2206.17 * License. When distributing the software, include this License Header
2206.18 * Notice in each file and include the License file at
2206.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2206.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2206.21 * particular file as subject to the "Classpath" exception as provided
2206.22 - * by Sun in the GPL Version 2 section of the License file that
2206.23 + * by Oracle in the GPL Version 2 section of the License file that
2206.24 * accompanied this code. If applicable, add the following below the
2206.25 * License Header, with the fields enclosed by brackets [] replaced by
2206.26 * your own identifying information:
2207.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Login.java Fri Jul 16 11:47:36 2010 -0400
2207.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Login.java Fri Jul 16 14:21:50 2010 -0400
2207.3 @@ -1,7 +1,10 @@
2207.4 /*
2207.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2207.6 *
2207.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2207.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2207.9 + *
2207.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2207.11 + * Other names may be trademarks of their respective owners.
2207.12 *
2207.13 * The contents of this file are subject to the terms of either the GNU
2207.14 * General Public License Version 2 only ("GPL") or the Common
2207.15 @@ -13,9 +16,9 @@
2207.16 * specific language governing permissions and limitations under the
2207.17 * License. When distributing the software, include this License Header
2207.18 * Notice in each file and include the License file at
2207.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2207.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2207.21 * particular file as subject to the "Classpath" exception as provided
2207.22 - * by Sun in the GPL Version 2 section of the License file that
2207.23 + * by Oracle in the GPL Version 2 section of the License file that
2207.24 * accompanied this code. If applicable, add the following below the
2207.25 * License Header, with the fields enclosed by brackets [] replaced by
2207.26 * your own identifying information:
2208.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/NewUser.java Fri Jul 16 11:47:36 2010 -0400
2208.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/NewUser.java Fri Jul 16 14:21:50 2010 -0400
2208.3 @@ -1,7 +1,10 @@
2208.4 /*
2208.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2208.6 *
2208.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2208.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2208.9 + *
2208.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2208.11 + * Other names may be trademarks of their respective owners.
2208.12 *
2208.13 * The contents of this file are subject to the terms of either the GNU
2208.14 * General Public License Version 2 only ("GPL") or the Common
2208.15 @@ -13,9 +16,9 @@
2208.16 * specific language governing permissions and limitations under the
2208.17 * License. When distributing the software, include this License Header
2208.18 * Notice in each file and include the License file at
2208.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2208.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2208.21 * particular file as subject to the "Classpath" exception as provided
2208.22 - * by Sun in the GPL Version 2 section of the License file that
2208.23 + * by Oracle in the GPL Version 2 section of the License file that
2208.24 * accompanied this code. If applicable, add the following below the
2208.25 * License Header, with the fields enclosed by brackets [] replaced by
2208.26 * your own identifying information:
2209.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Profile.java Fri Jul 16 11:47:36 2010 -0400
2209.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Profile.java Fri Jul 16 14:21:50 2010 -0400
2209.3 @@ -1,7 +1,10 @@
2209.4 /*
2209.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2209.6 *
2209.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2209.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2209.9 + *
2209.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2209.11 + * Other names may be trademarks of their respective owners.
2209.12 *
2209.13 * The contents of this file are subject to the terms of either the GNU
2209.14 * General Public License Version 2 only ("GPL") or the Common
2209.15 @@ -13,9 +16,9 @@
2209.16 * specific language governing permissions and limitations under the
2209.17 * License. When distributing the software, include this License Header
2209.18 * Notice in each file and include the License file at
2209.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2209.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2209.21 * particular file as subject to the "Classpath" exception as provided
2209.22 - * by Sun in the GPL Version 2 section of the License file that
2209.23 + * by Oracle in the GPL Version 2 section of the License file that
2209.24 * accompanied this code. If applicable, add the following below the
2209.25 * License Header, with the fields enclosed by brackets [] replaced by
2209.26 * your own identifying information:
2210.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/ReportIncident.java Fri Jul 16 11:47:36 2010 -0400
2210.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/ReportIncident.java Fri Jul 16 14:21:50 2010 -0400
2210.3 @@ -1,7 +1,10 @@
2210.4 /*
2210.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2210.6 *
2210.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2210.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2210.9 + *
2210.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2210.11 + * Other names may be trademarks of their respective owners.
2210.12 *
2210.13 * The contents of this file are subject to the terms of either the GNU
2210.14 * General Public License Version 2 only ("GPL") or the Common
2210.15 @@ -13,9 +16,9 @@
2210.16 * specific language governing permissions and limitations under the
2210.17 * License. When distributing the software, include this License Header
2210.18 * Notice in each file and include the License file at
2210.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2210.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2210.21 * particular file as subject to the "Classpath" exception as provided
2210.22 - * by Sun in the GPL Version 2 section of the License file that
2210.23 + * by Oracle in the GPL Version 2 section of the License file that
2210.24 * accompanied this code. If applicable, add the following below the
2210.25 * License Header, with the fields enclosed by brackets [] replaced by
2210.26 * your own identifying information:
2211.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/RequestBean1.java Fri Jul 16 11:47:36 2010 -0400
2211.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/RequestBean1.java Fri Jul 16 14:21:50 2010 -0400
2211.3 @@ -1,7 +1,10 @@
2211.4 /*
2211.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2211.6 *
2211.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2211.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2211.9 + *
2211.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2211.11 + * Other names may be trademarks of their respective owners.
2211.12 *
2211.13 * The contents of this file are subject to the terms of either the GNU
2211.14 * General Public License Version 2 only ("GPL") or the Common
2211.15 @@ -13,9 +16,9 @@
2211.16 * specific language governing permissions and limitations under the
2211.17 * License. When distributing the software, include this License Header
2211.18 * Notice in each file and include the License file at
2211.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2211.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2211.21 * particular file as subject to the "Classpath" exception as provided
2211.22 - * by Sun in the GPL Version 2 section of the License file that
2211.23 + * by Oracle in the GPL Version 2 section of the License file that
2211.24 * accompanied this code. If applicable, add the following below the
2211.25 * License Header, with the fields enclosed by brackets [] replaced by
2211.26 * your own identifying information:
2212.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/SessionBean1.java Fri Jul 16 11:47:36 2010 -0400
2212.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/SessionBean1.java Fri Jul 16 14:21:50 2010 -0400
2212.3 @@ -1,7 +1,10 @@
2212.4 /*
2212.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2212.6 *
2212.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2212.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2212.9 + *
2212.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2212.11 + * Other names may be trademarks of their respective owners.
2212.12 *
2212.13 * The contents of this file are subject to the terms of either the GNU
2212.14 * General Public License Version 2 only ("GPL") or the Common
2212.15 @@ -13,9 +16,9 @@
2212.16 * specific language governing permissions and limitations under the
2212.17 * License. When distributing the software, include this License Header
2212.18 * Notice in each file and include the License file at
2212.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2212.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2212.21 * particular file as subject to the "Classpath" exception as provided
2212.22 - * by Sun in the GPL Version 2 section of the License file that
2212.23 + * by Oracle in the GPL Version 2 section of the License file that
2212.24 * accompanied this code. If applicable, add the following below the
2212.25 * License Header, with the fields enclosed by brackets [] replaced by
2212.26 * your own identifying information:
2213.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Vehicles.java Fri Jul 16 11:47:36 2010 -0400
2213.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/src/java/vehicleincidentreportapplication/Vehicles.java Fri Jul 16 14:21:50 2010 -0400
2213.3 @@ -1,7 +1,10 @@
2213.4 /*
2213.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2213.6 *
2213.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2213.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2213.9 + *
2213.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2213.11 + * Other names may be trademarks of their respective owners.
2213.12 *
2213.13 * The contents of this file are subject to the terms of either the GNU
2213.14 * General Public License Version 2 only ("GPL") or the Common
2213.15 @@ -13,9 +16,9 @@
2213.16 * specific language governing permissions and limitations under the
2213.17 * License. When distributing the software, include this License Header
2213.18 * Notice in each file and include the License file at
2213.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2213.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2213.21 * particular file as subject to the "Classpath" exception as provided
2213.22 - * by Sun in the GPL Version 2 section of the License file that
2213.23 + * by Oracle in the GPL Version 2 section of the License file that
2213.24 * accompanied this code. If applicable, add the following below the
2213.25 * License Header, with the fields enclosed by brackets [] replaced by
2213.26 * your own identifying information:
2214.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/AddVehicle.jsp Fri Jul 16 11:47:36 2010 -0400
2214.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/AddVehicle.jsp Fri Jul 16 14:21:50 2010 -0400
2214.3 @@ -1,6 +1,6 @@
2214.4 <?xml version="1.0" encoding="UTF-8"?>
2214.5 <!--
2214.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2214.7 + Copyright (c) 2010, Oracle. All rights reserved.
2214.8
2214.9 Redistribution and use in source and binary forms, with or without
2214.10 modification, are permitted provided that the following conditions are met:
2214.11 @@ -12,7 +12,7 @@
2214.12 this list of conditions and the following disclaimer in the documentation
2214.13 and/or other materials provided with the distribution.
2214.14
2214.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2214.16 + * Neither the name of Oracle nor the names of its contributors
2214.17 may be used to endorse or promote products derived from this software without
2214.18 specific prior written permission.
2214.19
2215.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/ChooseVehicle.jsp Fri Jul 16 11:47:36 2010 -0400
2215.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/ChooseVehicle.jsp Fri Jul 16 14:21:50 2010 -0400
2215.3 @@ -1,6 +1,6 @@
2215.4 <?xml version="1.0" encoding="UTF-8"?>
2215.5 <!--
2215.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2215.7 + Copyright (c) 2010, Oracle. All rights reserved.
2215.8
2215.9 Redistribution and use in source and binary forms, with or without
2215.10 modification, are permitted provided that the following conditions are met:
2215.11 @@ -12,7 +12,7 @@
2215.12 this list of conditions and the following disclaimer in the documentation
2215.13 and/or other materials provided with the distribution.
2215.14
2215.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2215.16 + * Neither the name of Oracle nor the names of its contributors
2215.17 may be used to endorse or promote products derived from this software without
2215.18 specific prior written permission.
2215.19
2216.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/FindVehicle.jsp Fri Jul 16 11:47:36 2010 -0400
2216.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/FindVehicle.jsp Fri Jul 16 14:21:50 2010 -0400
2216.3 @@ -1,6 +1,6 @@
2216.4 <?xml version="1.0" encoding="UTF-8"?>
2216.5 <!--
2216.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2216.7 + Copyright (c) 2010, Oracle. All rights reserved.
2216.8
2216.9 Redistribution and use in source and binary forms, with or without
2216.10 modification, are permitted provided that the following conditions are met:
2216.11 @@ -12,7 +12,7 @@
2216.12 this list of conditions and the following disclaimer in the documentation
2216.13 and/or other materials provided with the distribution.
2216.14
2216.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2216.16 + * Neither the name of Oracle nor the names of its contributors
2216.17 may be used to endorse or promote products derived from this software without
2216.18 specific prior written permission.
2216.19
2217.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Footer.jspf Fri Jul 16 11:47:36 2010 -0400
2217.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Footer.jspf Fri Jul 16 14:21:50 2010 -0400
2217.3 @@ -1,6 +1,6 @@
2217.4 <?xml version="1.0" encoding="UTF-8"?>
2217.5 <!--
2217.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2217.7 + Copyright (c) 2010, Oracle. All rights reserved.
2217.8
2217.9 Redistribution and use in source and binary forms, with or without
2217.10 modification, are permitted provided that the following conditions are met:
2217.11 @@ -12,7 +12,7 @@
2217.12 this list of conditions and the following disclaimer in the documentation
2217.13 and/or other materials provided with the distribution.
2217.14
2217.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2217.16 + * Neither the name of Oracle nor the names of its contributors
2217.17 may be used to endorse or promote products derived from this software without
2217.18 specific prior written permission.
2217.19
2218.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Header.jspf Fri Jul 16 11:47:36 2010 -0400
2218.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Header.jspf Fri Jul 16 14:21:50 2010 -0400
2218.3 @@ -1,6 +1,6 @@
2218.4 <?xml version="1.0" encoding="UTF-8"?>
2218.5 <!--
2218.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2218.7 + Copyright (c) 2010, Oracle. All rights reserved.
2218.8
2218.9 Redistribution and use in source and binary forms, with or without
2218.10 modification, are permitted provided that the following conditions are met:
2218.11 @@ -12,7 +12,7 @@
2218.12 this list of conditions and the following disclaimer in the documentation
2218.13 and/or other materials provided with the distribution.
2218.14
2218.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2218.16 + * Neither the name of Oracle nor the names of its contributors
2218.17 may be used to endorse or promote products derived from this software without
2218.18 specific prior written permission.
2218.19
2219.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Help.jsp Fri Jul 16 11:47:36 2010 -0400
2219.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Help.jsp Fri Jul 16 14:21:50 2010 -0400
2219.3 @@ -1,6 +1,6 @@
2219.4 <?xml version="1.0" encoding="UTF-8"?>
2219.5 <!--
2219.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2219.7 + Copyright (c) 2010, Oracle. All rights reserved.
2219.8
2219.9 Redistribution and use in source and binary forms, with or without
2219.10 modification, are permitted provided that the following conditions are met:
2219.11 @@ -12,7 +12,7 @@
2219.12 this list of conditions and the following disclaimer in the documentation
2219.13 and/or other materials provided with the distribution.
2219.14
2219.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2219.16 + * Neither the name of Oracle nor the names of its contributors
2219.17 may be used to endorse or promote products derived from this software without
2219.18 specific prior written permission.
2219.19
2220.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/IncidentReported.jsp Fri Jul 16 11:47:36 2010 -0400
2220.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/IncidentReported.jsp Fri Jul 16 14:21:50 2010 -0400
2220.3 @@ -1,6 +1,6 @@
2220.4 <?xml version="1.0" encoding="UTF-8"?>
2220.5 <!--
2220.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2220.7 + Copyright (c) 2010, Oracle. All rights reserved.
2220.8
2220.9 Redistribution and use in source and binary forms, with or without
2220.10 modification, are permitted provided that the following conditions are met:
2220.11 @@ -12,7 +12,7 @@
2220.12 this list of conditions and the following disclaimer in the documentation
2220.13 and/or other materials provided with the distribution.
2220.14
2220.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2220.16 + * Neither the name of Oracle nor the names of its contributors
2220.17 may be used to endorse or promote products derived from this software without
2220.18 specific prior written permission.
2220.19
2221.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Login.jsp Fri Jul 16 11:47:36 2010 -0400
2221.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Login.jsp Fri Jul 16 14:21:50 2010 -0400
2221.3 @@ -1,6 +1,6 @@
2221.4 <?xml version="1.0" encoding="UTF-8"?>
2221.5 <!--
2221.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2221.7 + Copyright (c) 2010, Oracle. All rights reserved.
2221.8
2221.9 Redistribution and use in source and binary forms, with or without
2221.10 modification, are permitted provided that the following conditions are met:
2221.11 @@ -12,7 +12,7 @@
2221.12 this list of conditions and the following disclaimer in the documentation
2221.13 and/or other materials provided with the distribution.
2221.14
2221.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2221.16 + * Neither the name of Oracle nor the names of its contributors
2221.17 may be used to endorse or promote products derived from this software without
2221.18 specific prior written permission.
2221.19
2222.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/NewUser.jsp Fri Jul 16 11:47:36 2010 -0400
2222.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/NewUser.jsp Fri Jul 16 14:21:50 2010 -0400
2222.3 @@ -1,6 +1,6 @@
2222.4 <?xml version="1.0" encoding="UTF-8"?>
2222.5 <!--
2222.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2222.7 + Copyright (c) 2010, Oracle. All rights reserved.
2222.8
2222.9 Redistribution and use in source and binary forms, with or without
2222.10 modification, are permitted provided that the following conditions are met:
2222.11 @@ -12,7 +12,7 @@
2222.12 this list of conditions and the following disclaimer in the documentation
2222.13 and/or other materials provided with the distribution.
2222.14
2222.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2222.16 + * Neither the name of Oracle nor the names of its contributors
2222.17 may be used to endorse or promote products derived from this software without
2222.18 specific prior written permission.
2222.19
2223.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Profile.jsp Fri Jul 16 11:47:36 2010 -0400
2223.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Profile.jsp Fri Jul 16 14:21:50 2010 -0400
2223.3 @@ -1,6 +1,6 @@
2223.4 <?xml version="1.0" encoding="UTF-8"?>
2223.5 <!--
2223.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2223.7 + Copyright (c) 2010, Oracle. All rights reserved.
2223.8
2223.9 Redistribution and use in source and binary forms, with or without
2223.10 modification, are permitted provided that the following conditions are met:
2223.11 @@ -12,7 +12,7 @@
2223.12 this list of conditions and the following disclaimer in the documentation
2223.13 and/or other materials provided with the distribution.
2223.14
2223.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2223.16 + * Neither the name of Oracle nor the names of its contributors
2223.17 may be used to endorse or promote products derived from this software without
2223.18 specific prior written permission.
2223.19
2224.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/ReportIncident.jsp Fri Jul 16 11:47:36 2010 -0400
2224.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/ReportIncident.jsp Fri Jul 16 14:21:50 2010 -0400
2224.3 @@ -1,6 +1,6 @@
2224.4 <?xml version="1.0" encoding="UTF-8"?>
2224.5 <!--
2224.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2224.7 + Copyright (c) 2010, Oracle. All rights reserved.
2224.8
2224.9 Redistribution and use in source and binary forms, with or without
2224.10 modification, are permitted provided that the following conditions are met:
2224.11 @@ -12,7 +12,7 @@
2224.12 this list of conditions and the following disclaimer in the documentation
2224.13 and/or other materials provided with the distribution.
2224.14
2224.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2224.16 + * Neither the name of Oracle nor the names of its contributors
2224.17 may be used to endorse or promote products derived from this software without
2224.18 specific prior written permission.
2224.19
2225.1 --- a/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Vehicles.jsp Fri Jul 16 11:47:36 2010 -0400
2225.2 +++ b/visualweb.samples.bundled/webapps/VehicleIncidentReportApplication/web/Vehicles.jsp Fri Jul 16 14:21:50 2010 -0400
2225.3 @@ -1,6 +1,6 @@
2225.4 <?xml version="1.0" encoding="UTF-8"?>
2225.5 <!--
2225.6 - Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
2225.7 + Copyright (c) 2010, Oracle. All rights reserved.
2225.8
2225.9 Redistribution and use in source and binary forms, with or without
2225.10 modification, are permitted provided that the following conditions are met:
2225.11 @@ -12,7 +12,7 @@
2225.12 this list of conditions and the following disclaimer in the documentation
2225.13 and/or other materials provided with the distribution.
2225.14
2225.15 - * Neither the name of Sun Microsystems, Inc. nor the names of its contributors
2225.16 + * Neither the name of Oracle nor the names of its contributors
2225.17 may be used to endorse or promote products derived from this software without
2225.18 specific prior written permission.
2225.19
2226.1 --- a/visualweb.web.ui.appbase/build.xml Fri Jul 16 11:47:36 2010 -0400
2226.2 +++ b/visualweb.web.ui.appbase/build.xml Fri Jul 16 14:21:50 2010 -0400
2226.3 @@ -2,7 +2,10 @@
2226.4 <!--
2226.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2226.6
2226.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2226.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2226.9 +
2226.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2226.11 +Other names may be trademarks of their respective owners.
2226.12
2226.13
2226.14 The contents of this file are subject to the terms of either the GNU
2226.15 @@ -15,9 +18,9 @@
2226.16 specific language governing permissions and limitations under the
2226.17 License. When distributing the software, include this License Header
2226.18 Notice in each file and include the License file at
2226.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2226.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2226.21 particular file as subject to the "Classpath" exception as provided
2226.22 -by Sun in the GPL Version 2 section of the License file that
2226.23 +by Oracle in the GPL Version 2 section of the License file that
2226.24 accompanied this code. If applicable, add the following below the
2226.25 License Header, with the fields enclosed by brackets [] replaced by
2226.26 your own identifying information:
2227.1 --- a/visualweb.web.ui.appbase/library/build.xml Fri Jul 16 11:47:36 2010 -0400
2227.2 +++ b/visualweb.web.ui.appbase/library/build.xml Fri Jul 16 14:21:50 2010 -0400
2227.3 @@ -2,7 +2,10 @@
2227.4 <!--
2227.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2227.6
2227.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2227.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2227.9 +
2227.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2227.11 +Other names may be trademarks of their respective owners.
2227.12
2227.13
2227.14 The contents of this file are subject to the terms of either the GNU
2227.15 @@ -15,9 +18,9 @@
2227.16 specific language governing permissions and limitations under the
2227.17 License. When distributing the software, include this License Header
2227.18 Notice in each file and include the License file at
2227.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2227.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2227.21 particular file as subject to the "Classpath" exception as provided
2227.22 -by Sun in the GPL Version 2 section of the License file that
2227.23 +by Oracle in the GPL Version 2 section of the License file that
2227.24 accompanied this code. If applicable, add the following below the
2227.25 License Header, with the fields enclosed by brackets [] replaced by
2227.26 your own identifying information:
2228.1 --- a/visualweb.web.ui.appbase/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2228.2 +++ b/visualweb.web.ui.appbase/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2228.3 @@ -1,6 +1,9 @@
2228.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2228.5 #
2228.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2228.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2228.8 +#
2228.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2228.10 +# Other names may be trademarks of their respective owners.
2228.11 #
2228.12 # The contents of this file are subject to the terms of either the GNU
2228.13 # General Public License Version 2 only ("GPL") or the Common
2228.14 @@ -12,9 +15,9 @@
2228.15 # specific language governing permissions and limitations under the
2228.16 # License. When distributing the software, include this License Header
2228.17 # Notice in each file and include the License file at
2228.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2228.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2228.20 # particular file as subject to the "Classpath" exception as provided
2228.21 -# by Sun in the GPL Version 2 section of the License file that
2228.22 +# by Oracle in the GPL Version 2 section of the License file that
2228.23 # accompanied this code. If applicable, add the following below the
2228.24 # License Header, with the fields enclosed by brackets [] replaced by
2228.25 # your own identifying information:
2228.26 @@ -63,12 +66,12 @@
2228.27 src.zip=${dist.dir}/appbase-src.zip
2228.28
2228.29 # Have JSF1.2 API, JSP & Servlet API
2228.30 -file.reference.servlet2.5-jsp2.1-api.jar=../../servletjspapi/external/servlet2.5-jsp2.1-api.jar
2228.31 +file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
2228.32 file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
2228.33
2228.34 jar.compress=false
2228.35 javac.classpath=\
2228.36 - ${file.reference.servlet2.5-jsp2.1-api.jar}:\
2228.37 + ${file.reference.servlet3.0-jsp2.2-api.jar}:\
2228.38 ${file.reference.jsf-api.jar}
2228.39
2228.40 # ${file.reference.servlet-jsp-api.jar}:\
2229.1 --- a/visualweb.web.ui.appbase/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2229.2 +++ b/visualweb.web.ui.appbase/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2229.3 @@ -2,7 +2,10 @@
2229.4 <!--
2229.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2229.6
2229.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2229.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2229.9 +
2229.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2229.11 +Other names may be trademarks of their respective owners.
2229.12
2229.13
2229.14 The contents of this file are subject to the terms of either the GNU
2229.15 @@ -15,9 +18,9 @@
2229.16 specific language governing permissions and limitations under the
2229.17 License. When distributing the software, include this License Header
2229.18 Notice in each file and include the License file at
2229.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2229.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2229.21 particular file as subject to the "Classpath" exception as provided
2229.22 -by Sun in the GPL Version 2 section of the License file that
2229.23 +by Oracle in the GPL Version 2 section of the License file that
2229.24 accompanied this code. If applicable, add the following below the
2229.25 License Header, with the fields enclosed by brackets [] replaced by
2229.26 your own identifying information:
2230.1 --- a/visualweb.web.ui.appbase/library/src/META-INF/faces-config.xml Fri Jul 16 11:47:36 2010 -0400
2230.2 +++ b/visualweb.web.ui.appbase/library/src/META-INF/faces-config.xml Fri Jul 16 14:21:50 2010 -0400
2230.3 @@ -3,7 +3,10 @@
2230.4 <!--
2230.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2230.6
2230.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2230.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2230.9 +
2230.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2230.11 +Other names may be trademarks of their respective owners.
2230.12
2230.13
2230.14 The contents of this file are subject to the terms of either the GNU
2230.15 @@ -16,9 +19,9 @@
2230.16 specific language governing permissions and limitations under the
2230.17 License. When distributing the software, include this License Header
2230.18 Notice in each file and include the License file at
2230.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2230.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2230.21 particular file as subject to the "Classpath" exception as provided
2230.22 -by Sun in the GPL Version 2 section of the License file that
2230.23 +by Oracle in the GPL Version 2 section of the License file that
2230.24 accompanied this code. If applicable, add the following below the
2230.25 License Header, with the fields enclosed by brackets [] replaced by
2230.26 your own identifying information:
2231.1 --- a/visualweb.web.ui.appbase/library/src/META-INF/taglib.tld Fri Jul 16 11:47:36 2010 -0400
2231.2 +++ b/visualweb.web.ui.appbase/library/src/META-INF/taglib.tld Fri Jul 16 14:21:50 2010 -0400
2231.3 @@ -1,7 +1,10 @@
2231.4 <?xml version="1.0" encoding="UTF-8"?>
2231.5
2231.6 <!--
2231.7 - Copyright 2003 Sun Microsystems, Inc. All rights reserved.
2231.8 + Copyright 2010 Oracle and/or its affiliates. All rights reserved.
2231.9 +
2231.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2231.11 +Other names may be trademarks of their respective owners.
2231.12 SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
2231.13 -->
2231.14
2232.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractApplicationBean.java Fri Jul 16 11:47:36 2010 -0400
2232.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractApplicationBean.java Fri Jul 16 14:21:50 2010 -0400
2232.3 @@ -1,7 +1,10 @@
2232.4 /*
2232.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2232.6 *
2232.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2232.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2232.9 + *
2232.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2232.11 + * Other names may be trademarks of their respective owners.
2232.12 *
2232.13 * The contents of this file are subject to the terms of either the GNU
2232.14 * General Public License Version 2 only ("GPL") or the Common
2232.15 @@ -13,9 +16,9 @@
2232.16 * specific language governing permissions and limitations under the
2232.17 * License. When distributing the software, include this License Header
2232.18 * Notice in each file and include the License file at
2232.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2232.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2232.21 * particular file as subject to the "Classpath" exception as provided
2232.22 - * by Sun in the GPL Version 2 section of the License file that
2232.23 + * by Oracle in the GPL Version 2 section of the License file that
2232.24 * accompanied this code. If applicable, add the following below the
2232.25 * License Header, with the fields enclosed by brackets [] replaced by
2232.26 * your own identifying information:
2233.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractFragmentBean.java Fri Jul 16 11:47:36 2010 -0400
2233.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractFragmentBean.java Fri Jul 16 14:21:50 2010 -0400
2233.3 @@ -1,7 +1,10 @@
2233.4 /*
2233.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2233.6 *
2233.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2233.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2233.9 + *
2233.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2233.11 + * Other names may be trademarks of their respective owners.
2233.12 *
2233.13 * The contents of this file are subject to the terms of either the GNU
2233.14 * General Public License Version 2 only ("GPL") or the Common
2233.15 @@ -13,9 +16,9 @@
2233.16 * specific language governing permissions and limitations under the
2233.17 * License. When distributing the software, include this License Header
2233.18 * Notice in each file and include the License file at
2233.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2233.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2233.21 * particular file as subject to the "Classpath" exception as provided
2233.22 - * by Sun in the GPL Version 2 section of the License file that
2233.23 + * by Oracle in the GPL Version 2 section of the License file that
2233.24 * accompanied this code. If applicable, add the following below the
2233.25 * License Header, with the fields enclosed by brackets [] replaced by
2233.26 * your own identifying information:
2234.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractPageBean.java Fri Jul 16 11:47:36 2010 -0400
2234.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractPageBean.java Fri Jul 16 14:21:50 2010 -0400
2234.3 @@ -1,7 +1,10 @@
2234.4 /*
2234.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2234.6 *
2234.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2234.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2234.9 + *
2234.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2234.11 + * Other names may be trademarks of their respective owners.
2234.12 *
2234.13 * The contents of this file are subject to the terms of either the GNU
2234.14 * General Public License Version 2 only ("GPL") or the Common
2234.15 @@ -13,9 +16,9 @@
2234.16 * specific language governing permissions and limitations under the
2234.17 * License. When distributing the software, include this License Header
2234.18 * Notice in each file and include the License file at
2234.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2234.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2234.21 * particular file as subject to the "Classpath" exception as provided
2234.22 - * by Sun in the GPL Version 2 section of the License file that
2234.23 + * by Oracle in the GPL Version 2 section of the License file that
2234.24 * accompanied this code. If applicable, add the following below the
2234.25 * License Header, with the fields enclosed by brackets [] replaced by
2234.26 * your own identifying information:
2235.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractRequestBean.java Fri Jul 16 11:47:36 2010 -0400
2235.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractRequestBean.java Fri Jul 16 14:21:50 2010 -0400
2235.3 @@ -1,7 +1,10 @@
2235.4 /*
2235.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2235.6 *
2235.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2235.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2235.9 + *
2235.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2235.11 + * Other names may be trademarks of their respective owners.
2235.12 *
2235.13 * The contents of this file are subject to the terms of either the GNU
2235.14 * General Public License Version 2 only ("GPL") or the Common
2235.15 @@ -13,9 +16,9 @@
2235.16 * specific language governing permissions and limitations under the
2235.17 * License. When distributing the software, include this License Header
2235.18 * Notice in each file and include the License file at
2235.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2235.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2235.21 * particular file as subject to the "Classpath" exception as provided
2235.22 - * by Sun in the GPL Version 2 section of the License file that
2235.23 + * by Oracle in the GPL Version 2 section of the License file that
2235.24 * accompanied this code. If applicable, add the following below the
2235.25 * License Header, with the fields enclosed by brackets [] replaced by
2235.26 * your own identifying information:
2236.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractSessionBean.java Fri Jul 16 11:47:36 2010 -0400
2236.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/AbstractSessionBean.java Fri Jul 16 14:21:50 2010 -0400
2236.3 @@ -1,7 +1,10 @@
2236.4 /*
2236.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2236.6 *
2236.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2236.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2236.9 + *
2236.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2236.11 + * Other names may be trademarks of their respective owners.
2236.12 *
2236.13 * The contents of this file are subject to the terms of either the GNU
2236.14 * General Public License Version 2 only ("GPL") or the Common
2236.15 @@ -13,9 +16,9 @@
2236.16 * specific language governing permissions and limitations under the
2236.17 * License. When distributing the software, include this License Header
2236.18 * Notice in each file and include the License file at
2236.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2236.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2236.21 * particular file as subject to the "Classpath" exception as provided
2236.22 - * by Sun in the GPL Version 2 section of the License file that
2236.23 + * by Oracle in the GPL Version 2 section of the License file that
2236.24 * accompanied this code. If applicable, add the following below the
2236.25 * License Header, with the fields enclosed by brackets [] replaced by
2236.26 * your own identifying information:
2237.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/ApplicationException.java Fri Jul 16 11:47:36 2010 -0400
2237.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/ApplicationException.java Fri Jul 16 14:21:50 2010 -0400
2237.3 @@ -1,7 +1,10 @@
2237.4 /*
2237.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2237.6 *
2237.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2237.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2237.9 + *
2237.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2237.11 + * Other names may be trademarks of their respective owners.
2237.12 *
2237.13 * The contents of this file are subject to the terms of either the GNU
2237.14 * General Public License Version 2 only ("GPL") or the Common
2237.15 @@ -13,9 +16,9 @@
2237.16 * specific language governing permissions and limitations under the
2237.17 * License. When distributing the software, include this License Header
2237.18 * Notice in each file and include the License file at
2237.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2237.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2237.21 * particular file as subject to the "Classpath" exception as provided
2237.22 - * by Sun in the GPL Version 2 section of the License file that
2237.23 + * by Oracle in the GPL Version 2 section of the License file that
2237.24 * accompanied this code. If applicable, add the following below the
2237.25 * License Header, with the fields enclosed by brackets [] replaced by
2237.26 * your own identifying information:
2238.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/FacesBean.java Fri Jul 16 11:47:36 2010 -0400
2238.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/FacesBean.java Fri Jul 16 14:21:50 2010 -0400
2238.3 @@ -1,7 +1,10 @@
2238.4 /*
2238.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2238.6 *
2238.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2238.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2238.9 + *
2238.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2238.11 + * Other names may be trademarks of their respective owners.
2238.12 *
2238.13 * The contents of this file are subject to the terms of either the GNU
2238.14 * General Public License Version 2 only ("GPL") or the Common
2238.15 @@ -13,9 +16,9 @@
2238.16 * specific language governing permissions and limitations under the
2238.17 * License. When distributing the software, include this License Header
2238.18 * Notice in each file and include the License file at
2238.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2238.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2238.21 * particular file as subject to the "Classpath" exception as provided
2238.22 - * by Sun in the GPL Version 2 section of the License file that
2238.23 + * by Oracle in the GPL Version 2 section of the License file that
2238.24 * accompanied this code. If applicable, add the following below the
2238.25 * License Header, with the fields enclosed by brackets [] replaced by
2238.26 * your own identifying information:
2239.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/faces/ActionListenerImpl.java Fri Jul 16 11:47:36 2010 -0400
2239.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/faces/ActionListenerImpl.java Fri Jul 16 14:21:50 2010 -0400
2239.3 @@ -1,7 +1,10 @@
2239.4 /*
2239.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2239.6 *
2239.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2239.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2239.9 + *
2239.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2239.11 + * Other names may be trademarks of their respective owners.
2239.12 *
2239.13 * The contents of this file are subject to the terms of either the GNU
2239.14 * General Public License Version 2 only ("GPL") or the Common
2239.15 @@ -13,9 +16,9 @@
2239.16 * specific language governing permissions and limitations under the
2239.17 * License. When distributing the software, include this License Header
2239.18 * Notice in each file and include the License file at
2239.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2239.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2239.21 * particular file as subject to the "Classpath" exception as provided
2239.22 - * by Sun in the GPL Version 2 section of the License file that
2239.23 + * by Oracle in the GPL Version 2 section of the License file that
2239.24 * accompanied this code. If applicable, add the following below the
2239.25 * License Header, with the fields enclosed by brackets [] replaced by
2239.26 * your own identifying information:
2240.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/faces/PageBeanMapper.java Fri Jul 16 11:47:36 2010 -0400
2240.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/faces/PageBeanMapper.java Fri Jul 16 14:21:50 2010 -0400
2240.3 @@ -1,7 +1,10 @@
2240.4 /*
2240.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2240.6 *
2240.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2240.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2240.9 + *
2240.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2240.11 + * Other names may be trademarks of their respective owners.
2240.12 *
2240.13 * The contents of this file are subject to the terms of either the GNU
2240.14 * General Public License Version 2 only ("GPL") or the Common
2240.15 @@ -13,9 +16,9 @@
2240.16 * specific language governing permissions and limitations under the
2240.17 * License. When distributing the software, include this License Header
2240.18 * Notice in each file and include the License file at
2240.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2240.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2240.21 * particular file as subject to the "Classpath" exception as provided
2240.22 - * by Sun in the GPL Version 2 section of the License file that
2240.23 + * by Oracle in the GPL Version 2 section of the License file that
2240.24 * accompanied this code. If applicable, add the following below the
2240.25 * License Header, with the fields enclosed by brackets [] replaced by
2240.26 * your own identifying information:
2241.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/faces/PageBeanMapperImpl.java Fri Jul 16 11:47:36 2010 -0400
2241.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/faces/PageBeanMapperImpl.java Fri Jul 16 14:21:50 2010 -0400
2241.3 @@ -1,7 +1,10 @@
2241.4 /*
2241.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2241.6 *
2241.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2241.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2241.9 + *
2241.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2241.11 + * Other names may be trademarks of their respective owners.
2241.12 *
2241.13 * The contents of this file are subject to the terms of either the GNU
2241.14 * General Public License Version 2 only ("GPL") or the Common
2241.15 @@ -13,9 +16,9 @@
2241.16 * specific language governing permissions and limitations under the
2241.17 * License. When distributing the software, include this License Header
2241.18 * Notice in each file and include the License file at
2241.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2241.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2241.21 * particular file as subject to the "Classpath" exception as provided
2241.22 - * by Sun in the GPL Version 2 section of the License file that
2241.23 + * by Oracle in the GPL Version 2 section of the License file that
2241.24 * accompanied this code. If applicable, add the following below the
2241.25 * License Header, with the fields enclosed by brackets [] replaced by
2241.26 * your own identifying information:
2242.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/faces/ViewHandlerImpl.java Fri Jul 16 11:47:36 2010 -0400
2242.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/faces/ViewHandlerImpl.java Fri Jul 16 14:21:50 2010 -0400
2242.3 @@ -1,7 +1,10 @@
2242.4 /*
2242.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2242.6 *
2242.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2242.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2242.9 + *
2242.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2242.11 + * Other names may be trademarks of their respective owners.
2242.12 *
2242.13 * The contents of this file are subject to the terms of either the GNU
2242.14 * General Public License Version 2 only ("GPL") or the Common
2242.15 @@ -13,9 +16,9 @@
2242.16 * specific language governing permissions and limitations under the
2242.17 * License. When distributing the software, include this License Header
2242.18 * Notice in each file and include the License file at
2242.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2242.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2242.21 * particular file as subject to the "Classpath" exception as provided
2242.22 - * by Sun in the GPL Version 2 section of the License file that
2242.23 + * by Oracle in the GPL Version 2 section of the License file that
2242.24 * accompanied this code. If applicable, add the following below the
2242.25 * License Header, with the fields enclosed by brackets [] replaced by
2242.26 * your own identifying information:
2243.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/renderer/CommandLinkRenderer.java Fri Jul 16 11:47:36 2010 -0400
2243.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/renderer/CommandLinkRenderer.java Fri Jul 16 14:21:50 2010 -0400
2243.3 @@ -1,7 +1,10 @@
2243.4 /*
2243.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2243.6 *
2243.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2243.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2243.9 + *
2243.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2243.11 + * Other names may be trademarks of their respective owners.
2243.12 *
2243.13 * The contents of this file are subject to the terms of either the GNU
2243.14 * General Public License Version 2 only ("GPL") or the Common
2243.15 @@ -13,9 +16,9 @@
2243.16 * specific language governing permissions and limitations under the
2243.17 * License. When distributing the software, include this License Header
2243.18 * Notice in each file and include the License file at
2243.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2243.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2243.21 * particular file as subject to the "Classpath" exception as provided
2243.22 - * by Sun in the GPL Version 2 section of the License file that
2243.23 + * by Oracle in the GPL Version 2 section of the License file that
2243.24 * accompanied this code. If applicable, add the following below the
2243.25 * License Header, with the fields enclosed by brackets [] replaced by
2243.26 * your own identifying information:
2244.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/servlet/DummyTag.java Fri Jul 16 11:47:36 2010 -0400
2244.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/servlet/DummyTag.java Fri Jul 16 14:21:50 2010 -0400
2244.3 @@ -1,7 +1,10 @@
2244.4 /*
2244.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2244.6 *
2244.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2244.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2244.9 + *
2244.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2244.11 + * Other names may be trademarks of their respective owners.
2244.12 *
2244.13 * The contents of this file are subject to the terms of either the GNU
2244.14 * General Public License Version 2 only ("GPL") or the Common
2244.15 @@ -13,9 +16,9 @@
2244.16 * specific language governing permissions and limitations under the
2244.17 * License. When distributing the software, include this License Header
2244.18 * Notice in each file and include the License file at
2244.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2244.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2244.21 * particular file as subject to the "Classpath" exception as provided
2244.22 - * by Sun in the GPL Version 2 section of the License file that
2244.23 + * by Oracle in the GPL Version 2 section of the License file that
2244.24 * accompanied this code. If applicable, add the following below the
2244.25 * License Header, with the fields enclosed by brackets [] replaced by
2244.26 * your own identifying information:
2245.1 --- a/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/servlet/LifecycleListener.java Fri Jul 16 11:47:36 2010 -0400
2245.2 +++ b/visualweb.web.ui.appbase/library/src/com/sun/rave/web/ui/appbase/servlet/LifecycleListener.java Fri Jul 16 14:21:50 2010 -0400
2245.3 @@ -1,7 +1,10 @@
2245.4 /*
2245.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2245.6 *
2245.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2245.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2245.9 + *
2245.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2245.11 + * Other names may be trademarks of their respective owners.
2245.12 *
2245.13 * The contents of this file are subject to the terms of either the GNU
2245.14 * General Public License Version 2 only ("GPL") or the Common
2245.15 @@ -13,9 +16,9 @@
2245.16 * specific language governing permissions and limitations under the
2245.17 * License. When distributing the software, include this License Header
2245.18 * Notice in each file and include the License file at
2245.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2245.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2245.21 * particular file as subject to the "Classpath" exception as provided
2245.22 - * by Sun in the GPL Version 2 section of the License file that
2245.23 + * by Oracle in the GPL Version 2 section of the License file that
2245.24 * accompanied this code. If applicable, add the following below the
2245.25 * License Header, with the fields enclosed by brackets [] replaced by
2245.26 * your own identifying information:
2246.1 --- a/visualweb.web.ui.appbase/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2246.2 +++ b/visualweb.web.ui.appbase/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2246.3 @@ -1,6 +1,9 @@
2246.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2246.5 #
2246.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2246.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2246.8 +#
2246.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2246.10 +# Other names may be trademarks of their respective owners.
2246.11 #
2246.12 # The contents of this file are subject to the terms of either the GNU
2246.13 # General Public License Version 2 only ("GPL") or the Common
2246.14 @@ -12,9 +15,9 @@
2246.15 # specific language governing permissions and limitations under the
2246.16 # License. When distributing the software, include this License Header
2246.17 # Notice in each file and include the License file at
2246.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2246.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2246.20 # particular file as subject to the "Classpath" exception as provided
2246.21 -# by Sun in the GPL Version 2 section of the License file that
2246.22 +# by Oracle in the GPL Version 2 section of the License file that
2246.23 # accompanied this code. If applicable, add the following below the
2246.24 # License Header, with the fields enclosed by brackets [] replaced by
2246.25 # your own identifying information:
2247.1 --- a/visualweb.web.ui.appbase/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2247.2 +++ b/visualweb.web.ui.appbase/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2247.3 @@ -2,7 +2,10 @@
2247.4 <!--
2247.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2247.6
2247.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2247.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2247.9 +
2247.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2247.11 +Other names may be trademarks of their respective owners.
2247.12
2247.13
2247.14 The contents of this file are subject to the terms of either the GNU
2247.15 @@ -15,9 +18,9 @@
2247.16 specific language governing permissions and limitations under the
2247.17 License. When distributing the software, include this License Header
2247.18 Notice in each file and include the License file at
2247.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2247.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2247.21 particular file as subject to the "Classpath" exception as provided
2247.22 -by Sun in the GPL Version 2 section of the License file that
2247.23 +by Oracle in the GPL Version 2 section of the License file that
2247.24 accompanied this code. If applicable, add the following below the
2247.25 License Header, with the fields enclosed by brackets [] replaced by
2247.26 your own identifying information:
2248.1 --- a/visualweb.web.ui.appbase/src/org/netbeans/modules/visualweb/web/ui/appbase/module/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2248.2 +++ b/visualweb.web.ui.appbase/src/org/netbeans/modules/visualweb/web/ui/appbase/module/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2248.3 @@ -1,6 +1,9 @@
2248.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2248.5 #
2248.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2248.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2248.8 +#
2248.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2248.10 +# Other names may be trademarks of their respective owners.
2248.11 #
2248.12 # The contents of this file are subject to the terms of either the GNU
2248.13 # General Public License Version 2 only ("GPL") or the Common
2248.14 @@ -12,9 +15,9 @@
2248.15 # specific language governing permissions and limitations under the
2248.16 # License. When distributing the software, include this License Header
2248.17 # Notice in each file and include the License file at
2248.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2248.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2248.20 # particular file as subject to the "Classpath" exception as provided
2248.21 -# by Sun in the GPL Version 2 section of the License file that
2248.22 +# by Oracle in the GPL Version 2 section of the License file that
2248.23 # accompanied this code. If applicable, add the following below the
2248.24 # License Header, with the fields enclosed by brackets [] replaced by
2248.25 # your own identifying information:
2249.1 --- a/visualweb.web.ui.appbase/test/unit/src/org/netbeans/modules/visualweb/appbase/FacesBeanTest.java Fri Jul 16 11:47:36 2010 -0400
2249.2 +++ b/visualweb.web.ui.appbase/test/unit/src/org/netbeans/modules/visualweb/appbase/FacesBeanTest.java Fri Jul 16 14:21:50 2010 -0400
2249.3 @@ -2,9 +2,12 @@
2249.4
2249.5 /*
2249.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2249.7 - *
2249.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2249.9 - *
2249.10 + *
2249.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2249.12 + *
2249.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2249.14 + * Other names may be trademarks of their respective owners.
2249.15 + *
2249.16 * The contents of this file are subject to the terms of either the GNU
2249.17 * General Public License Version 2 only ("GPL") or the Common
2249.18 * Development and Distribution License("CDDL") (collectively, the
2249.19 @@ -15,9 +18,9 @@
2249.20 * specific language governing permissions and limitations under the
2249.21 * License. When distributing the software, include this License Header
2249.22 * Notice in each file and include the License file at
2249.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2249.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2249.25 * particular file as subject to the "Classpath" exception as provided
2249.26 - * by Sun in the GPL Version 2 section of the License file that
2249.27 + * by Oracle in the GPL Version 2 section of the License file that
2249.28 * accompanied this code. If applicable, add the following below the
2249.29 * License Header, with the fields enclosed by brackets [] replaced by
2249.30 * your own identifying information:
2250.1 --- a/visualweb.websvcmgr/build.xml Fri Jul 16 11:47:36 2010 -0400
2250.2 +++ b/visualweb.websvcmgr/build.xml Fri Jul 16 14:21:50 2010 -0400
2250.3 @@ -2,7 +2,10 @@
2250.4 <!--
2250.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2250.6
2250.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2250.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2250.9 +
2250.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2250.11 +Other names may be trademarks of their respective owners.
2250.12
2250.13
2250.14 The contents of this file are subject to the terms of either the GNU
2250.15 @@ -15,9 +18,9 @@
2250.16 specific language governing permissions and limitations under the
2250.17 License. When distributing the software, include this License Header
2250.18 Notice in each file and include the License file at
2250.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2250.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2250.21 particular file as subject to the "Classpath" exception as provided
2250.22 -by Sun in the GPL Version 2 section of the License file that
2250.23 +by Oracle in the GPL Version 2 section of the License file that
2250.24 accompanied this code. If applicable, add the following below the
2250.25 License Header, with the fields enclosed by brackets [] replaced by
2250.26 your own identifying information:
2251.1 --- a/visualweb.websvcmgr/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2251.2 +++ b/visualweb.websvcmgr/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2251.3 @@ -1,6 +1,9 @@
2251.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2251.5 #
2251.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2251.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2251.8 +#
2251.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2251.10 +# Other names may be trademarks of their respective owners.
2251.11 #
2251.12 # The contents of this file are subject to the terms of either the GNU
2251.13 # General Public License Version 2 only ("GPL") or the Common
2251.14 @@ -12,9 +15,9 @@
2251.15 # specific language governing permissions and limitations under the
2251.16 # License. When distributing the software, include this License Header
2251.17 # Notice in each file and include the License file at
2251.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2251.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2251.20 # particular file as subject to the "Classpath" exception as provided
2251.21 -# by Sun in the GPL Version 2 section of the License file that
2251.22 +# by Oracle in the GPL Version 2 section of the License file that
2251.23 # accompanied this code. If applicable, add the following below the
2251.24 # License Header, with the fields enclosed by brackets [] replaced by
2251.25 # your own identifying information:
2251.26 @@ -37,7 +40,7 @@
2251.27 # Version 2 license, then the option applies only if the new code is
2251.28 # made subject to such option by the copyright holder.
2251.29
2251.30 -javac.source=1.5
2251.31 +javac.source=1.6
2251.32 test-unit-sys-prop.java.endorsed.dirs=${websvc.jaxws21.dir}/modules/ext/jaxws21/api
2251.33 test.qa-functional.cp.extra=${nb_all}/visualweb.kit/gravy/builds/gravy.jar:\
2251.34 ${visualweb.websvcmgr.dir}/modules/ext/tidy-mod.jar:\
2252.1 --- a/visualweb.websvcmgr/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2252.2 +++ b/visualweb.websvcmgr/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2252.3 @@ -2,7 +2,10 @@
2252.4 <!--
2252.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2252.6
2252.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2252.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2252.9 +
2252.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2252.11 +Other names may be trademarks of their respective owners.
2252.12
2252.13
2252.14 The contents of this file are subject to the terms of either the GNU
2252.15 @@ -15,9 +18,9 @@
2252.16 specific language governing permissions and limitations under the
2252.17 License. When distributing the software, include this License Header
2252.18 Notice in each file and include the License file at
2252.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2252.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2252.21 particular file as subject to the "Classpath" exception as provided
2252.22 -by Sun in the GPL Version 2 section of the License file that
2252.23 +by Oracle in the GPL Version 2 section of the License file that
2252.24 accompanied this code. If applicable, add the following below the
2252.25 License Header, with the fields enclosed by brackets [] replaced by
2252.26 your own identifying information:
2252.27 @@ -309,7 +312,15 @@
2252.28 <build-prerequisite/>
2252.29 <compile-dependency/>
2252.30 <run-dependency>
2252.31 - <specification-version>6.8</specification-version>
2252.32 + <specification-version>8.0</specification-version>
2252.33 + </run-dependency>
2252.34 + </dependency>
2252.35 + <dependency>
2252.36 + <code-name-base>org.openide.util.lookup</code-name-base>
2252.37 + <build-prerequisite/>
2252.38 + <compile-dependency/>
2252.39 + <run-dependency>
2252.40 + <specification-version>8.0</specification-version>
2252.41 </run-dependency>
2252.42 </dependency>
2252.43 <dependency>
2253.1 --- a/visualweb.websvcmgr/release/ws_import_compile.xml Fri Jul 16 11:47:36 2010 -0400
2253.2 +++ b/visualweb.websvcmgr/release/ws_import_compile.xml Fri Jul 16 14:21:50 2010 -0400
2253.3 @@ -2,7 +2,10 @@
2253.4 <!--
2253.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2253.6
2253.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2253.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2253.9 +
2253.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2253.11 +Other names may be trademarks of their respective owners.
2253.12
2253.13
2253.14 The contents of this file are subject to the terms of either the GNU
2253.15 @@ -15,9 +18,9 @@
2253.16 specific language governing permissions and limitations under the
2253.17 License. When distributing the software, include this License Header
2253.18 Notice in each file and include the License file at
2253.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2253.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2253.21 particular file as subject to the "Classpath" exception as provided
2253.22 -by Sun in the GPL Version 2 section of the License file that
2253.23 +by Oracle in the GPL Version 2 section of the License file that
2253.24 accompanied this code. If applicable, add the following below the
2253.25 License Header, with the fields enclosed by brackets [] replaced by
2253.26 your own identifying information:
2254.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2254.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2254.3 @@ -1,6 +1,9 @@
2254.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2254.5 #
2254.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2254.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2254.8 +#
2254.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2254.10 +# Other names may be trademarks of their respective owners.
2254.11 #
2254.12 # The contents of this file are subject to the terms of either the GNU
2254.13 # General Public License Version 2 only ("GPL") or the Common
2254.14 @@ -12,9 +15,9 @@
2254.15 # specific language governing permissions and limitations under the
2254.16 # License. When distributing the software, include this License Header
2254.17 # Notice in each file and include the License file at
2254.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2254.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2254.20 # particular file as subject to the "Classpath" exception as provided
2254.21 -# by Sun in the GPL Version 2 section of the License file that
2254.22 +# by Oracle in the GPL Version 2 section of the License file that
2254.23 # accompanied this code. If applicable, add the following below the
2254.24 # License Header, with the fields enclosed by brackets [] replaced by
2254.25 # your own identifying information:
2255.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2255.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2255.3 @@ -1,6 +1,9 @@
2255.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2255.5 #
2255.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2255.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2255.8 +#
2255.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2255.10 +# Other names may be trademarks of their respective owners.
2255.11 #
2255.12 # The contents of this file are subject to the terms of either the GNU
2255.13 # General Public License Version 2 only ("GPL") or the Common
2255.14 @@ -12,9 +15,9 @@
2255.15 # specific language governing permissions and limitations under the
2255.16 # License. When distributing the software, include this License Header
2255.17 # Notice in each file and include the License file at
2255.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2255.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2255.20 # particular file as subject to the "Classpath" exception as provided
2255.21 -# by Sun in the GPL Version 2 section of the License file that
2255.22 +# by Oracle in the GPL Version 2 section of the License file that
2255.23 # accompanied this code. If applicable, add the following below the
2255.24 # License Header, with the fields enclosed by brackets [] replaced by
2255.25 # your own identifying information:
2256.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderBeanInfoWriter.java Fri Jul 16 11:47:36 2010 -0400
2256.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderBeanInfoWriter.java Fri Jul 16 14:21:50 2010 -0400
2256.3 @@ -1,7 +1,10 @@
2256.4 /*
2256.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2256.6 *
2256.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2256.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2256.9 + *
2256.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2256.11 + * Other names may be trademarks of their respective owners.
2256.12 *
2256.13 * The contents of this file are subject to the terms of either the GNU
2256.14 * General Public License Version 2 only ("GPL") or the Common
2256.15 @@ -13,9 +16,9 @@
2256.16 * specific language governing permissions and limitations under the
2256.17 * License. When distributing the software, include this License Header
2256.18 * Notice in each file and include the License file at
2256.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2256.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2256.21 * particular file as subject to the "Classpath" exception as provided
2256.22 - * by Sun in the GPL Version 2 section of the License file that
2256.23 + * by Oracle in the GPL Version 2 section of the License file that
2256.24 * accompanied this code. If applicable, add the following below the
2256.25 * License Header, with the fields enclosed by brackets [] replaced by
2256.26 * your own identifying information:
2257.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderDesignInfoWriter.java Fri Jul 16 11:47:36 2010 -0400
2257.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderDesignInfoWriter.java Fri Jul 16 14:21:50 2010 -0400
2257.3 @@ -1,7 +1,10 @@
2257.4 /*
2257.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2257.6 *
2257.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2257.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2257.9 + *
2257.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2257.11 + * Other names may be trademarks of their respective owners.
2257.12 *
2257.13 * The contents of this file are subject to the terms of either the GNU
2257.14 * General Public License Version 2 only ("GPL") or the Common
2257.15 @@ -13,9 +16,9 @@
2257.16 * specific language governing permissions and limitations under the
2257.17 * License. When distributing the software, include this License Header
2257.18 * Notice in each file and include the License file at
2257.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2257.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2257.21 * particular file as subject to the "Classpath" exception as provided
2257.22 - * by Sun in the GPL Version 2 section of the License file that
2257.23 + * by Oracle in the GPL Version 2 section of the License file that
2257.24 * accompanied this code. If applicable, add the following below the
2257.25 * License Header, with the fields enclosed by brackets [] replaced by
2257.26 * your own identifying information:
2258.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderInfo.java Fri Jul 16 11:47:36 2010 -0400
2258.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderInfo.java Fri Jul 16 14:21:50 2010 -0400
2258.3 @@ -1,7 +1,10 @@
2258.4 /*
2258.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2258.6 *
2258.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2258.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2258.9 + *
2258.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2258.11 + * Other names may be trademarks of their respective owners.
2258.12 *
2258.13 * The contents of this file are subject to the terms of either the GNU
2258.14 * General Public License Version 2 only ("GPL") or the Common
2258.15 @@ -13,9 +16,9 @@
2258.16 * specific language governing permissions and limitations under the
2258.17 * License. When distributing the software, include this License Header
2258.18 * Notice in each file and include the License file at
2258.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2258.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2258.21 * particular file as subject to the "Classpath" exception as provided
2258.22 - * by Sun in the GPL Version 2 section of the License file that
2258.23 + * by Oracle in the GPL Version 2 section of the License file that
2258.24 * accompanied this code. If applicable, add the following below the
2258.25 * License Header, with the fields enclosed by brackets [] replaced by
2258.26 * your own identifying information:
2259.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderJavaMethod.java Fri Jul 16 11:47:36 2010 -0400
2259.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderJavaMethod.java Fri Jul 16 14:21:50 2010 -0400
2259.3 @@ -1,7 +1,10 @@
2259.4 /*
2259.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2259.6 *
2259.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2259.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2259.9 + *
2259.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2259.11 + * Other names may be trademarks of their respective owners.
2259.12 *
2259.13 * The contents of this file are subject to the terms of either the GNU
2259.14 * General Public License Version 2 only ("GPL") or the Common
2259.15 @@ -13,9 +16,9 @@
2259.16 * specific language governing permissions and limitations under the
2259.17 * License. When distributing the software, include this License Header
2259.18 * Notice in each file and include the License file at
2259.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2259.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2259.21 * particular file as subject to the "Classpath" exception as provided
2259.22 - * by Sun in the GPL Version 2 section of the License file that
2259.23 + * by Oracle in the GPL Version 2 section of the License file that
2259.24 * accompanied this code. If applicable, add the following below the
2259.25 * License Header, with the fields enclosed by brackets [] replaced by
2259.26 * your own identifying information:
2260.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderMethod.java Fri Jul 16 11:47:36 2010 -0400
2260.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderMethod.java Fri Jul 16 14:21:50 2010 -0400
2260.3 @@ -1,7 +1,10 @@
2260.4 /*
2260.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2260.6 *
2260.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2260.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2260.9 + *
2260.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2260.11 + * Other names may be trademarks of their respective owners.
2260.12 *
2260.13 * The contents of this file are subject to the terms of either the GNU
2260.14 * General Public License Version 2 only ("GPL") or the Common
2260.15 @@ -13,9 +16,9 @@
2260.16 * specific language governing permissions and limitations under the
2260.17 * License. When distributing the software, include this License Header
2260.18 * Notice in each file and include the License file at
2260.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2260.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2260.21 * particular file as subject to the "Classpath" exception as provided
2260.22 - * by Sun in the GPL Version 2 section of the License file that
2260.23 + * by Oracle in the GPL Version 2 section of the License file that
2260.24 * accompanied this code. If applicable, add the following below the
2260.25 * License Header, with the fields enclosed by brackets [] replaced by
2260.26 * your own identifying information:
2261.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderModelMethod.java Fri Jul 16 11:47:36 2010 -0400
2261.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderModelMethod.java Fri Jul 16 14:21:50 2010 -0400
2261.3 @@ -1,7 +1,10 @@
2261.4 /*
2261.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2261.6 *
2261.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2261.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2261.9 + *
2261.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2261.11 + * Other names may be trademarks of their respective owners.
2261.12 *
2261.13 * The contents of this file are subject to the terms of either the GNU
2261.14 * General Public License Version 2 only ("GPL") or the Common
2261.15 @@ -13,9 +16,9 @@
2261.16 * specific language governing permissions and limitations under the
2261.17 * License. When distributing the software, include this License Header
2261.18 * Notice in each file and include the License file at
2261.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2261.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2261.21 * particular file as subject to the "Classpath" exception as provided
2261.22 - * by Sun in the GPL Version 2 section of the License file that
2261.23 + * by Oracle in the GPL Version 2 section of the License file that
2261.24 * accompanied this code. If applicable, add the following below the
2261.25 * License Header, with the fields enclosed by brackets [] replaced by
2261.26 * your own identifying information:
2262.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderParameter.java Fri Jul 16 11:47:36 2010 -0400
2262.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderParameter.java Fri Jul 16 14:21:50 2010 -0400
2262.3 @@ -1,7 +1,10 @@
2262.4 /*
2262.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2262.6 *
2262.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2262.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2262.9 + *
2262.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2262.11 + * Other names may be trademarks of their respective owners.
2262.12 *
2262.13 * The contents of this file are subject to the terms of either the GNU
2262.14 * General Public License Version 2 only ("GPL") or the Common
2262.15 @@ -13,9 +16,9 @@
2262.16 * specific language governing permissions and limitations under the
2262.17 * License. When distributing the software, include this License Header
2262.18 * Notice in each file and include the License file at
2262.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2262.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2262.21 * particular file as subject to the "Classpath" exception as provided
2262.22 - * by Sun in the GPL Version 2 section of the License file that
2262.23 + * by Oracle in the GPL Version 2 section of the License file that
2262.24 * accompanied this code. If applicable, add the following below the
2262.25 * License Header, with the fields enclosed by brackets [] replaced by
2262.26 * your own identifying information:
2263.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderWriter.java Fri Jul 16 11:47:36 2010 -0400
2263.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/DataProviderWriter.java Fri Jul 16 14:21:50 2010 -0400
2263.3 @@ -1,7 +1,10 @@
2263.4 /*
2263.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2263.6 *
2263.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2263.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2263.9 + *
2263.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2263.11 + * Other names may be trademarks of their respective owners.
2263.12 *
2263.13 * The contents of this file are subject to the terms of either the GNU
2263.14 * General Public License Version 2 only ("GPL") or the Common
2263.15 @@ -13,9 +16,9 @@
2263.16 * specific language governing permissions and limitations under the
2263.17 * License. When distributing the software, include this License Header
2263.18 * Notice in each file and include the License file at
2263.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2263.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2263.21 * particular file as subject to the "Classpath" exception as provided
2263.22 - * by Sun in the GPL Version 2 section of the License file that
2263.23 + * by Oracle in the GPL Version 2 section of the License file that
2263.24 * accompanied this code. If applicable, add the following below the
2263.25 * License Header, with the fields enclosed by brackets [] replaced by
2263.26 * your own identifying information:
2264.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/WebServiceSupportException.java Fri Jul 16 11:47:36 2010 -0400
2264.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/WebServiceSupportException.java Fri Jul 16 14:21:50 2010 -0400
2264.3 @@ -1,7 +1,10 @@
2264.4 /*
2264.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2264.6 *
2264.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2264.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2264.9 + *
2264.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2264.11 + * Other names may be trademarks of their respective owners.
2264.12 *
2264.13 * The contents of this file are subject to the terms of either the GNU
2264.14 * General Public License Version 2 only ("GPL") or the Common
2264.15 @@ -13,9 +16,9 @@
2264.16 * specific language governing permissions and limitations under the
2264.17 * License. When distributing the software, include this License Header
2264.18 * Notice in each file and include the License file at
2264.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2264.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2264.21 * particular file as subject to the "Classpath" exception as provided
2264.22 - * by Sun in the GPL Version 2 section of the License file that
2264.23 + * by Oracle in the GPL Version 2 section of the License file that
2264.24 * accompanied this code. If applicable, add the following below the
2264.25 * License Header, with the fields enclosed by brackets [] replaced by
2264.26 * your own identifying information:
2265.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/WrapperClientBeanInfoWriter.java Fri Jul 16 11:47:36 2010 -0400
2265.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/WrapperClientBeanInfoWriter.java Fri Jul 16 14:21:50 2010 -0400
2265.3 @@ -1,7 +1,10 @@
2265.4 /*
2265.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2265.6 *
2265.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2265.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2265.9 + *
2265.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2265.11 + * Other names may be trademarks of their respective owners.
2265.12 *
2265.13 * The contents of this file are subject to the terms of either the GNU
2265.14 * General Public License Version 2 only ("GPL") or the Common
2265.15 @@ -13,9 +16,9 @@
2265.16 * specific language governing permissions and limitations under the
2265.17 * License. When distributing the software, include this License Header
2265.18 * Notice in each file and include the License file at
2265.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2265.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2265.21 * particular file as subject to the "Classpath" exception as provided
2265.22 - * by Sun in the GPL Version 2 section of the License file that
2265.23 + * by Oracle in the GPL Version 2 section of the License file that
2265.24 * accompanied this code. If applicable, add the following below the
2265.25 * License Header, with the fields enclosed by brackets [] replaced by
2265.26 * your own identifying information:
2266.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/WrapperClientWriter.java Fri Jul 16 11:47:36 2010 -0400
2266.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/codegen/WrapperClientWriter.java Fri Jul 16 14:21:50 2010 -0400
2266.3 @@ -1,7 +1,10 @@
2266.4 /*
2266.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2266.6 *
2266.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2266.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2266.9 + *
2266.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2266.11 + * Other names may be trademarks of their respective owners.
2266.12 *
2266.13 * The contents of this file are subject to the terms of either the GNU
2266.14 * General Public License Version 2 only ("GPL") or the Common
2266.15 @@ -13,9 +16,9 @@
2266.16 * specific language governing permissions and limitations under the
2266.17 * License. When distributing the software, include this License Header
2266.18 * Notice in each file and include the License file at
2266.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2266.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2266.21 * particular file as subject to the "Classpath" exception as provided
2266.22 - * by Sun in the GPL Version 2 section of the License file that
2266.23 + * by Oracle in the GPL Version 2 section of the License file that
2266.24 * accompanied this code. If applicable, add the following below the
2266.25 * License Header, with the fields enclosed by brackets [] replaced by
2266.26 * your own identifying information:
2267.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2267.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2267.3 @@ -1,6 +1,9 @@
2267.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2267.5 #
2267.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2267.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2267.8 +#
2267.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2267.10 +# Other names may be trademarks of their respective owners.
2267.11 #
2267.12 # The contents of this file are subject to the terms of either the GNU
2267.13 # General Public License Version 2 only ("GPL") or the Common
2267.14 @@ -12,9 +15,9 @@
2267.15 # specific language governing permissions and limitations under the
2267.16 # License. When distributing the software, include this License Header
2267.17 # Notice in each file and include the License file at
2267.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2267.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2267.20 # particular file as subject to the "Classpath" exception as provided
2267.21 -# by Sun in the GPL Version 2 section of the License file that
2267.22 +# by Oracle in the GPL Version 2 section of the License file that
2267.23 # accompanied this code. If applicable, add the following below the
2267.24 # License Header, with the fields enclosed by brackets [] replaced by
2267.25 # your own identifying information:
2268.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceExtData.java Fri Jul 16 11:47:36 2010 -0400
2268.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceExtData.java Fri Jul 16 14:21:50 2010 -0400
2268.3 @@ -1,7 +1,10 @@
2268.4 /*
2268.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2268.6 *
2268.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2268.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2268.9 + *
2268.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2268.11 + * Other names may be trademarks of their respective owners.
2268.12 *
2268.13 * The contents of this file are subject to the terms of either the GNU
2268.14 * General Public License Version 2 only ("GPL") or the Common
2268.15 @@ -13,9 +16,9 @@
2268.16 * specific language governing permissions and limitations under the
2268.17 * License. When distributing the software, include this License Header
2268.18 * Notice in each file and include the License file at
2268.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2268.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2268.21 * particular file as subject to the "Classpath" exception as provided
2268.22 - * by Sun in the GPL Version 2 section of the License file that
2268.23 + * by Oracle in the GPL Version 2 section of the License file that
2268.24 * accompanied this code. If applicable, add the following below the
2268.25 * License Header, with the fields enclosed by brackets [] replaced by
2268.26 * your own identifying information:
2269.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceExtImpl.java Fri Jul 16 11:47:36 2010 -0400
2269.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceExtImpl.java Fri Jul 16 14:21:50 2010 -0400
2269.3 @@ -1,7 +1,10 @@
2269.4 /*
2269.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2269.6 *
2269.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2269.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2269.9 + *
2269.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2269.11 + * Other names may be trademarks of their respective owners.
2269.12 *
2269.13 * The contents of this file are subject to the terms of either the GNU
2269.14 * General Public License Version 2 only ("GPL") or the Common
2269.15 @@ -13,9 +16,9 @@
2269.16 * specific language governing permissions and limitations under the
2269.17 * License. When distributing the software, include this License Header
2269.18 * Notice in each file and include the License file at
2269.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2269.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2269.21 * particular file as subject to the "Classpath" exception as provided
2269.22 - * by Sun in the GPL Version 2 section of the License file that
2269.23 + * by Oracle in the GPL Version 2 section of the License file that
2269.24 * accompanied this code. If applicable, add the following below the
2269.25 * License Header, with the fields enclosed by brackets [] replaced by
2269.26 * your own identifying information:
2270.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceTransferManager.java Fri Jul 16 11:47:36 2010 -0400
2270.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceTransferManager.java Fri Jul 16 14:21:50 2010 -0400
2270.3 @@ -1,7 +1,10 @@
2270.4 /*
2270.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2270.6 *
2270.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2270.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2270.9 + *
2270.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2270.11 + * Other names may be trademarks of their respective owners.
2270.12 *
2270.13 * The contents of this file are subject to the terms of either the GNU
2270.14 * General Public License Version 2 only ("GPL") or the Common
2270.15 @@ -13,9 +16,9 @@
2270.16 * specific language governing permissions and limitations under the
2270.17 * License. When distributing the software, include this License Header
2270.18 * Notice in each file and include the License file at
2270.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2270.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2270.21 * particular file as subject to the "Classpath" exception as provided
2270.22 - * by Sun in the GPL Version 2 section of the License file that
2270.23 + * by Oracle in the GPL Version 2 section of the License file that
2270.24 * accompanied this code. If applicable, add the following below the
2270.25 * License Header, with the fields enclosed by brackets [] replaced by
2270.26 * your own identifying information:
2271.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/util/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2271.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/util/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2271.3 @@ -1,6 +1,9 @@
2271.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2271.5 #
2271.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2271.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2271.8 +#
2271.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2271.10 +# Other names may be trademarks of their respective owners.
2271.11 #
2271.12 # The contents of this file are subject to the terms of either the GNU
2271.13 # General Public License Version 2 only ("GPL") or the Common
2271.14 @@ -12,9 +15,9 @@
2271.15 # specific language governing permissions and limitations under the
2271.16 # License. When distributing the software, include this License Header
2271.17 # Notice in each file and include the License file at
2271.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2271.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2271.20 # particular file as subject to the "Classpath" exception as provided
2271.21 -# by Sun in the GPL Version 2 section of the License file that
2271.22 +# by Oracle in the GPL Version 2 section of the License file that
2271.23 # accompanied this code. If applicable, add the following below the
2271.24 # License Header, with the fields enclosed by brackets [] replaced by
2271.25 # your own identifying information:
2272.1 --- a/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/util/Util.java Fri Jul 16 11:47:36 2010 -0400
2272.2 +++ b/visualweb.websvcmgr/src/org/netbeans/modules/visualweb/websvcmgr/util/Util.java Fri Jul 16 14:21:50 2010 -0400
2272.3 @@ -1,7 +1,10 @@
2272.4 /*
2272.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2272.6 *
2272.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2272.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2272.9 + *
2272.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2272.11 + * Other names may be trademarks of their respective owners.
2272.12 *
2272.13 * The contents of this file are subject to the terms of either the GNU
2272.14 * General Public License Version 2 only ("GPL") or the Common
2272.15 @@ -13,9 +16,9 @@
2272.16 * specific language governing permissions and limitations under the
2272.17 * License. When distributing the software, include this License Header
2272.18 * Notice in each file and include the License file at
2272.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2272.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2272.21 * particular file as subject to the "Classpath" exception as provided
2272.22 - * by Sun in the GPL Version 2 section of the License file that
2272.23 + * by Oracle in the GPL Version 2 section of the License file that
2272.24 * accompanied this code. If applicable, add the following below the
2272.25 * License Header, with the fields enclosed by brackets [] replaced by
2272.26 * your own identifying information:
2273.1 --- a/visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
2273.2 +++ b/visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
2273.3 @@ -1,7 +1,10 @@
2273.4 /*
2273.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2273.6 *
2273.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2273.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2273.9 + *
2273.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2273.11 + * Other names may be trademarks of their respective owners.
2273.12 *
2273.13 * The contents of this file are subject to the terms of either the GNU
2273.14 * General Public License Version 2 only ("GPL") or the Common
2273.15 @@ -13,9 +16,9 @@
2273.16 * specific language governing permissions and limitations under the
2273.17 * License. When distributing the software, include this License Header
2273.18 * Notice in each file and include the License file at
2273.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2273.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2273.21 * particular file as subject to the "Classpath" exception as provided
2273.22 - * by Sun in the GPL Version 2 section of the License file that
2273.23 + * by Oracle in the GPL Version 2 section of the License file that
2273.24 * accompanied this code. If applicable, add the following below the
2273.25 * License Header, with the fields enclosed by brackets [] replaced by
2273.26 * your own identifying information:
2274.1 --- a/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceExtImplTest.java Fri Jul 16 11:47:36 2010 -0400
2274.2 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceExtImplTest.java Fri Jul 16 14:21:50 2010 -0400
2274.3 @@ -1,8 +1,11 @@
2274.4 /*
2274.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2274.6 - *
2274.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2274.8 - *
2274.9 + *
2274.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2274.11 + *
2274.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2274.13 + * Other names may be trademarks of their respective owners.
2274.14 + *
2274.15 * The contents of this file are subject to the terms of either the GNU
2274.16 * General Public License Version 2 only ("GPL") or the Common
2274.17 * Development and Distribution License("CDDL") (collectively, the
2274.18 @@ -13,9 +16,9 @@
2274.19 * specific language governing permissions and limitations under the
2274.20 * License. When distributing the software, include this License Header
2274.21 * Notice in each file and include the License file at
2274.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2274.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2274.24 * particular file as subject to the "Classpath" exception as provided
2274.25 - * by Sun in the GPL Version 2 section of the License file that
2274.26 + * by Oracle in the GPL Version 2 section of the License file that
2274.27 * accompanied this code. If applicable, add the following below the
2274.28 * License Header, with the fields enclosed by brackets [] replaced by
2274.29 * your own identifying information:
2275.1 --- a/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceTransferManagerTest.java Fri Jul 16 11:47:36 2010 -0400
2275.2 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/visualweb/websvcmgr/consumer/DesignerWebServiceTransferManagerTest.java Fri Jul 16 14:21:50 2010 -0400
2275.3 @@ -1,8 +1,11 @@
2275.4 /*
2275.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2275.6 - *
2275.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2275.8 - *
2275.9 + *
2275.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2275.11 + *
2275.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2275.13 + * Other names may be trademarks of their respective owners.
2275.14 + *
2275.15 * The contents of this file are subject to the terms of either the GNU
2275.16 * General Public License Version 2 only ("GPL") or the Common
2275.17 * Development and Distribution License("CDDL") (collectively, the
2275.18 @@ -13,9 +16,9 @@
2275.19 * specific language governing permissions and limitations under the
2275.20 * License. When distributing the software, include this License Header
2275.21 * Notice in each file and include the License file at
2275.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2275.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2275.24 * particular file as subject to the "Classpath" exception as provided
2275.25 - * by Sun in the GPL Version 2 section of the License file that
2275.26 + * by Oracle in the GPL Version 2 section of the License file that
2275.27 * accompanied this code. If applicable, add the following below the
2275.28 * License Header, with the fields enclosed by brackets [] replaced by
2275.29 * your own identifying information:
2276.1 --- a/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/visualweb/websvcmgr/test/RunCommand.java Fri Jul 16 11:47:36 2010 -0400
2276.2 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/visualweb/websvcmgr/test/RunCommand.java Fri Jul 16 14:21:50 2010 -0400
2276.3 @@ -1,7 +1,10 @@
2276.4 /*
2276.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2276.6 *
2276.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2276.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2276.9 + *
2276.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2276.11 + * Other names may be trademarks of their respective owners.
2276.12 *
2276.13 * The contents of this file are subject to the terms of either the GNU
2276.14 * General Public License Version 2 only ("GPL") or the Common
2276.15 @@ -13,9 +16,9 @@
2276.16 * specific language governing permissions and limitations under the
2276.17 * License. When distributing the software, include this License Header
2276.18 * Notice in each file and include the License file at
2276.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2276.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2276.21 * particular file as subject to the "Classpath" exception as provided
2276.22 - * by Sun in the GPL Version 2 section of the License file that
2276.23 + * by Oracle in the GPL Version 2 section of the License file that
2276.24 * accompanied this code. If applicable, add the following below the
2276.25 * License Header, with the fields enclosed by brackets [] replaced by
2276.26 * your own identifying information:
2277.1 --- a/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/visualweb/websvcmgr/test/StreamGobbler.java Fri Jul 16 11:47:36 2010 -0400
2277.2 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/visualweb/websvcmgr/test/StreamGobbler.java Fri Jul 16 14:21:50 2010 -0400
2277.3 @@ -1,7 +1,10 @@
2277.4 /*
2277.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2277.6 *
2277.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2277.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2277.9 + *
2277.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2277.11 + * Other names may be trademarks of their respective owners.
2277.12 *
2277.13 * The contents of this file are subject to the terms of either the GNU
2277.14 * General Public License Version 2 only ("GPL") or the Common
2277.15 @@ -13,9 +16,9 @@
2277.16 * specific language governing permissions and limitations under the
2277.17 * License. When distributing the software, include this License Header
2277.18 * Notice in each file and include the License file at
2277.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2277.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2277.21 * particular file as subject to the "Classpath" exception as provided
2277.22 - * by Sun in the GPL Version 2 section of the License file that
2277.23 + * by Oracle in the GPL Version 2 section of the License file that
2277.24 * accompanied this code. If applicable, add the following below the
2277.25 * License Header, with the fields enclosed by brackets [] replaced by
2277.26 * your own identifying information:
2278.1 --- a/visualweb.webui.designtime/build.xml Fri Jul 16 11:47:36 2010 -0400
2278.2 +++ b/visualweb.webui.designtime/build.xml Fri Jul 16 14:21:50 2010 -0400
2278.3 @@ -2,7 +2,10 @@
2278.4 <!--
2278.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2278.6
2278.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2278.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2278.9 +
2278.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2278.11 +Other names may be trademarks of their respective owners.
2278.12
2278.13
2278.14 The contents of this file are subject to the terms of either the GNU
2278.15 @@ -15,9 +18,9 @@
2278.16 specific language governing permissions and limitations under the
2278.17 License. When distributing the software, include this License Header
2278.18 Notice in each file and include the License file at
2278.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2278.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2278.21 particular file as subject to the "Classpath" exception as provided
2278.22 -by Sun in the GPL Version 2 section of the License file that
2278.23 +by Oracle in the GPL Version 2 section of the License file that
2278.24 accompanied this code. If applicable, add the following below the
2278.25 License Header, with the fields enclosed by brackets [] replaced by
2278.26 your own identifying information:
2279.1 --- a/visualweb.webui.designtime/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2279.2 +++ b/visualweb.webui.designtime/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2279.3 @@ -1,6 +1,9 @@
2279.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2279.5 #
2279.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2279.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2279.8 +#
2279.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2279.10 +# Other names may be trademarks of their respective owners.
2279.11 #
2279.12 # The contents of this file are subject to the terms of either the GNU
2279.13 # General Public License Version 2 only ("GPL") or the Common
2279.14 @@ -12,9 +15,9 @@
2279.15 # specific language governing permissions and limitations under the
2279.16 # License. When distributing the software, include this License Header
2279.17 # Notice in each file and include the License file at
2279.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2279.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2279.20 # particular file as subject to the "Classpath" exception as provided
2279.21 -# by Sun in the GPL Version 2 section of the License file that
2279.22 +# by Oracle in the GPL Version 2 section of the License file that
2279.23 # accompanied this code. If applicable, add the following below the
2279.24 # License Header, with the fields enclosed by brackets [] replaced by
2279.25 # your own identifying information:
2279.26 @@ -37,5 +40,5 @@
2279.27 # Version 2 license, then the option applies only if the new code is
2279.28 # made subject to such option by the copyright holder.
2279.29
2279.30 -javac.source=1.5
2279.31 +javac.source=1.6
2279.32 src.dir=src
2280.1 --- a/visualweb.webui.designtime/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2280.2 +++ b/visualweb.webui.designtime/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2280.3 @@ -2,7 +2,10 @@
2280.4 <!--
2280.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2280.6
2280.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2280.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2280.9 +
2280.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2280.11 +Other names may be trademarks of their respective owners.
2280.12
2280.13
2280.14 The contents of this file are subject to the terms of either the GNU
2280.15 @@ -15,9 +18,9 @@
2280.16 specific language governing permissions and limitations under the
2280.17 License. When distributing the software, include this License Header
2280.18 Notice in each file and include the License file at
2280.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2280.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2280.21 particular file as subject to the "Classpath" exception as provided
2280.22 -by Sun in the GPL Version 2 section of the License file that
2280.23 +by Oracle in the GPL Version 2 section of the License file that
2280.24 accompanied this code. If applicable, add the following below the
2280.25 License Header, with the fields enclosed by brackets [] replaced by
2280.26 your own identifying information:
2280.27 @@ -171,7 +174,15 @@
2280.28 <build-prerequisite/>
2280.29 <compile-dependency/>
2280.30 <run-dependency>
2280.31 - <specification-version>6.8</specification-version>
2280.32 + <specification-version>8.0</specification-version>
2280.33 + </run-dependency>
2280.34 + </dependency>
2280.35 + <dependency>
2280.36 + <code-name-base>org.openide.util.lookup</code-name-base>
2280.37 + <build-prerequisite/>
2280.38 + <compile-dependency/>
2280.39 + <run-dependency>
2280.40 + <specification-version>8.0</specification-version>
2280.41 </run-dependency>
2280.42 </dependency>
2280.43 </module-dependencies>
2281.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/AbstractDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2281.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/AbstractDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2281.3 @@ -1,7 +1,10 @@
2281.4 /*
2281.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2281.6 *
2281.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2281.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2281.9 + *
2281.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2281.11 + * Other names may be trademarks of their respective owners.
2281.12 *
2281.13 * The contents of this file are subject to the terms of either the GNU
2281.14 * General Public License Version 2 only ("GPL") or the Common
2281.15 @@ -13,9 +16,9 @@
2281.16 * specific language governing permissions and limitations under the
2281.17 * License. When distributing the software, include this License Header
2281.18 * Notice in each file and include the License file at
2281.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2281.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2281.21 * particular file as subject to the "Classpath" exception as provided
2281.22 - * by Sun in the GPL Version 2 section of the License file that
2281.23 + * by Oracle in the GPL Version 2 section of the License file that
2281.24 * accompanied this code. If applicable, add the following below the
2281.25 * License Header, with the fields enclosed by brackets [] replaced by
2281.26 * your own identifying information:
2282.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AbsGridBeanCreateInfo.java Fri Jul 16 11:47:36 2010 -0400
2282.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AbsGridBeanCreateInfo.java Fri Jul 16 14:21:50 2010 -0400
2282.3 @@ -1,7 +1,10 @@
2282.4 /*
2282.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2282.6 *
2282.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2282.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2282.9 + *
2282.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2282.11 + * Other names may be trademarks of their respective owners.
2282.12 *
2282.13 * The contents of this file are subject to the terms of either the GNU
2282.14 * General Public License Version 2 only ("GPL") or the Common
2282.15 @@ -13,9 +16,9 @@
2282.16 * specific language governing permissions and limitations under the
2282.17 * License. When distributing the software, include this License Header
2282.18 * Notice in each file and include the License file at
2282.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2282.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2282.21 * particular file as subject to the "Classpath" exception as provided
2282.22 - * by Sun in the GPL Version 2 section of the License file that
2282.23 + * by Oracle in the GPL Version 2 section of the License file that
2282.24 * accompanied this code. If applicable, add the following below the
2282.25 * License Header, with the fields enclosed by brackets [] replaced by
2282.26 * your own identifying information:
2283.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AddRemoveBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2283.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AddRemoveBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2283.3 @@ -1,7 +1,10 @@
2283.4 /*
2283.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2283.6 *
2283.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2283.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2283.9 + *
2283.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2283.11 + * Other names may be trademarks of their respective owners.
2283.12 *
2283.13 * The contents of this file are subject to the terms of either the GNU
2283.14 * General Public License Version 2 only ("GPL") or the Common
2283.15 @@ -13,9 +16,9 @@
2283.16 * specific language governing permissions and limitations under the
2283.17 * License. When distributing the software, include this License Header
2283.18 * Notice in each file and include the License file at
2283.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2283.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2283.21 * particular file as subject to the "Classpath" exception as provided
2283.22 - * by Sun in the GPL Version 2 section of the License file that
2283.23 + * by Oracle in the GPL Version 2 section of the License file that
2283.24 * accompanied this code. If applicable, add the following below the
2283.25 * License Header, with the fields enclosed by brackets [] replaced by
2283.26 * your own identifying information:
2284.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AddRemoveBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2284.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AddRemoveBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2284.3 @@ -2,7 +2,10 @@
2284.4 /*
2284.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2284.6 *
2284.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2284.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2284.9 + *
2284.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2284.11 + * Other names may be trademarks of their respective owners.
2284.12 *
2284.13 * The contents of this file are subject to the terms of either the GNU
2284.14 * General Public License Version 2 only ("GPL") or the Common
2284.15 @@ -14,9 +17,9 @@
2284.16 * specific language governing permissions and limitations under the
2284.17 * License. When distributing the software, include this License Header
2284.18 * Notice in each file and include the License file at
2284.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2284.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2284.21 * particular file as subject to the "Classpath" exception as provided
2284.22 - * by Sun in the GPL Version 2 section of the License file that
2284.23 + * by Oracle in the GPL Version 2 section of the License file that
2284.24 * accompanied this code. If applicable, add the following below the
2284.25 * License Header, with the fields enclosed by brackets [] replaced by
2284.26 * your own identifying information:
2285.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AddRemoveDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2285.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AddRemoveDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2285.3 @@ -1,7 +1,10 @@
2285.4 /*
2285.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2285.6 *
2285.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2285.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2285.9 + *
2285.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2285.11 + * Other names may be trademarks of their respective owners.
2285.12 *
2285.13 * The contents of this file are subject to the terms of either the GNU
2285.14 * General Public License Version 2 only ("GPL") or the Common
2285.15 @@ -13,9 +16,9 @@
2285.16 * specific language governing permissions and limitations under the
2285.17 * License. When distributing the software, include this License Header
2285.18 * Notice in each file and include the License file at
2285.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2285.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2285.21 * particular file as subject to the "Classpath" exception as provided
2285.22 - * by Sun in the GPL Version 2 section of the License file that
2285.23 + * by Oracle in the GPL Version 2 section of the License file that
2285.24 * accompanied this code. If applicable, add the following below the
2285.25 * License Header, with the fields enclosed by brackets [] replaced by
2285.26 * your own identifying information:
2286.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlarmBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2286.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlarmBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2286.3 @@ -1,7 +1,10 @@
2286.4 /*
2286.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2286.6 *
2286.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2286.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2286.9 + *
2286.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2286.11 + * Other names may be trademarks of their respective owners.
2286.12 *
2286.13 * The contents of this file are subject to the terms of either the GNU
2286.14 * General Public License Version 2 only ("GPL") or the Common
2286.15 @@ -13,9 +16,9 @@
2286.16 * specific language governing permissions and limitations under the
2286.17 * License. When distributing the software, include this License Header
2286.18 * Notice in each file and include the License file at
2286.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2286.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2286.21 * particular file as subject to the "Classpath" exception as provided
2286.22 - * by Sun in the GPL Version 2 section of the License file that
2286.23 + * by Oracle in the GPL Version 2 section of the License file that
2286.24 * accompanied this code. If applicable, add the following below the
2286.25 * License Header, with the fields enclosed by brackets [] replaced by
2286.26 * your own identifying information:
2287.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlarmBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2287.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlarmBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2287.3 @@ -2,7 +2,10 @@
2287.4 /*
2287.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2287.6 *
2287.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2287.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2287.9 + *
2287.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2287.11 + * Other names may be trademarks of their respective owners.
2287.12 *
2287.13 * The contents of this file are subject to the terms of either the GNU
2287.14 * General Public License Version 2 only ("GPL") or the Common
2287.15 @@ -14,9 +17,9 @@
2287.16 * specific language governing permissions and limitations under the
2287.17 * License. When distributing the software, include this License Header
2287.18 * Notice in each file and include the License file at
2287.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2287.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2287.21 * particular file as subject to the "Classpath" exception as provided
2287.22 - * by Sun in the GPL Version 2 section of the License file that
2287.23 + * by Oracle in the GPL Version 2 section of the License file that
2287.24 * accompanied this code. If applicable, add the following below the
2287.25 * License Header, with the fields enclosed by brackets [] replaced by
2287.26 * your own identifying information:
2288.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlertBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2288.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlertBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2288.3 @@ -1,7 +1,10 @@
2288.4 /*
2288.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2288.6 *
2288.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2288.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2288.9 + *
2288.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2288.11 + * Other names may be trademarks of their respective owners.
2288.12 *
2288.13 * The contents of this file are subject to the terms of either the GNU
2288.14 * General Public License Version 2 only ("GPL") or the Common
2288.15 @@ -13,9 +16,9 @@
2288.16 * specific language governing permissions and limitations under the
2288.17 * License. When distributing the software, include this License Header
2288.18 * Notice in each file and include the License file at
2288.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2288.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2288.21 * particular file as subject to the "Classpath" exception as provided
2288.22 - * by Sun in the GPL Version 2 section of the License file that
2288.23 + * by Oracle in the GPL Version 2 section of the License file that
2288.24 * accompanied this code. If applicable, add the following below the
2288.25 * License Header, with the fields enclosed by brackets [] replaced by
2288.26 * your own identifying information:
2289.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlertBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2289.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlertBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2289.3 @@ -2,7 +2,10 @@
2289.4 /*
2289.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2289.6 *
2289.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2289.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2289.9 + *
2289.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2289.11 + * Other names may be trademarks of their respective owners.
2289.12 *
2289.13 * The contents of this file are subject to the terms of either the GNU
2289.14 * General Public License Version 2 only ("GPL") or the Common
2289.15 @@ -14,9 +17,9 @@
2289.16 * specific language governing permissions and limitations under the
2289.17 * License. When distributing the software, include this License Header
2289.18 * Notice in each file and include the License file at
2289.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2289.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2289.21 * particular file as subject to the "Classpath" exception as provided
2289.22 - * by Sun in the GPL Version 2 section of the License file that
2289.23 + * by Oracle in the GPL Version 2 section of the License file that
2289.24 * accompanied this code. If applicable, add the following below the
2289.25 * License Header, with the fields enclosed by brackets [] replaced by
2289.26 * your own identifying information:
2290.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlertDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2290.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AlertDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2290.3 @@ -1,7 +1,10 @@
2290.4 /*
2290.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2290.6 *
2290.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2290.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2290.9 + *
2290.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2290.11 + * Other names may be trademarks of their respective owners.
2290.12 *
2290.13 * The contents of this file are subject to the terms of either the GNU
2290.14 * General Public License Version 2 only ("GPL") or the Common
2290.15 @@ -13,9 +16,9 @@
2290.16 * specific language governing permissions and limitations under the
2290.17 * License. When distributing the software, include this License Header
2290.18 * Notice in each file and include the License file at
2290.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2290.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2290.21 * particular file as subject to the "Classpath" exception as provided
2290.22 - * by Sun in the GPL Version 2 section of the License file that
2290.23 + * by Oracle in the GPL Version 2 section of the License file that
2290.24 * accompanied this code. If applicable, add the following below the
2290.25 * License Header, with the fields enclosed by brackets [] replaced by
2290.26 * your own identifying information:
2291.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AnchorBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2291.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AnchorBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2291.3 @@ -1,7 +1,10 @@
2291.4 /*
2291.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2291.6 *
2291.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2291.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2291.9 + *
2291.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2291.11 + * Other names may be trademarks of their respective owners.
2291.12 *
2291.13 * The contents of this file are subject to the terms of either the GNU
2291.14 * General Public License Version 2 only ("GPL") or the Common
2291.15 @@ -13,9 +16,9 @@
2291.16 * specific language governing permissions and limitations under the
2291.17 * License. When distributing the software, include this License Header
2291.18 * Notice in each file and include the License file at
2291.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2291.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2291.21 * particular file as subject to the "Classpath" exception as provided
2291.22 - * by Sun in the GPL Version 2 section of the License file that
2291.23 + * by Oracle in the GPL Version 2 section of the License file that
2291.24 * accompanied this code. If applicable, add the following below the
2291.25 * License Header, with the fields enclosed by brackets [] replaced by
2291.26 * your own identifying information:
2292.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AnchorBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2292.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AnchorBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2292.3 @@ -2,7 +2,10 @@
2292.4 /*
2292.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2292.6 *
2292.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2292.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2292.9 + *
2292.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2292.11 + * Other names may be trademarks of their respective owners.
2292.12 *
2292.13 * The contents of this file are subject to the terms of either the GNU
2292.14 * General Public License Version 2 only ("GPL") or the Common
2292.15 @@ -14,9 +17,9 @@
2292.16 * specific language governing permissions and limitations under the
2292.17 * License. When distributing the software, include this License Header
2292.18 * Notice in each file and include the License file at
2292.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2292.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2292.21 * particular file as subject to the "Classpath" exception as provided
2292.22 - * by Sun in the GPL Version 2 section of the License file that
2292.23 + * by Oracle in the GPL Version 2 section of the License file that
2292.24 * accompanied this code. If applicable, add the following below the
2292.25 * License Header, with the fields enclosed by brackets [] replaced by
2292.26 * your own identifying information:
2293.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AnchorDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2293.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/AnchorDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2293.3 @@ -1,7 +1,10 @@
2293.4 /*
2293.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2293.6 *
2293.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2293.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2293.9 + *
2293.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2293.11 + * Other names may be trademarks of their respective owners.
2293.12 *
2293.13 * The contents of this file are subject to the terms of either the GNU
2293.14 * General Public License Version 2 only ("GPL") or the Common
2293.15 @@ -13,9 +16,9 @@
2293.16 * specific language governing permissions and limitations under the
2293.17 * License. When distributing the software, include this License Header
2293.18 * Notice in each file and include the License file at
2293.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2293.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2293.21 * particular file as subject to the "Classpath" exception as provided
2293.22 - * by Sun in the GPL Version 2 section of the License file that
2293.23 + * by Oracle in the GPL Version 2 section of the License file that
2293.24 * accompanied this code. If applicable, add the following below the
2293.25 * License Header, with the fields enclosed by brackets [] replaced by
2293.26 * your own identifying information:
2294.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BodyBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2294.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BodyBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2294.3 @@ -1,7 +1,10 @@
2294.4 /*
2294.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2294.6 *
2294.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2294.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2294.9 + *
2294.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2294.11 + * Other names may be trademarks of their respective owners.
2294.12 *
2294.13 * The contents of this file are subject to the terms of either the GNU
2294.14 * General Public License Version 2 only ("GPL") or the Common
2294.15 @@ -13,9 +16,9 @@
2294.16 * specific language governing permissions and limitations under the
2294.17 * License. When distributing the software, include this License Header
2294.18 * Notice in each file and include the License file at
2294.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2294.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2294.21 * particular file as subject to the "Classpath" exception as provided
2294.22 - * by Sun in the GPL Version 2 section of the License file that
2294.23 + * by Oracle in the GPL Version 2 section of the License file that
2294.24 * accompanied this code. If applicable, add the following below the
2294.25 * License Header, with the fields enclosed by brackets [] replaced by
2294.26 * your own identifying information:
2295.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BodyBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2295.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BodyBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2295.3 @@ -2,7 +2,10 @@
2295.4 /*
2295.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2295.6 *
2295.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2295.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2295.9 + *
2295.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2295.11 + * Other names may be trademarks of their respective owners.
2295.12 *
2295.13 * The contents of this file are subject to the terms of either the GNU
2295.14 * General Public License Version 2 only ("GPL") or the Common
2295.15 @@ -14,9 +17,9 @@
2295.16 * specific language governing permissions and limitations under the
2295.17 * License. When distributing the software, include this License Header
2295.18 * Notice in each file and include the License file at
2295.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2295.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2295.21 * particular file as subject to the "Classpath" exception as provided
2295.22 - * by Sun in the GPL Version 2 section of the License file that
2295.23 + * by Oracle in the GPL Version 2 section of the License file that
2295.24 * accompanied this code. If applicable, add the following below the
2295.25 * License Header, with the fields enclosed by brackets [] replaced by
2295.26 * your own identifying information:
2296.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BreadcrumbsBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2296.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BreadcrumbsBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2296.3 @@ -1,7 +1,10 @@
2296.4 /*
2296.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2296.6 *
2296.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2296.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2296.9 + *
2296.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2296.11 + * Other names may be trademarks of their respective owners.
2296.12 *
2296.13 * The contents of this file are subject to the terms of either the GNU
2296.14 * General Public License Version 2 only ("GPL") or the Common
2296.15 @@ -13,9 +16,9 @@
2296.16 * specific language governing permissions and limitations under the
2296.17 * License. When distributing the software, include this License Header
2296.18 * Notice in each file and include the License file at
2296.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2296.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2296.21 * particular file as subject to the "Classpath" exception as provided
2296.22 - * by Sun in the GPL Version 2 section of the License file that
2296.23 + * by Oracle in the GPL Version 2 section of the License file that
2296.24 * accompanied this code. If applicable, add the following below the
2296.25 * License Header, with the fields enclosed by brackets [] replaced by
2296.26 * your own identifying information:
2297.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BreadcrumbsBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2297.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BreadcrumbsBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2297.3 @@ -2,7 +2,10 @@
2297.4 /*
2297.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2297.6 *
2297.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2297.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2297.9 + *
2297.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2297.11 + * Other names may be trademarks of their respective owners.
2297.12 *
2297.13 * The contents of this file are subject to the terms of either the GNU
2297.14 * General Public License Version 2 only ("GPL") or the Common
2297.15 @@ -14,9 +17,9 @@
2297.16 * specific language governing permissions and limitations under the
2297.17 * License. When distributing the software, include this License Header
2297.18 * Notice in each file and include the License file at
2297.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2297.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2297.21 * particular file as subject to the "Classpath" exception as provided
2297.22 - * by Sun in the GPL Version 2 section of the License file that
2297.23 + * by Oracle in the GPL Version 2 section of the License file that
2297.24 * accompanied this code. If applicable, add the following below the
2297.25 * License Header, with the fields enclosed by brackets [] replaced by
2297.26 * your own identifying information:
2298.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BreadcrumbsDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2298.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/BreadcrumbsDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2298.3 @@ -1,7 +1,10 @@
2298.4 /*
2298.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2298.6 *
2298.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2298.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2298.9 + *
2298.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2298.11 + * Other names may be trademarks of their respective owners.
2298.12 *
2298.13 * The contents of this file are subject to the terms of either the GNU
2298.14 * General Public License Version 2 only ("GPL") or the Common
2298.15 @@ -13,9 +16,9 @@
2298.16 * specific language governing permissions and limitations under the
2298.17 * License. When distributing the software, include this License Header
2298.18 * Notice in each file and include the License file at
2298.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2298.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2298.21 * particular file as subject to the "Classpath" exception as provided
2298.22 - * by Sun in the GPL Version 2 section of the License file that
2298.23 + * by Oracle in the GPL Version 2 section of the License file that
2298.24 * accompanied this code. If applicable, add the following below the
2298.25 * License Header, with the fields enclosed by brackets [] replaced by
2298.26 * your own identifying information:
2299.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/Bundle-DT.properties Fri Jul 16 11:47:36 2010 -0400
2299.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/Bundle-DT.properties Fri Jul 16 14:21:50 2010 -0400
2299.3 @@ -1,6 +1,9 @@
2299.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2299.5 #
2299.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2299.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2299.8 +#
2299.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2299.10 +# Other names may be trademarks of their respective owners.
2299.11 #
2299.12 # The contents of this file are subject to the terms of either the GNU
2299.13 # General Public License Version 2 only ("GPL") or the Common
2299.14 @@ -12,9 +15,9 @@
2299.15 # specific language governing permissions and limitations under the
2299.16 # License. When distributing the software, include this License Header
2299.17 # Notice in each file and include the License file at
2299.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2299.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2299.20 # particular file as subject to the "Classpath" exception as provided
2299.21 -# by Sun in the GPL Version 2 section of the License file that
2299.22 +# by Oracle in the GPL Version 2 section of the License file that
2299.23 # accompanied this code. If applicable, add the following below the
2299.24 # License Header, with the fields enclosed by brackets [] replaced by
2299.25 # your own identifying information:
2300.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/Bundle-JSF.properties Fri Jul 16 11:47:36 2010 -0400
2300.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/Bundle-JSF.properties Fri Jul 16 14:21:50 2010 -0400
2300.3 @@ -1,6 +1,9 @@
2300.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2300.5 #
2300.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2300.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2300.8 +#
2300.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2300.10 +# Other names may be trademarks of their respective owners.
2300.11 #
2300.12 # The contents of this file are subject to the terms of either the GNU
2300.13 # General Public License Version 2 only ("GPL") or the Common
2300.14 @@ -12,9 +15,9 @@
2300.15 # specific language governing permissions and limitations under the
2300.16 # License. When distributing the software, include this License Header
2300.17 # Notice in each file and include the License file at
2300.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2300.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2300.20 # particular file as subject to the "Classpath" exception as provided
2300.21 -# by Sun in the GPL Version 2 section of the License file that
2300.22 +# by Oracle in the GPL Version 2 section of the License file that
2300.23 # accompanied this code. If applicable, add the following below the
2300.24 # License Header, with the fields enclosed by brackets [] replaced by
2300.25 # your own identifying information:
2301.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ButtonBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2301.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ButtonBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2301.3 @@ -1,7 +1,10 @@
2301.4 /*
2301.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2301.6 *
2301.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2301.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2301.9 + *
2301.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2301.11 + * Other names may be trademarks of their respective owners.
2301.12 *
2301.13 * The contents of this file are subject to the terms of either the GNU
2301.14 * General Public License Version 2 only ("GPL") or the Common
2301.15 @@ -13,9 +16,9 @@
2301.16 * specific language governing permissions and limitations under the
2301.17 * License. When distributing the software, include this License Header
2301.18 * Notice in each file and include the License file at
2301.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2301.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2301.21 * particular file as subject to the "Classpath" exception as provided
2301.22 - * by Sun in the GPL Version 2 section of the License file that
2301.23 + * by Oracle in the GPL Version 2 section of the License file that
2301.24 * accompanied this code. If applicable, add the following below the
2301.25 * License Header, with the fields enclosed by brackets [] replaced by
2301.26 * your own identifying information:
2302.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ButtonBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2302.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ButtonBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2302.3 @@ -2,7 +2,10 @@
2302.4 /*
2302.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2302.6 *
2302.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2302.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2302.9 + *
2302.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2302.11 + * Other names may be trademarks of their respective owners.
2302.12 *
2302.13 * The contents of this file are subject to the terms of either the GNU
2302.14 * General Public License Version 2 only ("GPL") or the Common
2302.15 @@ -14,9 +17,9 @@
2302.16 * specific language governing permissions and limitations under the
2302.17 * License. When distributing the software, include this License Header
2302.18 * Notice in each file and include the License file at
2302.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2302.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2302.21 * particular file as subject to the "Classpath" exception as provided
2302.22 - * by Sun in the GPL Version 2 section of the License file that
2302.23 + * by Oracle in the GPL Version 2 section of the License file that
2302.24 * accompanied this code. If applicable, add the following below the
2302.25 * License Header, with the fields enclosed by brackets [] replaced by
2302.26 * your own identifying information:
2303.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ButtonDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2303.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ButtonDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2303.3 @@ -1,7 +1,10 @@
2303.4 /*
2303.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2303.6 *
2303.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2303.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2303.9 + *
2303.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2303.11 + * Other names may be trademarks of their respective owners.
2303.12 *
2303.13 * The contents of this file are subject to the terms of either the GNU
2303.14 * General Public License Version 2 only ("GPL") or the Common
2303.15 @@ -13,9 +16,9 @@
2303.16 * specific language governing permissions and limitations under the
2303.17 * License. When distributing the software, include this License Header
2303.18 * Notice in each file and include the License file at
2303.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2303.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2303.21 * particular file as subject to the "Classpath" exception as provided
2303.22 - * by Sun in the GPL Version 2 section of the License file that
2303.23 + * by Oracle in the GPL Version 2 section of the License file that
2303.24 * accompanied this code. If applicable, add the following below the
2303.25 * License Header, with the fields enclosed by brackets [] replaced by
2303.26 * your own identifying information:
2304.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CalendarBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2304.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CalendarBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2304.3 @@ -1,7 +1,10 @@
2304.4 /*
2304.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2304.6 *
2304.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2304.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2304.9 + *
2304.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2304.11 + * Other names may be trademarks of their respective owners.
2304.12 *
2304.13 * The contents of this file are subject to the terms of either the GNU
2304.14 * General Public License Version 2 only ("GPL") or the Common
2304.15 @@ -13,9 +16,9 @@
2304.16 * specific language governing permissions and limitations under the
2304.17 * License. When distributing the software, include this License Header
2304.18 * Notice in each file and include the License file at
2304.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2304.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2304.21 * particular file as subject to the "Classpath" exception as provided
2304.22 - * by Sun in the GPL Version 2 section of the License file that
2304.23 + * by Oracle in the GPL Version 2 section of the License file that
2304.24 * accompanied this code. If applicable, add the following below the
2304.25 * License Header, with the fields enclosed by brackets [] replaced by
2304.26 * your own identifying information:
2305.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CalendarBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2305.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CalendarBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2305.3 @@ -2,7 +2,10 @@
2305.4 /*
2305.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2305.6 *
2305.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2305.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2305.9 + *
2305.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2305.11 + * Other names may be trademarks of their respective owners.
2305.12 *
2305.13 * The contents of this file are subject to the terms of either the GNU
2305.14 * General Public License Version 2 only ("GPL") or the Common
2305.15 @@ -14,9 +17,9 @@
2305.16 * specific language governing permissions and limitations under the
2305.17 * License. When distributing the software, include this License Header
2305.18 * Notice in each file and include the License file at
2305.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2305.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2305.21 * particular file as subject to the "Classpath" exception as provided
2305.22 - * by Sun in the GPL Version 2 section of the License file that
2305.23 + * by Oracle in the GPL Version 2 section of the License file that
2305.24 * accompanied this code. If applicable, add the following below the
2305.25 * License Header, with the fields enclosed by brackets [] replaced by
2305.26 * your own identifying information:
2306.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CalendarDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2306.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CalendarDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2306.3 @@ -1,7 +1,10 @@
2306.4 /*
2306.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2306.6 *
2306.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2306.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2306.9 + *
2306.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2306.11 + * Other names may be trademarks of their respective owners.
2306.12 *
2306.13 * The contents of this file are subject to the terms of either the GNU
2306.14 * General Public License Version 2 only ("GPL") or the Common
2306.15 @@ -13,9 +16,9 @@
2306.16 * specific language governing permissions and limitations under the
2306.17 * License. When distributing the software, include this License Header
2306.18 * Notice in each file and include the License file at
2306.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2306.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2306.21 * particular file as subject to the "Classpath" exception as provided
2306.22 - * by Sun in the GPL Version 2 section of the License file that
2306.23 + * by Oracle in the GPL Version 2 section of the License file that
2306.24 * accompanied this code. If applicable, add the following below the
2306.25 * License Header, with the fields enclosed by brackets [] replaced by
2306.26 * your own identifying information:
2307.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CalendarMonthBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2307.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CalendarMonthBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2307.3 @@ -2,7 +2,10 @@
2307.4 /*
2307.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2307.6 *
2307.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2307.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2307.9 + *
2307.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2307.11 + * Other names may be trademarks of their respective owners.
2307.12 *
2307.13 * The contents of this file are subject to the terms of either the GNU
2307.14 * General Public License Version 2 only ("GPL") or the Common
2307.15 @@ -14,9 +17,9 @@
2307.16 * specific language governing permissions and limitations under the
2307.17 * License. When distributing the software, include this License Header
2307.18 * Notice in each file and include the License file at
2307.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2307.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2307.21 * particular file as subject to the "Classpath" exception as provided
2307.22 - * by Sun in the GPL Version 2 section of the License file that
2307.23 + * by Oracle in the GPL Version 2 section of the License file that
2307.24 * accompanied this code. If applicable, add the following below the
2307.25 * License Header, with the fields enclosed by brackets [] replaced by
2307.26 * your own identifying information:
2308.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2308.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2308.3 @@ -1,7 +1,10 @@
2308.4 /*
2308.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2308.6 *
2308.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2308.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2308.9 + *
2308.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2308.11 + * Other names may be trademarks of their respective owners.
2308.12 *
2308.13 * The contents of this file are subject to the terms of either the GNU
2308.14 * General Public License Version 2 only ("GPL") or the Common
2308.15 @@ -13,9 +16,9 @@
2308.16 * specific language governing permissions and limitations under the
2308.17 * License. When distributing the software, include this License Header
2308.18 * Notice in each file and include the License file at
2308.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2308.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2308.21 * particular file as subject to the "Classpath" exception as provided
2308.22 - * by Sun in the GPL Version 2 section of the License file that
2308.23 + * by Oracle in the GPL Version 2 section of the License file that
2308.24 * accompanied this code. If applicable, add the following below the
2308.25 * License Header, with the fields enclosed by brackets [] replaced by
2308.26 * your own identifying information:
2309.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2309.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2309.3 @@ -2,7 +2,10 @@
2309.4 /*
2309.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2309.6 *
2309.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2309.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2309.9 + *
2309.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2309.11 + * Other names may be trademarks of their respective owners.
2309.12 *
2309.13 * The contents of this file are subject to the terms of either the GNU
2309.14 * General Public License Version 2 only ("GPL") or the Common
2309.15 @@ -14,9 +17,9 @@
2309.16 * specific language governing permissions and limitations under the
2309.17 * License. When distributing the software, include this License Header
2309.18 * Notice in each file and include the License file at
2309.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2309.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2309.21 * particular file as subject to the "Classpath" exception as provided
2309.22 - * by Sun in the GPL Version 2 section of the License file that
2309.23 + * by Oracle in the GPL Version 2 section of the License file that
2309.24 * accompanied this code. If applicable, add the following below the
2309.25 * License Header, with the fields enclosed by brackets [] replaced by
2309.26 * your own identifying information:
2310.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2310.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2310.3 @@ -1,7 +1,10 @@
2310.4 /*
2310.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2310.6 *
2310.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2310.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2310.9 + *
2310.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2310.11 + * Other names may be trademarks of their respective owners.
2310.12 *
2310.13 * The contents of this file are subject to the terms of either the GNU
2310.14 * General Public License Version 2 only ("GPL") or the Common
2310.15 @@ -13,9 +16,9 @@
2310.16 * specific language governing permissions and limitations under the
2310.17 * License. When distributing the software, include this License Header
2310.18 * Notice in each file and include the License file at
2310.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2310.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2310.21 * particular file as subject to the "Classpath" exception as provided
2310.22 - * by Sun in the GPL Version 2 section of the License file that
2310.23 + * by Oracle in the GPL Version 2 section of the License file that
2310.24 * accompanied this code. If applicable, add the following below the
2310.25 * License Header, with the fields enclosed by brackets [] replaced by
2310.26 * your own identifying information:
2311.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxGroupBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2311.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxGroupBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2311.3 @@ -1,7 +1,10 @@
2311.4 /*
2311.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2311.6 *
2311.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2311.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2311.9 + *
2311.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2311.11 + * Other names may be trademarks of their respective owners.
2311.12 *
2311.13 * The contents of this file are subject to the terms of either the GNU
2311.14 * General Public License Version 2 only ("GPL") or the Common
2311.15 @@ -13,9 +16,9 @@
2311.16 * specific language governing permissions and limitations under the
2311.17 * License. When distributing the software, include this License Header
2311.18 * Notice in each file and include the License file at
2311.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2311.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2311.21 * particular file as subject to the "Classpath" exception as provided
2311.22 - * by Sun in the GPL Version 2 section of the License file that
2311.23 + * by Oracle in the GPL Version 2 section of the License file that
2311.24 * accompanied this code. If applicable, add the following below the
2311.25 * License Header, with the fields enclosed by brackets [] replaced by
2311.26 * your own identifying information:
2312.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxGroupBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2312.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxGroupBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2312.3 @@ -2,7 +2,10 @@
2312.4 /*
2312.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2312.6 *
2312.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2312.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2312.9 + *
2312.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2312.11 + * Other names may be trademarks of their respective owners.
2312.12 *
2312.13 * The contents of this file are subject to the terms of either the GNU
2312.14 * General Public License Version 2 only ("GPL") or the Common
2312.15 @@ -14,9 +17,9 @@
2312.16 * specific language governing permissions and limitations under the
2312.17 * License. When distributing the software, include this License Header
2312.18 * Notice in each file and include the License file at
2312.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2312.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2312.21 * particular file as subject to the "Classpath" exception as provided
2312.22 - * by Sun in the GPL Version 2 section of the License file that
2312.23 + * by Oracle in the GPL Version 2 section of the License file that
2312.24 * accompanied this code. If applicable, add the following below the
2312.25 * License Header, with the fields enclosed by brackets [] replaced by
2312.26 * your own identifying information:
2313.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxGroupDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2313.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/CheckboxGroupDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2313.3 @@ -1,7 +1,10 @@
2313.4 /*
2313.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2313.6 *
2313.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2313.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2313.9 + *
2313.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2313.11 + * Other names may be trademarks of their respective owners.
2313.12 *
2313.13 * The contents of this file are subject to the terms of either the GNU
2313.14 * General Public License Version 2 only ("GPL") or the Common
2313.15 @@ -13,9 +16,9 @@
2313.16 * specific language governing permissions and limitations under the
2313.17 * License. When distributing the software, include this License Header
2313.18 * Notice in each file and include the License file at
2313.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2313.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2313.21 * particular file as subject to the "Classpath" exception as provided
2313.22 - * by Sun in the GPL Version 2 section of the License file that
2313.23 + * by Oracle in the GPL Version 2 section of the License file that
2313.24 * accompanied this code. If applicable, add the following below the
2313.25 * License Header, with the fields enclosed by brackets [] replaced by
2313.26 * your own identifying information:
2314.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/DropDownBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2314.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/DropDownBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2314.3 @@ -1,7 +1,10 @@
2314.4 /*
2314.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2314.6 *
2314.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2314.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2314.9 + *
2314.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2314.11 + * Other names may be trademarks of their respective owners.
2314.12 *
2314.13 * The contents of this file are subject to the terms of either the GNU
2314.14 * General Public License Version 2 only ("GPL") or the Common
2314.15 @@ -13,9 +16,9 @@
2314.16 * specific language governing permissions and limitations under the
2314.17 * License. When distributing the software, include this License Header
2314.18 * Notice in each file and include the License file at
2314.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2314.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2314.21 * particular file as subject to the "Classpath" exception as provided
2314.22 - * by Sun in the GPL Version 2 section of the License file that
2314.23 + * by Oracle in the GPL Version 2 section of the License file that
2314.24 * accompanied this code. If applicable, add the following below the
2314.25 * License Header, with the fields enclosed by brackets [] replaced by
2314.26 * your own identifying information:
2315.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/DropDownBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2315.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/DropDownBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2315.3 @@ -2,7 +2,10 @@
2315.4 /*
2315.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2315.6 *
2315.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2315.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2315.9 + *
2315.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2315.11 + * Other names may be trademarks of their respective owners.
2315.12 *
2315.13 * The contents of this file are subject to the terms of either the GNU
2315.14 * General Public License Version 2 only ("GPL") or the Common
2315.15 @@ -14,9 +17,9 @@
2315.16 * specific language governing permissions and limitations under the
2315.17 * License. When distributing the software, include this License Header
2315.18 * Notice in each file and include the License file at
2315.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2315.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2315.21 * particular file as subject to the "Classpath" exception as provided
2315.22 - * by Sun in the GPL Version 2 section of the License file that
2315.23 + * by Oracle in the GPL Version 2 section of the License file that
2315.24 * accompanied this code. If applicable, add the following below the
2315.25 * License Header, with the fields enclosed by brackets [] replaced by
2315.26 * your own identifying information:
2316.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/DropDownDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2316.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/DropDownDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2316.3 @@ -1,7 +1,10 @@
2316.4 /*
2316.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2316.6 *
2316.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2316.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2316.9 + *
2316.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2316.11 + * Other names may be trademarks of their respective owners.
2316.12 *
2316.13 * The contents of this file are subject to the terms of either the GNU
2316.14 * General Public License Version 2 only ("GPL") or the Common
2316.15 @@ -13,9 +16,9 @@
2316.16 * specific language governing permissions and limitations under the
2316.17 * License. When distributing the software, include this License Header
2316.18 * Notice in each file and include the License file at
2316.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2316.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2316.21 * particular file as subject to the "Classpath" exception as provided
2316.22 - * by Sun in the GPL Version 2 section of the License file that
2316.23 + * by Oracle in the GPL Version 2 section of the License file that
2316.24 * accompanied this code. If applicable, add the following below the
2316.25 * License Header, with the fields enclosed by brackets [] replaced by
2316.26 * your own identifying information:
2317.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/EditableListBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2317.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/EditableListBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2317.3 @@ -1,7 +1,10 @@
2317.4 /*
2317.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2317.6 *
2317.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2317.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2317.9 + *
2317.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2317.11 + * Other names may be trademarks of their respective owners.
2317.12 *
2317.13 * The contents of this file are subject to the terms of either the GNU
2317.14 * General Public License Version 2 only ("GPL") or the Common
2317.15 @@ -13,9 +16,9 @@
2317.16 * specific language governing permissions and limitations under the
2317.17 * License. When distributing the software, include this License Header
2317.18 * Notice in each file and include the License file at
2317.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2317.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2317.21 * particular file as subject to the "Classpath" exception as provided
2317.22 - * by Sun in the GPL Version 2 section of the License file that
2317.23 + * by Oracle in the GPL Version 2 section of the License file that
2317.24 * accompanied this code. If applicable, add the following below the
2317.25 * License Header, with the fields enclosed by brackets [] replaced by
2317.26 * your own identifying information:
2318.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/EditableListBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2318.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/EditableListBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2318.3 @@ -2,7 +2,10 @@
2318.4 /*
2318.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2318.6 *
2318.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2318.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2318.9 + *
2318.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2318.11 + * Other names may be trademarks of their respective owners.
2318.12 *
2318.13 * The contents of this file are subject to the terms of either the GNU
2318.14 * General Public License Version 2 only ("GPL") or the Common
2318.15 @@ -14,9 +17,9 @@
2318.16 * specific language governing permissions and limitations under the
2318.17 * License. When distributing the software, include this License Header
2318.18 * Notice in each file and include the License file at
2318.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2318.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2318.21 * particular file as subject to the "Classpath" exception as provided
2318.22 - * by Sun in the GPL Version 2 section of the License file that
2318.23 + * by Oracle in the GPL Version 2 section of the License file that
2318.24 * accompanied this code. If applicable, add the following below the
2318.25 * License Header, with the fields enclosed by brackets [] replaced by
2318.26 * your own identifying information:
2319.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/EditableListDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2319.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/EditableListDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2319.3 @@ -1,7 +1,10 @@
2319.4 /*
2319.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2319.6 *
2319.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2319.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2319.9 + *
2319.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2319.11 + * Other names may be trademarks of their respective owners.
2319.12 *
2319.13 * The contents of this file are subject to the terms of either the GNU
2319.14 * General Public License Version 2 only ("GPL") or the Common
2319.15 @@ -13,9 +16,9 @@
2319.16 * specific language governing permissions and limitations under the
2319.17 * License. When distributing the software, include this License Header
2319.18 * Notice in each file and include the License file at
2319.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2319.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2319.21 * particular file as subject to the "Classpath" exception as provided
2319.22 - * by Sun in the GPL Version 2 section of the License file that
2319.23 + * by Oracle in the GPL Version 2 section of the License file that
2319.24 * accompanied this code. If applicable, add the following below the
2319.25 * License Header, with the fields enclosed by brackets [] replaced by
2319.26 * your own identifying information:
2320.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/EditableValueHolderDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2320.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/EditableValueHolderDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2320.3 @@ -1,7 +1,10 @@
2320.4 /*
2320.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2320.6 *
2320.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2320.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2320.9 + *
2320.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2320.11 + * Other names may be trademarks of their respective owners.
2320.12 *
2320.13 * The contents of this file are subject to the terms of either the GNU
2320.14 * General Public License Version 2 only ("GPL") or the Common
2320.15 @@ -13,9 +16,9 @@
2320.16 * specific language governing permissions and limitations under the
2320.17 * License. When distributing the software, include this License Header
2320.18 * Notice in each file and include the License file at
2320.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2320.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2320.21 * particular file as subject to the "Classpath" exception as provided
2320.22 - * by Sun in the GPL Version 2 section of the License file that
2320.23 + * by Oracle in the GPL Version 2 section of the License file that
2320.24 * accompanied this code. If applicable, add the following below the
2320.25 * License Header, with the fields enclosed by brackets [] replaced by
2320.26 * your own identifying information:
2321.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FieldBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2321.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FieldBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2321.3 @@ -1,7 +1,10 @@
2321.4 /*
2321.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2321.6 *
2321.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2321.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2321.9 + *
2321.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2321.11 + * Other names may be trademarks of their respective owners.
2321.12 *
2321.13 * The contents of this file are subject to the terms of either the GNU
2321.14 * General Public License Version 2 only ("GPL") or the Common
2321.15 @@ -13,9 +16,9 @@
2321.16 * specific language governing permissions and limitations under the
2321.17 * License. When distributing the software, include this License Header
2321.18 * Notice in each file and include the License file at
2321.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2321.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2321.21 * particular file as subject to the "Classpath" exception as provided
2321.22 - * by Sun in the GPL Version 2 section of the License file that
2321.23 + * by Oracle in the GPL Version 2 section of the License file that
2321.24 * accompanied this code. If applicable, add the following below the
2321.25 * License Header, with the fields enclosed by brackets [] replaced by
2321.26 * your own identifying information:
2322.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FieldBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2322.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FieldBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2322.3 @@ -2,7 +2,10 @@
2322.4 /*
2322.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2322.6 *
2322.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2322.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2322.9 + *
2322.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2322.11 + * Other names may be trademarks of their respective owners.
2322.12 *
2322.13 * The contents of this file are subject to the terms of either the GNU
2322.14 * General Public License Version 2 only ("GPL") or the Common
2322.15 @@ -14,9 +17,9 @@
2322.16 * specific language governing permissions and limitations under the
2322.17 * License. When distributing the software, include this License Header
2322.18 * Notice in each file and include the License file at
2322.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2322.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2322.21 * particular file as subject to the "Classpath" exception as provided
2322.22 - * by Sun in the GPL Version 2 section of the License file that
2322.23 + * by Oracle in the GPL Version 2 section of the License file that
2322.24 * accompanied this code. If applicable, add the following below the
2322.25 * License Header, with the fields enclosed by brackets [] replaced by
2322.26 * your own identifying information:
2323.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FormBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2323.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FormBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2323.3 @@ -1,7 +1,10 @@
2323.4 /*
2323.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2323.6 *
2323.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2323.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2323.9 + *
2323.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2323.11 + * Other names may be trademarks of their respective owners.
2323.12 *
2323.13 * The contents of this file are subject to the terms of either the GNU
2323.14 * General Public License Version 2 only ("GPL") or the Common
2323.15 @@ -13,9 +16,9 @@
2323.16 * specific language governing permissions and limitations under the
2323.17 * License. When distributing the software, include this License Header
2323.18 * Notice in each file and include the License file at
2323.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2323.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2323.21 * particular file as subject to the "Classpath" exception as provided
2323.22 - * by Sun in the GPL Version 2 section of the License file that
2323.23 + * by Oracle in the GPL Version 2 section of the License file that
2323.24 * accompanied this code. If applicable, add the following below the
2323.25 * License Header, with the fields enclosed by brackets [] replaced by
2323.26 * your own identifying information:
2324.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FormBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2324.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FormBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2324.3 @@ -2,7 +2,10 @@
2324.4 /*
2324.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2324.6 *
2324.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2324.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2324.9 + *
2324.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2324.11 + * Other names may be trademarks of their respective owners.
2324.12 *
2324.13 * The contents of this file are subject to the terms of either the GNU
2324.14 * General Public License Version 2 only ("GPL") or the Common
2324.15 @@ -14,9 +17,9 @@
2324.16 * specific language governing permissions and limitations under the
2324.17 * License. When distributing the software, include this License Header
2324.18 * Notice in each file and include the License file at
2324.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2324.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2324.21 * particular file as subject to the "Classpath" exception as provided
2324.22 - * by Sun in the GPL Version 2 section of the License file that
2324.23 + * by Oracle in the GPL Version 2 section of the License file that
2324.24 * accompanied this code. If applicable, add the following below the
2324.25 * License Header, with the fields enclosed by brackets [] replaced by
2324.26 * your own identifying information:
2325.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FormDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2325.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FormDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2325.3 @@ -1,7 +1,10 @@
2325.4 /*
2325.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2325.6 *
2325.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2325.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2325.9 + *
2325.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2325.11 + * Other names may be trademarks of their respective owners.
2325.12 *
2325.13 * The contents of this file are subject to the terms of either the GNU
2325.14 * General Public License Version 2 only ("GPL") or the Common
2325.15 @@ -13,9 +16,9 @@
2325.16 * specific language governing permissions and limitations under the
2325.17 * License. When distributing the software, include this License Header
2325.18 * Notice in each file and include the License file at
2325.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2325.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2325.21 * particular file as subject to the "Classpath" exception as provided
2325.22 - * by Sun in the GPL Version 2 section of the License file that
2325.23 + * by Oracle in the GPL Version 2 section of the License file that
2325.24 * accompanied this code. If applicable, add the following below the
2325.25 * License Header, with the fields enclosed by brackets [] replaced by
2325.26 * your own identifying information:
2326.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FrameBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2326.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FrameBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2326.3 @@ -1,7 +1,10 @@
2326.4 /*
2326.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2326.6 *
2326.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2326.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2326.9 + *
2326.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2326.11 + * Other names may be trademarks of their respective owners.
2326.12 *
2326.13 * The contents of this file are subject to the terms of either the GNU
2326.14 * General Public License Version 2 only ("GPL") or the Common
2326.15 @@ -13,9 +16,9 @@
2326.16 * specific language governing permissions and limitations under the
2326.17 * License. When distributing the software, include this License Header
2326.18 * Notice in each file and include the License file at
2326.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2326.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2326.21 * particular file as subject to the "Classpath" exception as provided
2326.22 - * by Sun in the GPL Version 2 section of the License file that
2326.23 + * by Oracle in the GPL Version 2 section of the License file that
2326.24 * accompanied this code. If applicable, add the following below the
2326.25 * License Header, with the fields enclosed by brackets [] replaced by
2326.26 * your own identifying information:
2327.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FrameBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2327.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FrameBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2327.3 @@ -2,7 +2,10 @@
2327.4 /*
2327.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2327.6 *
2327.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2327.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2327.9 + *
2327.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2327.11 + * Other names may be trademarks of their respective owners.
2327.12 *
2327.13 * The contents of this file are subject to the terms of either the GNU
2327.14 * General Public License Version 2 only ("GPL") or the Common
2327.15 @@ -14,9 +17,9 @@
2327.16 * specific language governing permissions and limitations under the
2327.17 * License. When distributing the software, include this License Header
2327.18 * Notice in each file and include the License file at
2327.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2327.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2327.21 * particular file as subject to the "Classpath" exception as provided
2327.22 - * by Sun in the GPL Version 2 section of the License file that
2327.23 + * by Oracle in the GPL Version 2 section of the License file that
2327.24 * accompanied this code. If applicable, add the following below the
2327.25 * License Header, with the fields enclosed by brackets [] replaced by
2327.26 * your own identifying information:
2328.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FrameSetBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2328.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FrameSetBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2328.3 @@ -1,7 +1,10 @@
2328.4 /*
2328.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2328.6 *
2328.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2328.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2328.9 + *
2328.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2328.11 + * Other names may be trademarks of their respective owners.
2328.12 *
2328.13 * The contents of this file are subject to the terms of either the GNU
2328.14 * General Public License Version 2 only ("GPL") or the Common
2328.15 @@ -13,9 +16,9 @@
2328.16 * specific language governing permissions and limitations under the
2328.17 * License. When distributing the software, include this License Header
2328.18 * Notice in each file and include the License file at
2328.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2328.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2328.21 * particular file as subject to the "Classpath" exception as provided
2328.22 - * by Sun in the GPL Version 2 section of the License file that
2328.23 + * by Oracle in the GPL Version 2 section of the License file that
2328.24 * accompanied this code. If applicable, add the following below the
2328.25 * License Header, with the fields enclosed by brackets [] replaced by
2328.26 * your own identifying information:
2329.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FrameSetBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2329.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/FrameSetBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2329.3 @@ -2,7 +2,10 @@
2329.4 /*
2329.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2329.6 *
2329.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2329.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2329.9 + *
2329.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2329.11 + * Other names may be trademarks of their respective owners.
2329.12 *
2329.13 * The contents of this file are subject to the terms of either the GNU
2329.14 * General Public License Version 2 only ("GPL") or the Common
2329.15 @@ -14,9 +17,9 @@
2329.16 * specific language governing permissions and limitations under the
2329.17 * License. When distributing the software, include this License Header
2329.18 * Notice in each file and include the License file at
2329.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2329.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2329.21 * particular file as subject to the "Classpath" exception as provided
2329.22 - * by Sun in the GPL Version 2 section of the License file that
2329.23 + * by Oracle in the GPL Version 2 section of the License file that
2329.24 * accompanied this code. If applicable, add the following below the
2329.25 * License Header, with the fields enclosed by brackets [] replaced by
2329.26 * your own identifying information:
2330.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HeadBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2330.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HeadBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2330.3 @@ -1,7 +1,10 @@
2330.4 /*
2330.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2330.6 *
2330.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2330.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2330.9 + *
2330.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2330.11 + * Other names may be trademarks of their respective owners.
2330.12 *
2330.13 * The contents of this file are subject to the terms of either the GNU
2330.14 * General Public License Version 2 only ("GPL") or the Common
2330.15 @@ -13,9 +16,9 @@
2330.16 * specific language governing permissions and limitations under the
2330.17 * License. When distributing the software, include this License Header
2330.18 * Notice in each file and include the License file at
2330.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2330.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2330.21 * particular file as subject to the "Classpath" exception as provided
2330.22 - * by Sun in the GPL Version 2 section of the License file that
2330.23 + * by Oracle in the GPL Version 2 section of the License file that
2330.24 * accompanied this code. If applicable, add the following below the
2330.25 * License Header, with the fields enclosed by brackets [] replaced by
2330.26 * your own identifying information:
2331.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HeadBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2331.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HeadBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2331.3 @@ -2,7 +2,10 @@
2331.4 /*
2331.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2331.6 *
2331.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2331.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2331.9 + *
2331.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2331.11 + * Other names may be trademarks of their respective owners.
2331.12 *
2331.13 * The contents of this file are subject to the terms of either the GNU
2331.14 * General Public License Version 2 only ("GPL") or the Common
2331.15 @@ -14,9 +17,9 @@
2331.16 * specific language governing permissions and limitations under the
2331.17 * License. When distributing the software, include this License Header
2331.18 * Notice in each file and include the License file at
2331.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2331.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2331.21 * particular file as subject to the "Classpath" exception as provided
2331.22 - * by Sun in the GPL Version 2 section of the License file that
2331.23 + * by Oracle in the GPL Version 2 section of the License file that
2331.24 * accompanied this code. If applicable, add the following below the
2331.25 * License Header, with the fields enclosed by brackets [] replaced by
2331.26 * your own identifying information:
2332.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HelpInlineBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2332.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HelpInlineBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2332.3 @@ -1,7 +1,10 @@
2332.4 /*
2332.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2332.6 *
2332.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2332.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2332.9 + *
2332.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2332.11 + * Other names may be trademarks of their respective owners.
2332.12 *
2332.13 * The contents of this file are subject to the terms of either the GNU
2332.14 * General Public License Version 2 only ("GPL") or the Common
2332.15 @@ -13,9 +16,9 @@
2332.16 * specific language governing permissions and limitations under the
2332.17 * License. When distributing the software, include this License Header
2332.18 * Notice in each file and include the License file at
2332.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2332.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2332.21 * particular file as subject to the "Classpath" exception as provided
2332.22 - * by Sun in the GPL Version 2 section of the License file that
2332.23 + * by Oracle in the GPL Version 2 section of the License file that
2332.24 * accompanied this code. If applicable, add the following below the
2332.25 * License Header, with the fields enclosed by brackets [] replaced by
2332.26 * your own identifying information:
2333.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HelpInlineBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2333.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HelpInlineBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2333.3 @@ -2,7 +2,10 @@
2333.4 /*
2333.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2333.6 *
2333.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2333.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2333.9 + *
2333.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2333.11 + * Other names may be trademarks of their respective owners.
2333.12 *
2333.13 * The contents of this file are subject to the terms of either the GNU
2333.14 * General Public License Version 2 only ("GPL") or the Common
2333.15 @@ -14,9 +17,9 @@
2333.16 * specific language governing permissions and limitations under the
2333.17 * License. When distributing the software, include this License Header
2333.18 * Notice in each file and include the License file at
2333.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2333.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2333.21 * particular file as subject to the "Classpath" exception as provided
2333.22 - * by Sun in the GPL Version 2 section of the License file that
2333.23 + * by Oracle in the GPL Version 2 section of the License file that
2333.24 * accompanied this code. If applicable, add the following below the
2333.25 * License Header, with the fields enclosed by brackets [] replaced by
2333.26 * your own identifying information:
2334.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HelpInlineDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2334.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HelpInlineDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2334.3 @@ -1,7 +1,10 @@
2334.4 /*
2334.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2334.6 *
2334.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2334.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2334.9 + *
2334.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2334.11 + * Other names may be trademarks of their respective owners.
2334.12 *
2334.13 * The contents of this file are subject to the terms of either the GNU
2334.14 * General Public License Version 2 only ("GPL") or the Common
2334.15 @@ -13,9 +16,9 @@
2334.16 * specific language governing permissions and limitations under the
2334.17 * License. When distributing the software, include this License Header
2334.18 * Notice in each file and include the License file at
2334.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2334.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2334.21 * particular file as subject to the "Classpath" exception as provided
2334.22 - * by Sun in the GPL Version 2 section of the License file that
2334.23 + * by Oracle in the GPL Version 2 section of the License file that
2334.24 * accompanied this code. If applicable, add the following below the
2334.25 * License Header, with the fields enclosed by brackets [] replaced by
2334.26 * your own identifying information:
2335.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HiddenFieldBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2335.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HiddenFieldBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2335.3 @@ -1,7 +1,10 @@
2335.4 /*
2335.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2335.6 *
2335.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2335.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2335.9 + *
2335.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2335.11 + * Other names may be trademarks of their respective owners.
2335.12 *
2335.13 * The contents of this file are subject to the terms of either the GNU
2335.14 * General Public License Version 2 only ("GPL") or the Common
2335.15 @@ -13,9 +16,9 @@
2335.16 * specific language governing permissions and limitations under the
2335.17 * License. When distributing the software, include this License Header
2335.18 * Notice in each file and include the License file at
2335.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2335.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2335.21 * particular file as subject to the "Classpath" exception as provided
2335.22 - * by Sun in the GPL Version 2 section of the License file that
2335.23 + * by Oracle in the GPL Version 2 section of the License file that
2335.24 * accompanied this code. If applicable, add the following below the
2335.25 * License Header, with the fields enclosed by brackets [] replaced by
2335.26 * your own identifying information:
2336.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HiddenFieldBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2336.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HiddenFieldBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2336.3 @@ -2,7 +2,10 @@
2336.4 /*
2336.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2336.6 *
2336.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2336.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2336.9 + *
2336.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2336.11 + * Other names may be trademarks of their respective owners.
2336.12 *
2336.13 * The contents of this file are subject to the terms of either the GNU
2336.14 * General Public License Version 2 only ("GPL") or the Common
2336.15 @@ -14,9 +17,9 @@
2336.16 * specific language governing permissions and limitations under the
2336.17 * License. When distributing the software, include this License Header
2336.18 * Notice in each file and include the License file at
2336.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2336.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2336.21 * particular file as subject to the "Classpath" exception as provided
2336.22 - * by Sun in the GPL Version 2 section of the License file that
2336.23 + * by Oracle in the GPL Version 2 section of the License file that
2336.24 * accompanied this code. If applicable, add the following below the
2336.25 * License Header, with the fields enclosed by brackets [] replaced by
2336.26 * your own identifying information:
2337.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HiddenFieldDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2337.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HiddenFieldDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2337.3 @@ -1,7 +1,10 @@
2337.4 /*
2337.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2337.6 *
2337.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2337.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2337.9 + *
2337.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2337.11 + * Other names may be trademarks of their respective owners.
2337.12 *
2337.13 * The contents of this file are subject to the terms of either the GNU
2337.14 * General Public License Version 2 only ("GPL") or the Common
2337.15 @@ -13,9 +16,9 @@
2337.16 * specific language governing permissions and limitations under the
2337.17 * License. When distributing the software, include this License Header
2337.18 * Notice in each file and include the License file at
2337.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2337.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2337.21 * particular file as subject to the "Classpath" exception as provided
2337.22 - * by Sun in the GPL Version 2 section of the License file that
2337.23 + * by Oracle in the GPL Version 2 section of the License file that
2337.24 * accompanied this code. If applicable, add the following below the
2337.25 * License Header, with the fields enclosed by brackets [] replaced by
2337.26 * your own identifying information:
2338.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HtmlBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2338.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HtmlBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2338.3 @@ -1,7 +1,10 @@
2338.4 /*
2338.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2338.6 *
2338.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2338.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2338.9 + *
2338.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2338.11 + * Other names may be trademarks of their respective owners.
2338.12 *
2338.13 * The contents of this file are subject to the terms of either the GNU
2338.14 * General Public License Version 2 only ("GPL") or the Common
2338.15 @@ -13,9 +16,9 @@
2338.16 * specific language governing permissions and limitations under the
2338.17 * License. When distributing the software, include this License Header
2338.18 * Notice in each file and include the License file at
2338.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2338.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2338.21 * particular file as subject to the "Classpath" exception as provided
2338.22 - * by Sun in the GPL Version 2 section of the License file that
2338.23 + * by Oracle in the GPL Version 2 section of the License file that
2338.24 * accompanied this code. If applicable, add the following below the
2338.25 * License Header, with the fields enclosed by brackets [] replaced by
2338.26 * your own identifying information:
2339.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HtmlBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2339.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HtmlBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2339.3 @@ -2,7 +2,10 @@
2339.4 /*
2339.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2339.6 *
2339.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2339.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2339.9 + *
2339.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2339.11 + * Other names may be trademarks of their respective owners.
2339.12 *
2339.13 * The contents of this file are subject to the terms of either the GNU
2339.14 * General Public License Version 2 only ("GPL") or the Common
2339.15 @@ -14,9 +17,9 @@
2339.16 * specific language governing permissions and limitations under the
2339.17 * License. When distributing the software, include this License Header
2339.18 * Notice in each file and include the License file at
2339.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2339.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2339.21 * particular file as subject to the "Classpath" exception as provided
2339.22 - * by Sun in the GPL Version 2 section of the License file that
2339.23 + * by Oracle in the GPL Version 2 section of the License file that
2339.24 * accompanied this code. If applicable, add the following below the
2339.25 * License Header, with the fields enclosed by brackets [] replaced by
2339.26 * your own identifying information:
2340.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HyperlinkBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2340.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HyperlinkBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2340.3 @@ -1,7 +1,10 @@
2340.4 /*
2340.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2340.6 *
2340.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2340.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2340.9 + *
2340.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2340.11 + * Other names may be trademarks of their respective owners.
2340.12 *
2340.13 * The contents of this file are subject to the terms of either the GNU
2340.14 * General Public License Version 2 only ("GPL") or the Common
2340.15 @@ -13,9 +16,9 @@
2340.16 * specific language governing permissions and limitations under the
2340.17 * License. When distributing the software, include this License Header
2340.18 * Notice in each file and include the License file at
2340.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2340.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2340.21 * particular file as subject to the "Classpath" exception as provided
2340.22 - * by Sun in the GPL Version 2 section of the License file that
2340.23 + * by Oracle in the GPL Version 2 section of the License file that
2340.24 * accompanied this code. If applicable, add the following below the
2340.25 * License Header, with the fields enclosed by brackets [] replaced by
2340.26 * your own identifying information:
2341.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HyperlinkBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2341.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HyperlinkBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2341.3 @@ -2,7 +2,10 @@
2341.4 /*
2341.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2341.6 *
2341.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2341.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2341.9 + *
2341.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2341.11 + * Other names may be trademarks of their respective owners.
2341.12 *
2341.13 * The contents of this file are subject to the terms of either the GNU
2341.14 * General Public License Version 2 only ("GPL") or the Common
2341.15 @@ -14,9 +17,9 @@
2341.16 * specific language governing permissions and limitations under the
2341.17 * License. When distributing the software, include this License Header
2341.18 * Notice in each file and include the License file at
2341.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2341.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2341.21 * particular file as subject to the "Classpath" exception as provided
2341.22 - * by Sun in the GPL Version 2 section of the License file that
2341.23 + * by Oracle in the GPL Version 2 section of the License file that
2341.24 * accompanied this code. If applicable, add the following below the
2341.25 * License Header, with the fields enclosed by brackets [] replaced by
2341.26 * your own identifying information:
2342.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HyperlinkDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2342.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/HyperlinkDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2342.3 @@ -1,7 +1,10 @@
2342.4 /*
2342.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2342.6 *
2342.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2342.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2342.9 + *
2342.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2342.11 + * Other names may be trademarks of their respective owners.
2342.12 *
2342.13 * The contents of this file are subject to the terms of either the GNU
2342.14 * General Public License Version 2 only ("GPL") or the Common
2342.15 @@ -13,9 +16,9 @@
2342.16 * specific language governing permissions and limitations under the
2342.17 * License. When distributing the software, include this License Header
2342.18 * Notice in each file and include the License file at
2342.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2342.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2342.21 * particular file as subject to the "Classpath" exception as provided
2342.22 - * by Sun in the GPL Version 2 section of the License file that
2342.23 + * by Oracle in the GPL Version 2 section of the License file that
2342.24 * accompanied this code. If applicable, add the following below the
2342.25 * License Header, with the fields enclosed by brackets [] replaced by
2342.26 * your own identifying information:
2343.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IFrameBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2343.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IFrameBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2343.3 @@ -1,7 +1,10 @@
2343.4 /*
2343.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2343.6 *
2343.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2343.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2343.9 + *
2343.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2343.11 + * Other names may be trademarks of their respective owners.
2343.12 *
2343.13 * The contents of this file are subject to the terms of either the GNU
2343.14 * General Public License Version 2 only ("GPL") or the Common
2343.15 @@ -13,9 +16,9 @@
2343.16 * specific language governing permissions and limitations under the
2343.17 * License. When distributing the software, include this License Header
2343.18 * Notice in each file and include the License file at
2343.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2343.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2343.21 * particular file as subject to the "Classpath" exception as provided
2343.22 - * by Sun in the GPL Version 2 section of the License file that
2343.23 + * by Oracle in the GPL Version 2 section of the License file that
2343.24 * accompanied this code. If applicable, add the following below the
2343.25 * License Header, with the fields enclosed by brackets [] replaced by
2343.26 * your own identifying information:
2344.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IFrameBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2344.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IFrameBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2344.3 @@ -2,7 +2,10 @@
2344.4 /*
2344.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2344.6 *
2344.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2344.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2344.9 + *
2344.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2344.11 + * Other names may be trademarks of their respective owners.
2344.12 *
2344.13 * The contents of this file are subject to the terms of either the GNU
2344.14 * General Public License Version 2 only ("GPL") or the Common
2344.15 @@ -14,9 +17,9 @@
2344.16 * specific language governing permissions and limitations under the
2344.17 * License. When distributing the software, include this License Header
2344.18 * Notice in each file and include the License file at
2344.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2344.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2344.21 * particular file as subject to the "Classpath" exception as provided
2344.22 - * by Sun in the GPL Version 2 section of the License file that
2344.23 + * by Oracle in the GPL Version 2 section of the License file that
2344.24 * accompanied this code. If applicable, add the following below the
2344.25 * License Header, with the fields enclosed by brackets [] replaced by
2344.26 * your own identifying information:
2345.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2345.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2345.3 @@ -1,7 +1,10 @@
2345.4 /*
2345.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2345.6 *
2345.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2345.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2345.9 + *
2345.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2345.11 + * Other names may be trademarks of their respective owners.
2345.12 *
2345.13 * The contents of this file are subject to the terms of either the GNU
2345.14 * General Public License Version 2 only ("GPL") or the Common
2345.15 @@ -13,9 +16,9 @@
2345.16 * specific language governing permissions and limitations under the
2345.17 * License. When distributing the software, include this License Header
2345.18 * Notice in each file and include the License file at
2345.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2345.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2345.21 * particular file as subject to the "Classpath" exception as provided
2345.22 - * by Sun in the GPL Version 2 section of the License file that
2345.23 + * by Oracle in the GPL Version 2 section of the License file that
2345.24 * accompanied this code. If applicable, add the following below the
2345.25 * License Header, with the fields enclosed by brackets [] replaced by
2345.26 * your own identifying information:
2346.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2346.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2346.3 @@ -2,7 +2,10 @@
2346.4 /*
2346.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2346.6 *
2346.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2346.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2346.9 + *
2346.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2346.11 + * Other names may be trademarks of their respective owners.
2346.12 *
2346.13 * The contents of this file are subject to the terms of either the GNU
2346.14 * General Public License Version 2 only ("GPL") or the Common
2346.15 @@ -14,9 +17,9 @@
2346.16 * specific language governing permissions and limitations under the
2346.17 * License. When distributing the software, include this License Header
2346.18 * Notice in each file and include the License file at
2346.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2346.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2346.21 * particular file as subject to the "Classpath" exception as provided
2346.22 - * by Sun in the GPL Version 2 section of the License file that
2346.23 + * by Oracle in the GPL Version 2 section of the License file that
2346.24 * accompanied this code. If applicable, add the following below the
2346.25 * License Header, with the fields enclosed by brackets [] replaced by
2346.26 * your own identifying information:
2347.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2347.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2347.3 @@ -1,7 +1,10 @@
2347.4 /*
2347.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2347.6 *
2347.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2347.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2347.9 + *
2347.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2347.11 + * Other names may be trademarks of their respective owners.
2347.12 *
2347.13 * The contents of this file are subject to the terms of either the GNU
2347.14 * General Public License Version 2 only ("GPL") or the Common
2347.15 @@ -13,9 +16,9 @@
2347.16 * specific language governing permissions and limitations under the
2347.17 * License. When distributing the software, include this License Header
2347.18 * Notice in each file and include the License file at
2347.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2347.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2347.21 * particular file as subject to the "Classpath" exception as provided
2347.22 - * by Sun in the GPL Version 2 section of the License file that
2347.23 + * by Oracle in the GPL Version 2 section of the License file that
2347.24 * accompanied this code. If applicable, add the following below the
2347.25 * License Header, with the fields enclosed by brackets [] replaced by
2347.26 * your own identifying information:
2348.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconHyperlinkBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2348.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconHyperlinkBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2348.3 @@ -1,7 +1,10 @@
2348.4 /*
2348.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2348.6 *
2348.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2348.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2348.9 + *
2348.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2348.11 + * Other names may be trademarks of their respective owners.
2348.12 *
2348.13 * The contents of this file are subject to the terms of either the GNU
2348.14 * General Public License Version 2 only ("GPL") or the Common
2348.15 @@ -13,9 +16,9 @@
2348.16 * specific language governing permissions and limitations under the
2348.17 * License. When distributing the software, include this License Header
2348.18 * Notice in each file and include the License file at
2348.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2348.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2348.21 * particular file as subject to the "Classpath" exception as provided
2348.22 - * by Sun in the GPL Version 2 section of the License file that
2348.23 + * by Oracle in the GPL Version 2 section of the License file that
2348.24 * accompanied this code. If applicable, add the following below the
2348.25 * License Header, with the fields enclosed by brackets [] replaced by
2348.26 * your own identifying information:
2349.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconHyperlinkBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2349.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconHyperlinkBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2349.3 @@ -2,7 +2,10 @@
2349.4 /*
2349.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2349.6 *
2349.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2349.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2349.9 + *
2349.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2349.11 + * Other names may be trademarks of their respective owners.
2349.12 *
2349.13 * The contents of this file are subject to the terms of either the GNU
2349.14 * General Public License Version 2 only ("GPL") or the Common
2349.15 @@ -14,9 +17,9 @@
2349.16 * specific language governing permissions and limitations under the
2349.17 * License. When distributing the software, include this License Header
2349.18 * Notice in each file and include the License file at
2349.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2349.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2349.21 * particular file as subject to the "Classpath" exception as provided
2349.22 - * by Sun in the GPL Version 2 section of the License file that
2349.23 + * by Oracle in the GPL Version 2 section of the License file that
2349.24 * accompanied this code. If applicable, add the following below the
2349.25 * License Header, with the fields enclosed by brackets [] replaced by
2349.26 * your own identifying information:
2350.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconHyperlinkDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2350.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/IconHyperlinkDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2350.3 @@ -1,7 +1,10 @@
2350.4 /*
2350.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2350.6 *
2350.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2350.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2350.9 + *
2350.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2350.11 + * Other names may be trademarks of their respective owners.
2350.12 *
2350.13 * The contents of this file are subject to the terms of either the GNU
2350.14 * General Public License Version 2 only ("GPL") or the Common
2350.15 @@ -13,9 +16,9 @@
2350.16 * specific language governing permissions and limitations under the
2350.17 * License. When distributing the software, include this License Header
2350.18 * Notice in each file and include the License file at
2350.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2350.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2350.21 * particular file as subject to the "Classpath" exception as provided
2350.22 - * by Sun in the GPL Version 2 section of the License file that
2350.23 + * by Oracle in the GPL Version 2 section of the License file that
2350.24 * accompanied this code. If applicable, add the following below the
2350.25 * License Header, with the fields enclosed by brackets [] replaced by
2350.26 * your own identifying information:
2351.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageComponentBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2351.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageComponentBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2351.3 @@ -1,7 +1,10 @@
2351.4 /*
2351.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2351.6 *
2351.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2351.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2351.9 + *
2351.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2351.11 + * Other names may be trademarks of their respective owners.
2351.12 *
2351.13 * The contents of this file are subject to the terms of either the GNU
2351.14 * General Public License Version 2 only ("GPL") or the Common
2351.15 @@ -13,9 +16,9 @@
2351.16 * specific language governing permissions and limitations under the
2351.17 * License. When distributing the software, include this License Header
2351.18 * Notice in each file and include the License file at
2351.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2351.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2351.21 * particular file as subject to the "Classpath" exception as provided
2351.22 - * by Sun in the GPL Version 2 section of the License file that
2351.23 + * by Oracle in the GPL Version 2 section of the License file that
2351.24 * accompanied this code. If applicable, add the following below the
2351.25 * License Header, with the fields enclosed by brackets [] replaced by
2351.26 * your own identifying information:
2352.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageComponentBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2352.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageComponentBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2352.3 @@ -2,7 +2,10 @@
2352.4 /*
2352.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2352.6 *
2352.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2352.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2352.9 + *
2352.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2352.11 + * Other names may be trademarks of their respective owners.
2352.12 *
2352.13 * The contents of this file are subject to the terms of either the GNU
2352.14 * General Public License Version 2 only ("GPL") or the Common
2352.15 @@ -14,9 +17,9 @@
2352.16 * specific language governing permissions and limitations under the
2352.17 * License. When distributing the software, include this License Header
2352.18 * Notice in each file and include the License file at
2352.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2352.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2352.21 * particular file as subject to the "Classpath" exception as provided
2352.22 - * by Sun in the GPL Version 2 section of the License file that
2352.23 + * by Oracle in the GPL Version 2 section of the License file that
2352.24 * accompanied this code. If applicable, add the following below the
2352.25 * License Header, with the fields enclosed by brackets [] replaced by
2352.26 * your own identifying information:
2353.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageComponentDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2353.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageComponentDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2353.3 @@ -1,7 +1,10 @@
2353.4 /*
2353.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2353.6 *
2353.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2353.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2353.9 + *
2353.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2353.11 + * Other names may be trademarks of their respective owners.
2353.12 *
2353.13 * The contents of this file are subject to the terms of either the GNU
2353.14 * General Public License Version 2 only ("GPL") or the Common
2353.15 @@ -13,9 +16,9 @@
2353.16 * specific language governing permissions and limitations under the
2353.17 * License. When distributing the software, include this License Header
2353.18 * Notice in each file and include the License file at
2353.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2353.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2353.21 * particular file as subject to the "Classpath" exception as provided
2353.22 - * by Sun in the GPL Version 2 section of the License file that
2353.23 + * by Oracle in the GPL Version 2 section of the License file that
2353.24 * accompanied this code. If applicable, add the following below the
2353.25 * License Header, with the fields enclosed by brackets [] replaced by
2353.26 * your own identifying information:
2354.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageHyperlinkBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2354.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageHyperlinkBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2354.3 @@ -1,7 +1,10 @@
2354.4 /*
2354.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2354.6 *
2354.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2354.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2354.9 + *
2354.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2354.11 + * Other names may be trademarks of their respective owners.
2354.12 *
2354.13 * The contents of this file are subject to the terms of either the GNU
2354.14 * General Public License Version 2 only ("GPL") or the Common
2354.15 @@ -13,9 +16,9 @@
2354.16 * specific language governing permissions and limitations under the
2354.17 * License. When distributing the software, include this License Header
2354.18 * Notice in each file and include the License file at
2354.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2354.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2354.21 * particular file as subject to the "Classpath" exception as provided
2354.22 - * by Sun in the GPL Version 2 section of the License file that
2354.23 + * by Oracle in the GPL Version 2 section of the License file that
2354.24 * accompanied this code. If applicable, add the following below the
2354.25 * License Header, with the fields enclosed by brackets [] replaced by
2354.26 * your own identifying information:
2355.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageHyperlinkBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2355.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageHyperlinkBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2355.3 @@ -2,7 +2,10 @@
2355.4 /*
2355.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2355.6 *
2355.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2355.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2355.9 + *
2355.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2355.11 + * Other names may be trademarks of their respective owners.
2355.12 *
2355.13 * The contents of this file are subject to the terms of either the GNU
2355.14 * General Public License Version 2 only ("GPL") or the Common
2355.15 @@ -14,9 +17,9 @@
2355.16 * specific language governing permissions and limitations under the
2355.17 * License. When distributing the software, include this License Header
2355.18 * Notice in each file and include the License file at
2355.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2355.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2355.21 * particular file as subject to the "Classpath" exception as provided
2355.22 - * by Sun in the GPL Version 2 section of the License file that
2355.23 + * by Oracle in the GPL Version 2 section of the License file that
2355.24 * accompanied this code. If applicable, add the following below the
2355.25 * License Header, with the fields enclosed by brackets [] replaced by
2355.26 * your own identifying information:
2356.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageHyperlinkDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2356.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ImageHyperlinkDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2356.3 @@ -1,7 +1,10 @@
2356.4 /*
2356.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2356.6 *
2356.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2356.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2356.9 + *
2356.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2356.11 + * Other names may be trademarks of their respective owners.
2356.12 *
2356.13 * The contents of this file are subject to the terms of either the GNU
2356.14 * General Public License Version 2 only ("GPL") or the Common
2356.15 @@ -13,9 +16,9 @@
2356.16 * specific language governing permissions and limitations under the
2356.17 * License. When distributing the software, include this License Header
2356.18 * Notice in each file and include the License file at
2356.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2356.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2356.21 * particular file as subject to the "Classpath" exception as provided
2356.22 - * by Sun in the GPL Version 2 section of the License file that
2356.23 + * by Oracle in the GPL Version 2 section of the License file that
2356.24 * accompanied this code. If applicable, add the following below the
2356.25 * License Header, with the fields enclosed by brackets [] replaced by
2356.26 * your own identifying information:
2357.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LabelBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2357.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LabelBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2357.3 @@ -1,7 +1,10 @@
2357.4 /*
2357.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2357.6 *
2357.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2357.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2357.9 + *
2357.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2357.11 + * Other names may be trademarks of their respective owners.
2357.12 *
2357.13 * The contents of this file are subject to the terms of either the GNU
2357.14 * General Public License Version 2 only ("GPL") or the Common
2357.15 @@ -13,9 +16,9 @@
2357.16 * specific language governing permissions and limitations under the
2357.17 * License. When distributing the software, include this License Header
2357.18 * Notice in each file and include the License file at
2357.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2357.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2357.21 * particular file as subject to the "Classpath" exception as provided
2357.22 - * by Sun in the GPL Version 2 section of the License file that
2357.23 + * by Oracle in the GPL Version 2 section of the License file that
2357.24 * accompanied this code. If applicable, add the following below the
2357.25 * License Header, with the fields enclosed by brackets [] replaced by
2357.26 * your own identifying information:
2358.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LabelBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2358.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LabelBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2358.3 @@ -2,7 +2,10 @@
2358.4 /*
2358.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2358.6 *
2358.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2358.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2358.9 + *
2358.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2358.11 + * Other names may be trademarks of their respective owners.
2358.12 *
2358.13 * The contents of this file are subject to the terms of either the GNU
2358.14 * General Public License Version 2 only ("GPL") or the Common
2358.15 @@ -14,9 +17,9 @@
2358.16 * specific language governing permissions and limitations under the
2358.17 * License. When distributing the software, include this License Header
2358.18 * Notice in each file and include the License file at
2358.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2358.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2358.21 * particular file as subject to the "Classpath" exception as provided
2358.22 - * by Sun in the GPL Version 2 section of the License file that
2358.23 + * by Oracle in the GPL Version 2 section of the License file that
2358.24 * accompanied this code. If applicable, add the following below the
2358.25 * License Header, with the fields enclosed by brackets [] replaced by
2358.26 * your own identifying information:
2359.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LabelDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2359.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LabelDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2359.3 @@ -1,7 +1,10 @@
2359.4 /*
2359.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2359.6 *
2359.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2359.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2359.9 + *
2359.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2359.11 + * Other names may be trademarks of their respective owners.
2359.12 *
2359.13 * The contents of this file are subject to the terms of either the GNU
2359.14 * General Public License Version 2 only ("GPL") or the Common
2359.15 @@ -13,9 +16,9 @@
2359.16 * specific language governing permissions and limitations under the
2359.17 * License. When distributing the software, include this License Header
2359.18 * Notice in each file and include the License file at
2359.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2359.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2359.21 * particular file as subject to the "Classpath" exception as provided
2359.22 - * by Sun in the GPL Version 2 section of the License file that
2359.23 + * by Oracle in the GPL Version 2 section of the License file that
2359.24 * accompanied this code. If applicable, add the following below the
2359.25 * License Header, with the fields enclosed by brackets [] replaced by
2359.26 * your own identifying information:
2360.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LegendBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2360.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LegendBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2360.3 @@ -2,7 +2,10 @@
2360.4 /*
2360.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2360.6 *
2360.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2360.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2360.9 + *
2360.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2360.11 + * Other names may be trademarks of their respective owners.
2360.12 *
2360.13 * The contents of this file are subject to the terms of either the GNU
2360.14 * General Public License Version 2 only ("GPL") or the Common
2360.15 @@ -14,9 +17,9 @@
2360.16 * specific language governing permissions and limitations under the
2360.17 * License. When distributing the software, include this License Header
2360.18 * Notice in each file and include the License file at
2360.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2360.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2360.21 * particular file as subject to the "Classpath" exception as provided
2360.22 - * by Sun in the GPL Version 2 section of the License file that
2360.23 + * by Oracle in the GPL Version 2 section of the License file that
2360.24 * accompanied this code. If applicable, add the following below the
2360.25 * License Header, with the fields enclosed by brackets [] replaced by
2360.26 * your own identifying information:
2361.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LinkBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2361.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LinkBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2361.3 @@ -1,7 +1,10 @@
2361.4 /*
2361.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2361.6 *
2361.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2361.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2361.9 + *
2361.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2361.11 + * Other names may be trademarks of their respective owners.
2361.12 *
2361.13 * The contents of this file are subject to the terms of either the GNU
2361.14 * General Public License Version 2 only ("GPL") or the Common
2361.15 @@ -13,9 +16,9 @@
2361.16 * specific language governing permissions and limitations under the
2361.17 * License. When distributing the software, include this License Header
2361.18 * Notice in each file and include the License file at
2361.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2361.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2361.21 * particular file as subject to the "Classpath" exception as provided
2361.22 - * by Sun in the GPL Version 2 section of the License file that
2361.23 + * by Oracle in the GPL Version 2 section of the License file that
2361.24 * accompanied this code. If applicable, add the following below the
2361.25 * License Header, with the fields enclosed by brackets [] replaced by
2361.26 * your own identifying information:
2362.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LinkBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2362.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LinkBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2362.3 @@ -2,7 +2,10 @@
2362.4 /*
2362.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2362.6 *
2362.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2362.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2362.9 + *
2362.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2362.11 + * Other names may be trademarks of their respective owners.
2362.12 *
2362.13 * The contents of this file are subject to the terms of either the GNU
2362.14 * General Public License Version 2 only ("GPL") or the Common
2362.15 @@ -14,9 +17,9 @@
2362.16 * specific language governing permissions and limitations under the
2362.17 * License. When distributing the software, include this License Header
2362.18 * Notice in each file and include the License file at
2362.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2362.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2362.21 * particular file as subject to the "Classpath" exception as provided
2362.22 - * by Sun in the GPL Version 2 section of the License file that
2362.23 + * by Oracle in the GPL Version 2 section of the License file that
2362.24 * accompanied this code. If applicable, add the following below the
2362.25 * License Header, with the fields enclosed by brackets [] replaced by
2362.26 * your own identifying information:
2363.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LinkDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2363.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/LinkDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2363.3 @@ -1,7 +1,10 @@
2363.4 /*
2363.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2363.6 *
2363.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2363.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2363.9 + *
2363.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2363.11 + * Other names may be trademarks of their respective owners.
2363.12 *
2363.13 * The contents of this file are subject to the terms of either the GNU
2363.14 * General Public License Version 2 only ("GPL") or the Common
2363.15 @@ -13,9 +16,9 @@
2363.16 * specific language governing permissions and limitations under the
2363.17 * License. When distributing the software, include this License Header
2363.18 * Notice in each file and include the License file at
2363.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2363.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2363.21 * particular file as subject to the "Classpath" exception as provided
2363.22 - * by Sun in the GPL Version 2 section of the License file that
2363.23 + * by Oracle in the GPL Version 2 section of the License file that
2363.24 * accompanied this code. If applicable, add the following below the
2363.25 * License Header, with the fields enclosed by brackets [] replaced by
2363.26 * your own identifying information:
2364.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListSelectorBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2364.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListSelectorBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2364.3 @@ -1,7 +1,10 @@
2364.4 /*
2364.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2364.6 *
2364.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2364.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2364.9 + *
2364.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2364.11 + * Other names may be trademarks of their respective owners.
2364.12 *
2364.13 * The contents of this file are subject to the terms of either the GNU
2364.14 * General Public License Version 2 only ("GPL") or the Common
2364.15 @@ -13,9 +16,9 @@
2364.16 * specific language governing permissions and limitations under the
2364.17 * License. When distributing the software, include this License Header
2364.18 * Notice in each file and include the License file at
2364.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2364.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2364.21 * particular file as subject to the "Classpath" exception as provided
2364.22 - * by Sun in the GPL Version 2 section of the License file that
2364.23 + * by Oracle in the GPL Version 2 section of the License file that
2364.24 * accompanied this code. If applicable, add the following below the
2364.25 * License Header, with the fields enclosed by brackets [] replaced by
2364.26 * your own identifying information:
2365.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListSelectorBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2365.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListSelectorBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2365.3 @@ -2,7 +2,10 @@
2365.4 /*
2365.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2365.6 *
2365.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2365.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2365.9 + *
2365.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2365.11 + * Other names may be trademarks of their respective owners.
2365.12 *
2365.13 * The contents of this file are subject to the terms of either the GNU
2365.14 * General Public License Version 2 only ("GPL") or the Common
2365.15 @@ -14,9 +17,9 @@
2365.16 * specific language governing permissions and limitations under the
2365.17 * License. When distributing the software, include this License Header
2365.18 * Notice in each file and include the License file at
2365.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2365.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2365.21 * particular file as subject to the "Classpath" exception as provided
2365.22 - * by Sun in the GPL Version 2 section of the License file that
2365.23 + * by Oracle in the GPL Version 2 section of the License file that
2365.24 * accompanied this code. If applicable, add the following below the
2365.25 * License Header, with the fields enclosed by brackets [] replaced by
2365.26 * your own identifying information:
2366.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListboxBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2366.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListboxBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2366.3 @@ -1,7 +1,10 @@
2366.4 /*
2366.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2366.6 *
2366.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2366.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2366.9 + *
2366.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2366.11 + * Other names may be trademarks of their respective owners.
2366.12 *
2366.13 * The contents of this file are subject to the terms of either the GNU
2366.14 * General Public License Version 2 only ("GPL") or the Common
2366.15 @@ -13,9 +16,9 @@
2366.16 * specific language governing permissions and limitations under the
2366.17 * License. When distributing the software, include this License Header
2366.18 * Notice in each file and include the License file at
2366.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2366.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2366.21 * particular file as subject to the "Classpath" exception as provided
2366.22 - * by Sun in the GPL Version 2 section of the License file that
2366.23 + * by Oracle in the GPL Version 2 section of the License file that
2366.24 * accompanied this code. If applicable, add the following below the
2366.25 * License Header, with the fields enclosed by brackets [] replaced by
2366.26 * your own identifying information:
2367.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListboxBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2367.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListboxBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2367.3 @@ -2,7 +2,10 @@
2367.4 /*
2367.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2367.6 *
2367.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2367.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2367.9 + *
2367.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2367.11 + * Other names may be trademarks of their respective owners.
2367.12 *
2367.13 * The contents of this file are subject to the terms of either the GNU
2367.14 * General Public License Version 2 only ("GPL") or the Common
2367.15 @@ -14,9 +17,9 @@
2367.16 * specific language governing permissions and limitations under the
2367.17 * License. When distributing the software, include this License Header
2367.18 * Notice in each file and include the License file at
2367.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2367.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2367.21 * particular file as subject to the "Classpath" exception as provided
2367.22 - * by Sun in the GPL Version 2 section of the License file that
2367.23 + * by Oracle in the GPL Version 2 section of the License file that
2367.24 * accompanied this code. If applicable, add the following below the
2367.25 * License Header, with the fields enclosed by brackets [] replaced by
2367.26 * your own identifying information:
2368.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListboxDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2368.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ListboxDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2368.3 @@ -1,7 +1,10 @@
2368.4 /*
2368.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2368.6 *
2368.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2368.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2368.9 + *
2368.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2368.11 + * Other names may be trademarks of their respective owners.
2368.12 *
2368.13 * The contents of this file are subject to the terms of either the GNU
2368.14 * General Public License Version 2 only ("GPL") or the Common
2368.15 @@ -13,9 +16,9 @@
2368.16 * specific language governing permissions and limitations under the
2368.17 * License. When distributing the software, include this License Header
2368.18 * Notice in each file and include the License file at
2368.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2368.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2368.21 * particular file as subject to the "Classpath" exception as provided
2368.22 - * by Sun in the GPL Version 2 section of the License file that
2368.23 + * by Oracle in the GPL Version 2 section of the License file that
2368.24 * accompanied this code. If applicable, add the following below the
2368.25 * License Header, with the fields enclosed by brackets [] replaced by
2368.26 * your own identifying information:
2369.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MarkupBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2369.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MarkupBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2369.3 @@ -1,7 +1,10 @@
2369.4 /*
2369.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2369.6 *
2369.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2369.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2369.9 + *
2369.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2369.11 + * Other names may be trademarks of their respective owners.
2369.12 *
2369.13 * The contents of this file are subject to the terms of either the GNU
2369.14 * General Public License Version 2 only ("GPL") or the Common
2369.15 @@ -13,9 +16,9 @@
2369.16 * specific language governing permissions and limitations under the
2369.17 * License. When distributing the software, include this License Header
2369.18 * Notice in each file and include the License file at
2369.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2369.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2369.21 * particular file as subject to the "Classpath" exception as provided
2369.22 - * by Sun in the GPL Version 2 section of the License file that
2369.23 + * by Oracle in the GPL Version 2 section of the License file that
2369.24 * accompanied this code. If applicable, add the following below the
2369.25 * License Header, with the fields enclosed by brackets [] replaced by
2369.26 * your own identifying information:
2370.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MarkupBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2370.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MarkupBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2370.3 @@ -2,7 +2,10 @@
2370.4 /*
2370.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2370.6 *
2370.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2370.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2370.9 + *
2370.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2370.11 + * Other names may be trademarks of their respective owners.
2370.12 *
2370.13 * The contents of this file are subject to the terms of either the GNU
2370.14 * General Public License Version 2 only ("GPL") or the Common
2370.15 @@ -14,9 +17,9 @@
2370.16 * specific language governing permissions and limitations under the
2370.17 * License. When distributing the software, include this License Header
2370.18 * Notice in each file and include the License file at
2370.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2370.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2370.21 * particular file as subject to the "Classpath" exception as provided
2370.22 - * by Sun in the GPL Version 2 section of the License file that
2370.23 + * by Oracle in the GPL Version 2 section of the License file that
2370.24 * accompanied this code. If applicable, add the following below the
2370.25 * License Header, with the fields enclosed by brackets [] replaced by
2370.26 * your own identifying information:
2371.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2371.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2371.3 @@ -1,7 +1,10 @@
2371.4 /*
2371.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2371.6 *
2371.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2371.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2371.9 + *
2371.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2371.11 + * Other names may be trademarks of their respective owners.
2371.12 *
2371.13 * The contents of this file are subject to the terms of either the GNU
2371.14 * General Public License Version 2 only ("GPL") or the Common
2371.15 @@ -13,9 +16,9 @@
2371.16 * specific language governing permissions and limitations under the
2371.17 * License. When distributing the software, include this License Header
2371.18 * Notice in each file and include the License file at
2371.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2371.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2371.21 * particular file as subject to the "Classpath" exception as provided
2371.22 - * by Sun in the GPL Version 2 section of the License file that
2371.23 + * by Oracle in the GPL Version 2 section of the License file that
2371.24 * accompanied this code. If applicable, add the following below the
2371.25 * License Header, with the fields enclosed by brackets [] replaced by
2371.26 * your own identifying information:
2372.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2372.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2372.3 @@ -2,7 +2,10 @@
2372.4 /*
2372.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2372.6 *
2372.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2372.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2372.9 + *
2372.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2372.11 + * Other names may be trademarks of their respective owners.
2372.12 *
2372.13 * The contents of this file are subject to the terms of either the GNU
2372.14 * General Public License Version 2 only ("GPL") or the Common
2372.15 @@ -14,9 +17,9 @@
2372.16 * specific language governing permissions and limitations under the
2372.17 * License. When distributing the software, include this License Header
2372.18 * Notice in each file and include the License file at
2372.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2372.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2372.21 * particular file as subject to the "Classpath" exception as provided
2372.22 - * by Sun in the GPL Version 2 section of the License file that
2372.23 + * by Oracle in the GPL Version 2 section of the License file that
2372.24 * accompanied this code. If applicable, add the following below the
2372.25 * License Header, with the fields enclosed by brackets [] replaced by
2372.26 * your own identifying information:
2373.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2373.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2373.3 @@ -1,7 +1,10 @@
2373.4 /*
2373.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2373.6 *
2373.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2373.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2373.9 + *
2373.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2373.11 + * Other names may be trademarks of their respective owners.
2373.12 *
2373.13 * The contents of this file are subject to the terms of either the GNU
2373.14 * General Public License Version 2 only ("GPL") or the Common
2373.15 @@ -13,9 +16,9 @@
2373.16 * specific language governing permissions and limitations under the
2373.17 * License. When distributing the software, include this License Header
2373.18 * Notice in each file and include the License file at
2373.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2373.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2373.21 * particular file as subject to the "Classpath" exception as provided
2373.22 - * by Sun in the GPL Version 2 section of the License file that
2373.23 + * by Oracle in the GPL Version 2 section of the License file that
2373.24 * accompanied this code. If applicable, add the following below the
2373.25 * License Header, with the fields enclosed by brackets [] replaced by
2373.26 * your own identifying information:
2374.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageGroupBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2374.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageGroupBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2374.3 @@ -1,7 +1,10 @@
2374.4 /*
2374.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2374.6 *
2374.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2374.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2374.9 + *
2374.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2374.11 + * Other names may be trademarks of their respective owners.
2374.12 *
2374.13 * The contents of this file are subject to the terms of either the GNU
2374.14 * General Public License Version 2 only ("GPL") or the Common
2374.15 @@ -13,9 +16,9 @@
2374.16 * specific language governing permissions and limitations under the
2374.17 * License. When distributing the software, include this License Header
2374.18 * Notice in each file and include the License file at
2374.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2374.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2374.21 * particular file as subject to the "Classpath" exception as provided
2374.22 - * by Sun in the GPL Version 2 section of the License file that
2374.23 + * by Oracle in the GPL Version 2 section of the License file that
2374.24 * accompanied this code. If applicable, add the following below the
2374.25 * License Header, with the fields enclosed by brackets [] replaced by
2374.26 * your own identifying information:
2375.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageGroupBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2375.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageGroupBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2375.3 @@ -2,7 +2,10 @@
2375.4 /*
2375.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2375.6 *
2375.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2375.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2375.9 + *
2375.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2375.11 + * Other names may be trademarks of their respective owners.
2375.12 *
2375.13 * The contents of this file are subject to the terms of either the GNU
2375.14 * General Public License Version 2 only ("GPL") or the Common
2375.15 @@ -14,9 +17,9 @@
2375.16 * specific language governing permissions and limitations under the
2375.17 * License. When distributing the software, include this License Header
2375.18 * Notice in each file and include the License file at
2375.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2375.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2375.21 * particular file as subject to the "Classpath" exception as provided
2375.22 - * by Sun in the GPL Version 2 section of the License file that
2375.23 + * by Oracle in the GPL Version 2 section of the License file that
2375.24 * accompanied this code. If applicable, add the following below the
2375.25 * License Header, with the fields enclosed by brackets [] replaced by
2375.26 * your own identifying information:
2376.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageGroupDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2376.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MessageGroupDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2376.3 @@ -1,7 +1,10 @@
2376.4 /*
2376.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2376.6 *
2376.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2376.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2376.9 + *
2376.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2376.11 + * Other names may be trademarks of their respective owners.
2376.12 *
2376.13 * The contents of this file are subject to the terms of either the GNU
2376.14 * General Public License Version 2 only ("GPL") or the Common
2376.15 @@ -13,9 +16,9 @@
2376.16 * specific language governing permissions and limitations under the
2376.17 * License. When distributing the software, include this License Header
2376.18 * Notice in each file and include the License file at
2376.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2376.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2376.21 * particular file as subject to the "Classpath" exception as provided
2376.22 - * by Sun in the GPL Version 2 section of the License file that
2376.23 + * by Oracle in the GPL Version 2 section of the License file that
2376.24 * accompanied this code. If applicable, add the following below the
2376.25 * License Header, with the fields enclosed by brackets [] replaced by
2376.26 * your own identifying information:
2377.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MetaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2377.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MetaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2377.3 @@ -1,7 +1,10 @@
2377.4 /*
2377.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2377.6 *
2377.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2377.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2377.9 + *
2377.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2377.11 + * Other names may be trademarks of their respective owners.
2377.12 *
2377.13 * The contents of this file are subject to the terms of either the GNU
2377.14 * General Public License Version 2 only ("GPL") or the Common
2377.15 @@ -13,9 +16,9 @@
2377.16 * specific language governing permissions and limitations under the
2377.17 * License. When distributing the software, include this License Header
2377.18 * Notice in each file and include the License file at
2377.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2377.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2377.21 * particular file as subject to the "Classpath" exception as provided
2377.22 - * by Sun in the GPL Version 2 section of the License file that
2377.23 + * by Oracle in the GPL Version 2 section of the License file that
2377.24 * accompanied this code. If applicable, add the following below the
2377.25 * License Header, with the fields enclosed by brackets [] replaced by
2377.26 * your own identifying information:
2378.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MetaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2378.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/MetaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2378.3 @@ -2,7 +2,10 @@
2378.4 /*
2378.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2378.6 *
2378.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2378.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2378.9 + *
2378.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2378.11 + * Other names may be trademarks of their respective owners.
2378.12 *
2378.13 * The contents of this file are subject to the terms of either the GNU
2378.14 * General Public License Version 2 only ("GPL") or the Common
2378.15 @@ -14,9 +17,9 @@
2378.16 * specific language governing permissions and limitations under the
2378.17 * License. When distributing the software, include this License Header
2378.18 * Notice in each file and include the License file at
2378.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2378.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2378.21 * particular file as subject to the "Classpath" exception as provided
2378.22 - * by Sun in the GPL Version 2 section of the License file that
2378.23 + * by Oracle in the GPL Version 2 section of the License file that
2378.24 * accompanied this code. If applicable, add the following below the
2378.25 * License Header, with the fields enclosed by brackets [] replaced by
2378.26 * your own identifying information:
2379.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/OrderableListBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2379.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/OrderableListBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2379.3 @@ -1,7 +1,10 @@
2379.4 /*
2379.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2379.6 *
2379.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2379.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2379.9 + *
2379.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2379.11 + * Other names may be trademarks of their respective owners.
2379.12 *
2379.13 * The contents of this file are subject to the terms of either the GNU
2379.14 * General Public License Version 2 only ("GPL") or the Common
2379.15 @@ -13,9 +16,9 @@
2379.16 * specific language governing permissions and limitations under the
2379.17 * License. When distributing the software, include this License Header
2379.18 * Notice in each file and include the License file at
2379.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2379.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2379.21 * particular file as subject to the "Classpath" exception as provided
2379.22 - * by Sun in the GPL Version 2 section of the License file that
2379.23 + * by Oracle in the GPL Version 2 section of the License file that
2379.24 * accompanied this code. If applicable, add the following below the
2379.25 * License Header, with the fields enclosed by brackets [] replaced by
2379.26 * your own identifying information:
2380.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/OrderableListBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2380.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/OrderableListBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2380.3 @@ -2,7 +2,10 @@
2380.4 /*
2380.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2380.6 *
2380.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2380.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2380.9 + *
2380.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2380.11 + * Other names may be trademarks of their respective owners.
2380.12 *
2380.13 * The contents of this file are subject to the terms of either the GNU
2380.14 * General Public License Version 2 only ("GPL") or the Common
2380.15 @@ -14,9 +17,9 @@
2380.16 * specific language governing permissions and limitations under the
2380.17 * License. When distributing the software, include this License Header
2380.18 * Notice in each file and include the License file at
2380.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2380.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2380.21 * particular file as subject to the "Classpath" exception as provided
2380.22 - * by Sun in the GPL Version 2 section of the License file that
2380.23 + * by Oracle in the GPL Version 2 section of the License file that
2380.24 * accompanied this code. If applicable, add the following below the
2380.25 * License Header, with the fields enclosed by brackets [] replaced by
2380.26 * your own identifying information:
2381.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/OrderableListDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2381.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/OrderableListDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2381.3 @@ -1,7 +1,10 @@
2381.4 /*
2381.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2381.6 *
2381.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2381.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2381.9 + *
2381.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2381.11 + * Other names may be trademarks of their respective owners.
2381.12 *
2381.13 * The contents of this file are subject to the terms of either the GNU
2381.14 * General Public License Version 2 only ("GPL") or the Common
2381.15 @@ -13,9 +16,9 @@
2381.16 * specific language governing permissions and limitations under the
2381.17 * License. When distributing the software, include this License Header
2381.18 * Notice in each file and include the License file at
2381.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2381.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2381.21 * particular file as subject to the "Classpath" exception as provided
2381.22 - * by Sun in the GPL Version 2 section of the License file that
2381.23 + * by Oracle in the GPL Version 2 section of the License file that
2381.24 * accompanied this code. If applicable, add the following below the
2381.25 * License Header, with the fields enclosed by brackets [] replaced by
2381.26 * your own identifying information:
2382.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageAlertBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2382.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageAlertBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2382.3 @@ -1,7 +1,10 @@
2382.4 /*
2382.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2382.6 *
2382.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2382.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2382.9 + *
2382.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2382.11 + * Other names may be trademarks of their respective owners.
2382.12 *
2382.13 * The contents of this file are subject to the terms of either the GNU
2382.14 * General Public License Version 2 only ("GPL") or the Common
2382.15 @@ -13,9 +16,9 @@
2382.16 * specific language governing permissions and limitations under the
2382.17 * License. When distributing the software, include this License Header
2382.18 * Notice in each file and include the License file at
2382.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2382.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2382.21 * particular file as subject to the "Classpath" exception as provided
2382.22 - * by Sun in the GPL Version 2 section of the License file that
2382.23 + * by Oracle in the GPL Version 2 section of the License file that
2382.24 * accompanied this code. If applicable, add the following below the
2382.25 * License Header, with the fields enclosed by brackets [] replaced by
2382.26 * your own identifying information:
2383.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageAlertBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2383.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageAlertBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2383.3 @@ -2,7 +2,10 @@
2383.4 /*
2383.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2383.6 *
2383.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2383.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2383.9 + *
2383.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2383.11 + * Other names may be trademarks of their respective owners.
2383.12 *
2383.13 * The contents of this file are subject to the terms of either the GNU
2383.14 * General Public License Version 2 only ("GPL") or the Common
2383.15 @@ -14,9 +17,9 @@
2383.16 * specific language governing permissions and limitations under the
2383.17 * License. When distributing the software, include this License Header
2383.18 * Notice in each file and include the License file at
2383.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2383.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2383.21 * particular file as subject to the "Classpath" exception as provided
2383.22 - * by Sun in the GPL Version 2 section of the License file that
2383.23 + * by Oracle in the GPL Version 2 section of the License file that
2383.24 * accompanied this code. If applicable, add the following below the
2383.25 * License Header, with the fields enclosed by brackets [] replaced by
2383.26 * your own identifying information:
2384.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageAlertDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2384.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageAlertDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2384.3 @@ -1,7 +1,10 @@
2384.4 /*
2384.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2384.6 *
2384.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2384.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2384.9 + *
2384.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2384.11 + * Other names may be trademarks of their respective owners.
2384.12 *
2384.13 * The contents of this file are subject to the terms of either the GNU
2384.14 * General Public License Version 2 only ("GPL") or the Common
2384.15 @@ -13,9 +16,9 @@
2384.16 * specific language governing permissions and limitations under the
2384.17 * License. When distributing the software, include this License Header
2384.18 * Notice in each file and include the License file at
2384.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2384.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2384.21 * particular file as subject to the "Classpath" exception as provided
2384.22 - * by Sun in the GPL Version 2 section of the License file that
2384.23 + * by Oracle in the GPL Version 2 section of the License file that
2384.24 * accompanied this code. If applicable, add the following below the
2384.25 * License Header, with the fields enclosed by brackets [] replaced by
2384.26 * your own identifying information:
2385.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2385.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2385.3 @@ -1,7 +1,10 @@
2385.4 /*
2385.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2385.6 *
2385.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2385.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2385.9 + *
2385.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2385.11 + * Other names may be trademarks of their respective owners.
2385.12 *
2385.13 * The contents of this file are subject to the terms of either the GNU
2385.14 * General Public License Version 2 only ("GPL") or the Common
2385.15 @@ -13,9 +16,9 @@
2385.16 * specific language governing permissions and limitations under the
2385.17 * License. When distributing the software, include this License Header
2385.18 * Notice in each file and include the License file at
2385.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2385.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2385.21 * particular file as subject to the "Classpath" exception as provided
2385.22 - * by Sun in the GPL Version 2 section of the License file that
2385.23 + * by Oracle in the GPL Version 2 section of the License file that
2385.24 * accompanied this code. If applicable, add the following below the
2385.25 * License Header, with the fields enclosed by brackets [] replaced by
2385.26 * your own identifying information:
2386.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2386.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2386.3 @@ -2,7 +2,10 @@
2386.4 /*
2386.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2386.6 *
2386.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2386.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2386.9 + *
2386.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2386.11 + * Other names may be trademarks of their respective owners.
2386.12 *
2386.13 * The contents of this file are subject to the terms of either the GNU
2386.14 * General Public License Version 2 only ("GPL") or the Common
2386.15 @@ -14,9 +17,9 @@
2386.16 * specific language governing permissions and limitations under the
2386.17 * License. When distributing the software, include this License Header
2386.18 * Notice in each file and include the License file at
2386.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2386.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2386.21 * particular file as subject to the "Classpath" exception as provided
2386.22 - * by Sun in the GPL Version 2 section of the License file that
2386.23 + * by Oracle in the GPL Version 2 section of the License file that
2386.24 * accompanied this code. If applicable, add the following below the
2386.25 * License Header, with the fields enclosed by brackets [] replaced by
2386.26 * your own identifying information:
2387.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageSeparatorBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2387.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageSeparatorBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2387.3 @@ -1,7 +1,10 @@
2387.4 /*
2387.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2387.6 *
2387.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2387.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2387.9 + *
2387.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2387.11 + * Other names may be trademarks of their respective owners.
2387.12 *
2387.13 * The contents of this file are subject to the terms of either the GNU
2387.14 * General Public License Version 2 only ("GPL") or the Common
2387.15 @@ -13,9 +16,9 @@
2387.16 * specific language governing permissions and limitations under the
2387.17 * License. When distributing the software, include this License Header
2387.18 * Notice in each file and include the License file at
2387.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2387.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2387.21 * particular file as subject to the "Classpath" exception as provided
2387.22 - * by Sun in the GPL Version 2 section of the License file that
2387.23 + * by Oracle in the GPL Version 2 section of the License file that
2387.24 * accompanied this code. If applicable, add the following below the
2387.25 * License Header, with the fields enclosed by brackets [] replaced by
2387.26 * your own identifying information:
2388.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageSeparatorBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2388.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageSeparatorBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2388.3 @@ -2,7 +2,10 @@
2388.4 /*
2388.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2388.6 *
2388.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2388.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2388.9 + *
2388.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2388.11 + * Other names may be trademarks of their respective owners.
2388.12 *
2388.13 * The contents of this file are subject to the terms of either the GNU
2388.14 * General Public License Version 2 only ("GPL") or the Common
2388.15 @@ -14,9 +17,9 @@
2388.16 * specific language governing permissions and limitations under the
2388.17 * License. When distributing the software, include this License Header
2388.18 * Notice in each file and include the License file at
2388.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2388.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2388.21 * particular file as subject to the "Classpath" exception as provided
2388.22 - * by Sun in the GPL Version 2 section of the License file that
2388.23 + * by Oracle in the GPL Version 2 section of the License file that
2388.24 * accompanied this code. If applicable, add the following below the
2388.25 * License Header, with the fields enclosed by brackets [] replaced by
2388.26 * your own identifying information:
2389.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageSeparatorDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2389.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PageSeparatorDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2389.3 @@ -1,7 +1,10 @@
2389.4 /*
2389.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2389.6 *
2389.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2389.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2389.9 + *
2389.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2389.11 + * Other names may be trademarks of their respective owners.
2389.12 *
2389.13 * The contents of this file are subject to the terms of either the GNU
2389.14 * General Public License Version 2 only ("GPL") or the Common
2389.15 @@ -13,9 +16,9 @@
2389.16 * specific language governing permissions and limitations under the
2389.17 * License. When distributing the software, include this License Header
2389.18 * Notice in each file and include the License file at
2389.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2389.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2389.21 * particular file as subject to the "Classpath" exception as provided
2389.22 - * by Sun in the GPL Version 2 section of the License file that
2389.23 + * by Oracle in the GPL Version 2 section of the License file that
2389.24 * accompanied this code. If applicable, add the following below the
2389.25 * License Header, with the fields enclosed by brackets [] replaced by
2389.26 * your own identifying information:
2390.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelGroupBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2390.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelGroupBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2390.3 @@ -1,7 +1,10 @@
2390.4 /*
2390.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2390.6 *
2390.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2390.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2390.9 + *
2390.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2390.11 + * Other names may be trademarks of their respective owners.
2390.12 *
2390.13 * The contents of this file are subject to the terms of either the GNU
2390.14 * General Public License Version 2 only ("GPL") or the Common
2390.15 @@ -13,9 +16,9 @@
2390.16 * specific language governing permissions and limitations under the
2390.17 * License. When distributing the software, include this License Header
2390.18 * Notice in each file and include the License file at
2390.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2390.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2390.21 * particular file as subject to the "Classpath" exception as provided
2390.22 - * by Sun in the GPL Version 2 section of the License file that
2390.23 + * by Oracle in the GPL Version 2 section of the License file that
2390.24 * accompanied this code. If applicable, add the following below the
2390.25 * License Header, with the fields enclosed by brackets [] replaced by
2390.26 * your own identifying information:
2391.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelGroupBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2391.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelGroupBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2391.3 @@ -2,7 +2,10 @@
2391.4 /*
2391.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2391.6 *
2391.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2391.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2391.9 + *
2391.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2391.11 + * Other names may be trademarks of their respective owners.
2391.12 *
2391.13 * The contents of this file are subject to the terms of either the GNU
2391.14 * General Public License Version 2 only ("GPL") or the Common
2391.15 @@ -14,9 +17,9 @@
2391.16 * specific language governing permissions and limitations under the
2391.17 * License. When distributing the software, include this License Header
2391.18 * Notice in each file and include the License file at
2391.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2391.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2391.21 * particular file as subject to the "Classpath" exception as provided
2391.22 - * by Sun in the GPL Version 2 section of the License file that
2391.23 + * by Oracle in the GPL Version 2 section of the License file that
2391.24 * accompanied this code. If applicable, add the following below the
2391.25 * License Header, with the fields enclosed by brackets [] replaced by
2391.26 * your own identifying information:
2392.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelGroupDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2392.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelGroupDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2392.3 @@ -1,7 +1,10 @@
2392.4 /*
2392.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2392.6 *
2392.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2392.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2392.9 + *
2392.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2392.11 + * Other names may be trademarks of their respective owners.
2392.12 *
2392.13 * The contents of this file are subject to the terms of either the GNU
2392.14 * General Public License Version 2 only ("GPL") or the Common
2392.15 @@ -13,9 +16,9 @@
2392.16 * specific language governing permissions and limitations under the
2392.17 * License. When distributing the software, include this License Header
2392.18 * Notice in each file and include the License file at
2392.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2392.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2392.21 * particular file as subject to the "Classpath" exception as provided
2392.22 - * by Sun in the GPL Version 2 section of the License file that
2392.23 + * by Oracle in the GPL Version 2 section of the License file that
2392.24 * accompanied this code. If applicable, add the following below the
2392.25 * License Header, with the fields enclosed by brackets [] replaced by
2392.26 * your own identifying information:
2393.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelLayoutBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2393.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelLayoutBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2393.3 @@ -1,7 +1,10 @@
2393.4 /*
2393.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2393.6 *
2393.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2393.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2393.9 + *
2393.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2393.11 + * Other names may be trademarks of their respective owners.
2393.12 *
2393.13 * The contents of this file are subject to the terms of either the GNU
2393.14 * General Public License Version 2 only ("GPL") or the Common
2393.15 @@ -13,9 +16,9 @@
2393.16 * specific language governing permissions and limitations under the
2393.17 * License. When distributing the software, include this License Header
2393.18 * Notice in each file and include the License file at
2393.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2393.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2393.21 * particular file as subject to the "Classpath" exception as provided
2393.22 - * by Sun in the GPL Version 2 section of the License file that
2393.23 + * by Oracle in the GPL Version 2 section of the License file that
2393.24 * accompanied this code. If applicable, add the following below the
2393.25 * License Header, with the fields enclosed by brackets [] replaced by
2393.26 * your own identifying information:
2394.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelLayoutBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2394.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelLayoutBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2394.3 @@ -2,7 +2,10 @@
2394.4 /*
2394.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2394.6 *
2394.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2394.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2394.9 + *
2394.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2394.11 + * Other names may be trademarks of their respective owners.
2394.12 *
2394.13 * The contents of this file are subject to the terms of either the GNU
2394.14 * General Public License Version 2 only ("GPL") or the Common
2394.15 @@ -14,9 +17,9 @@
2394.16 * specific language governing permissions and limitations under the
2394.17 * License. When distributing the software, include this License Header
2394.18 * Notice in each file and include the License file at
2394.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2394.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2394.21 * particular file as subject to the "Classpath" exception as provided
2394.22 - * by Sun in the GPL Version 2 section of the License file that
2394.23 + * by Oracle in the GPL Version 2 section of the License file that
2394.24 * accompanied this code. If applicable, add the following below the
2394.25 * License Header, with the fields enclosed by brackets [] replaced by
2394.26 * your own identifying information:
2395.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelLayoutDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2395.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PanelLayoutDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2395.3 @@ -1,7 +1,10 @@
2395.4 /*
2395.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2395.6 *
2395.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2395.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2395.9 + *
2395.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2395.11 + * Other names may be trademarks of their respective owners.
2395.12 *
2395.13 * The contents of this file are subject to the terms of either the GNU
2395.14 * General Public License Version 2 only ("GPL") or the Common
2395.15 @@ -13,9 +16,9 @@
2395.16 * specific language governing permissions and limitations under the
2395.17 * License. When distributing the software, include this License Header
2395.18 * Notice in each file and include the License file at
2395.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2395.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2395.21 * particular file as subject to the "Classpath" exception as provided
2395.22 - * by Sun in the GPL Version 2 section of the License file that
2395.23 + * by Oracle in the GPL Version 2 section of the License file that
2395.24 * accompanied this code. If applicable, add the following below the
2395.25 * License Header, with the fields enclosed by brackets [] replaced by
2395.26 * your own identifying information:
2396.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PasswordFieldBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2396.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PasswordFieldBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2396.3 @@ -1,7 +1,10 @@
2396.4 /*
2396.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2396.6 *
2396.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2396.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2396.9 + *
2396.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2396.11 + * Other names may be trademarks of their respective owners.
2396.12 *
2396.13 * The contents of this file are subject to the terms of either the GNU
2396.14 * General Public License Version 2 only ("GPL") or the Common
2396.15 @@ -13,9 +16,9 @@
2396.16 * specific language governing permissions and limitations under the
2396.17 * License. When distributing the software, include this License Header
2396.18 * Notice in each file and include the License file at
2396.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2396.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2396.21 * particular file as subject to the "Classpath" exception as provided
2396.22 - * by Sun in the GPL Version 2 section of the License file that
2396.23 + * by Oracle in the GPL Version 2 section of the License file that
2396.24 * accompanied this code. If applicable, add the following below the
2396.25 * License Header, with the fields enclosed by brackets [] replaced by
2396.26 * your own identifying information:
2397.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PasswordFieldBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2397.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PasswordFieldBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2397.3 @@ -2,7 +2,10 @@
2397.4 /*
2397.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2397.6 *
2397.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2397.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2397.9 + *
2397.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2397.11 + * Other names may be trademarks of their respective owners.
2397.12 *
2397.13 * The contents of this file are subject to the terms of either the GNU
2397.14 * General Public License Version 2 only ("GPL") or the Common
2397.15 @@ -14,9 +17,9 @@
2397.16 * specific language governing permissions and limitations under the
2397.17 * License. When distributing the software, include this License Header
2397.18 * Notice in each file and include the License file at
2397.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2397.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2397.21 * particular file as subject to the "Classpath" exception as provided
2397.22 - * by Sun in the GPL Version 2 section of the License file that
2397.23 + * by Oracle in the GPL Version 2 section of the License file that
2397.24 * accompanied this code. If applicable, add the following below the
2397.25 * License Header, with the fields enclosed by brackets [] replaced by
2397.26 * your own identifying information:
2398.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PasswordFieldDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2398.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PasswordFieldDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2398.3 @@ -1,7 +1,10 @@
2398.4 /*
2398.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2398.6 *
2398.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2398.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2398.9 + *
2398.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2398.11 + * Other names may be trademarks of their respective owners.
2398.12 *
2398.13 * The contents of this file are subject to the terms of either the GNU
2398.14 * General Public License Version 2 only ("GPL") or the Common
2398.15 @@ -13,9 +16,9 @@
2398.16 * specific language governing permissions and limitations under the
2398.17 * License. When distributing the software, include this License Header
2398.18 * Notice in each file and include the License file at
2398.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2398.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2398.21 * particular file as subject to the "Classpath" exception as provided
2398.22 - * by Sun in the GPL Version 2 section of the License file that
2398.23 + * by Oracle in the GPL Version 2 section of the License file that
2398.24 * accompanied this code. If applicable, add the following below the
2398.25 * License Header, with the fields enclosed by brackets [] replaced by
2398.26 * your own identifying information:
2399.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertyBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2399.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertyBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2399.3 @@ -1,7 +1,10 @@
2399.4 /*
2399.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2399.6 *
2399.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2399.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2399.9 + *
2399.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2399.11 + * Other names may be trademarks of their respective owners.
2399.12 *
2399.13 * The contents of this file are subject to the terms of either the GNU
2399.14 * General Public License Version 2 only ("GPL") or the Common
2399.15 @@ -13,9 +16,9 @@
2399.16 * specific language governing permissions and limitations under the
2399.17 * License. When distributing the software, include this License Header
2399.18 * Notice in each file and include the License file at
2399.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2399.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2399.21 * particular file as subject to the "Classpath" exception as provided
2399.22 - * by Sun in the GPL Version 2 section of the License file that
2399.23 + * by Oracle in the GPL Version 2 section of the License file that
2399.24 * accompanied this code. If applicable, add the following below the
2399.25 * License Header, with the fields enclosed by brackets [] replaced by
2399.26 * your own identifying information:
2400.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertyBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2400.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertyBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2400.3 @@ -2,7 +2,10 @@
2400.4 /*
2400.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2400.6 *
2400.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2400.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2400.9 + *
2400.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2400.11 + * Other names may be trademarks of their respective owners.
2400.12 *
2400.13 * The contents of this file are subject to the terms of either the GNU
2400.14 * General Public License Version 2 only ("GPL") or the Common
2400.15 @@ -14,9 +17,9 @@
2400.16 * specific language governing permissions and limitations under the
2400.17 * License. When distributing the software, include this License Header
2400.18 * Notice in each file and include the License file at
2400.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2400.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2400.21 * particular file as subject to the "Classpath" exception as provided
2400.22 - * by Sun in the GPL Version 2 section of the License file that
2400.23 + * by Oracle in the GPL Version 2 section of the License file that
2400.24 * accompanied this code. If applicable, add the following below the
2400.25 * License Header, with the fields enclosed by brackets [] replaced by
2400.26 * your own identifying information:
2401.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertyDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2401.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertyDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2401.3 @@ -1,7 +1,10 @@
2401.4 /*
2401.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2401.6 *
2401.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2401.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2401.9 + *
2401.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2401.11 + * Other names may be trademarks of their respective owners.
2401.12 *
2401.13 * The contents of this file are subject to the terms of either the GNU
2401.14 * General Public License Version 2 only ("GPL") or the Common
2401.15 @@ -13,9 +16,9 @@
2401.16 * specific language governing permissions and limitations under the
2401.17 * License. When distributing the software, include this License Header
2401.18 * Notice in each file and include the License file at
2401.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2401.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2401.21 * particular file as subject to the "Classpath" exception as provided
2401.22 - * by Sun in the GPL Version 2 section of the License file that
2401.23 + * by Oracle in the GPL Version 2 section of the License file that
2401.24 * accompanied this code. If applicable, add the following below the
2401.25 * License Header, with the fields enclosed by brackets [] replaced by
2401.26 * your own identifying information:
2402.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2402.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2402.3 @@ -1,7 +1,10 @@
2402.4 /*
2402.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2402.6 *
2402.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2402.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2402.9 + *
2402.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2402.11 + * Other names may be trademarks of their respective owners.
2402.12 *
2402.13 * The contents of this file are subject to the terms of either the GNU
2402.14 * General Public License Version 2 only ("GPL") or the Common
2402.15 @@ -13,9 +16,9 @@
2402.16 * specific language governing permissions and limitations under the
2402.17 * License. When distributing the software, include this License Header
2402.18 * Notice in each file and include the License file at
2402.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2402.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2402.21 * particular file as subject to the "Classpath" exception as provided
2402.22 - * by Sun in the GPL Version 2 section of the License file that
2402.23 + * by Oracle in the GPL Version 2 section of the License file that
2402.24 * accompanied this code. If applicable, add the following below the
2402.25 * License Header, with the fields enclosed by brackets [] replaced by
2402.26 * your own identifying information:
2403.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2403.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2403.3 @@ -2,7 +2,10 @@
2403.4 /*
2403.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2403.6 *
2403.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2403.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2403.9 + *
2403.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2403.11 + * Other names may be trademarks of their respective owners.
2403.12 *
2403.13 * The contents of this file are subject to the terms of either the GNU
2403.14 * General Public License Version 2 only ("GPL") or the Common
2403.15 @@ -14,9 +17,9 @@
2403.16 * specific language governing permissions and limitations under the
2403.17 * License. When distributing the software, include this License Header
2403.18 * Notice in each file and include the License file at
2403.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2403.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2403.21 * particular file as subject to the "Classpath" exception as provided
2403.22 - * by Sun in the GPL Version 2 section of the License file that
2403.23 + * by Oracle in the GPL Version 2 section of the License file that
2403.24 * accompanied this code. If applicable, add the following below the
2403.25 * License Header, with the fields enclosed by brackets [] replaced by
2403.26 * your own identifying information:
2404.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2404.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2404.3 @@ -1,7 +1,10 @@
2404.4 /*
2404.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2404.6 *
2404.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2404.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2404.9 + *
2404.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2404.11 + * Other names may be trademarks of their respective owners.
2404.12 *
2404.13 * The contents of this file are subject to the terms of either the GNU
2404.14 * General Public License Version 2 only ("GPL") or the Common
2404.15 @@ -13,9 +16,9 @@
2404.16 * specific language governing permissions and limitations under the
2404.17 * License. When distributing the software, include this License Header
2404.18 * Notice in each file and include the License file at
2404.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2404.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2404.21 * particular file as subject to the "Classpath" exception as provided
2404.22 - * by Sun in the GPL Version 2 section of the License file that
2404.23 + * by Oracle in the GPL Version 2 section of the License file that
2404.24 * accompanied this code. If applicable, add the following below the
2404.25 * License Header, with the fields enclosed by brackets [] replaced by
2404.26 * your own identifying information:
2405.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetSectionBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2405.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetSectionBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2405.3 @@ -1,7 +1,10 @@
2405.4 /*
2405.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2405.6 *
2405.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2405.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2405.9 + *
2405.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2405.11 + * Other names may be trademarks of their respective owners.
2405.12 *
2405.13 * The contents of this file are subject to the terms of either the GNU
2405.14 * General Public License Version 2 only ("GPL") or the Common
2405.15 @@ -13,9 +16,9 @@
2405.16 * specific language governing permissions and limitations under the
2405.17 * License. When distributing the software, include this License Header
2405.18 * Notice in each file and include the License file at
2405.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2405.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2405.21 * particular file as subject to the "Classpath" exception as provided
2405.22 - * by Sun in the GPL Version 2 section of the License file that
2405.23 + * by Oracle in the GPL Version 2 section of the License file that
2405.24 * accompanied this code. If applicable, add the following below the
2405.25 * License Header, with the fields enclosed by brackets [] replaced by
2405.26 * your own identifying information:
2406.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetSectionBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2406.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetSectionBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2406.3 @@ -2,7 +2,10 @@
2406.4 /*
2406.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2406.6 *
2406.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2406.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2406.9 + *
2406.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2406.11 + * Other names may be trademarks of their respective owners.
2406.12 *
2406.13 * The contents of this file are subject to the terms of either the GNU
2406.14 * General Public License Version 2 only ("GPL") or the Common
2406.15 @@ -14,9 +17,9 @@
2406.16 * specific language governing permissions and limitations under the
2406.17 * License. When distributing the software, include this License Header
2406.18 * Notice in each file and include the License file at
2406.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2406.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2406.21 * particular file as subject to the "Classpath" exception as provided
2406.22 - * by Sun in the GPL Version 2 section of the License file that
2406.23 + * by Oracle in the GPL Version 2 section of the License file that
2406.24 * accompanied this code. If applicable, add the following below the
2406.25 * License Header, with the fields enclosed by brackets [] replaced by
2406.26 * your own identifying information:
2407.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetSectionDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2407.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/PropertySheetSectionDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2407.3 @@ -1,7 +1,10 @@
2407.4 /*
2407.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2407.6 *
2407.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2407.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2407.9 + *
2407.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2407.11 + * Other names may be trademarks of their respective owners.
2407.12 *
2407.13 * The contents of this file are subject to the terms of either the GNU
2407.14 * General Public License Version 2 only ("GPL") or the Common
2407.15 @@ -13,9 +16,9 @@
2407.16 * specific language governing permissions and limitations under the
2407.17 * License. When distributing the software, include this License Header
2407.18 * Notice in each file and include the License file at
2407.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2407.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2407.21 * particular file as subject to the "Classpath" exception as provided
2407.22 - * by Sun in the GPL Version 2 section of the License file that
2407.23 + * by Oracle in the GPL Version 2 section of the License file that
2407.24 * accompanied this code. If applicable, add the following below the
2407.25 * License Header, with the fields enclosed by brackets [] replaced by
2407.26 * your own identifying information:
2408.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2408.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2408.3 @@ -1,7 +1,10 @@
2408.4 /*
2408.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2408.6 *
2408.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2408.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2408.9 + *
2408.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2408.11 + * Other names may be trademarks of their respective owners.
2408.12 *
2408.13 * The contents of this file are subject to the terms of either the GNU
2408.14 * General Public License Version 2 only ("GPL") or the Common
2408.15 @@ -13,9 +16,9 @@
2408.16 * specific language governing permissions and limitations under the
2408.17 * License. When distributing the software, include this License Header
2408.18 * Notice in each file and include the License file at
2408.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2408.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2408.21 * particular file as subject to the "Classpath" exception as provided
2408.22 - * by Sun in the GPL Version 2 section of the License file that
2408.23 + * by Oracle in the GPL Version 2 section of the License file that
2408.24 * accompanied this code. If applicable, add the following below the
2408.25 * License Header, with the fields enclosed by brackets [] replaced by
2408.26 * your own identifying information:
2409.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2409.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2409.3 @@ -2,7 +2,10 @@
2409.4 /*
2409.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2409.6 *
2409.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2409.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2409.9 + *
2409.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2409.11 + * Other names may be trademarks of their respective owners.
2409.12 *
2409.13 * The contents of this file are subject to the terms of either the GNU
2409.14 * General Public License Version 2 only ("GPL") or the Common
2409.15 @@ -14,9 +17,9 @@
2409.16 * specific language governing permissions and limitations under the
2409.17 * License. When distributing the software, include this License Header
2409.18 * Notice in each file and include the License file at
2409.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2409.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2409.21 * particular file as subject to the "Classpath" exception as provided
2409.22 - * by Sun in the GPL Version 2 section of the License file that
2409.23 + * by Oracle in the GPL Version 2 section of the License file that
2409.24 * accompanied this code. If applicable, add the following below the
2409.25 * License Header, with the fields enclosed by brackets [] replaced by
2409.26 * your own identifying information:
2410.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2410.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2410.3 @@ -1,7 +1,10 @@
2410.4 /*
2410.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2410.6 *
2410.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2410.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2410.9 + *
2410.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2410.11 + * Other names may be trademarks of their respective owners.
2410.12 *
2410.13 * The contents of this file are subject to the terms of either the GNU
2410.14 * General Public License Version 2 only ("GPL") or the Common
2410.15 @@ -13,9 +16,9 @@
2410.16 * specific language governing permissions and limitations under the
2410.17 * License. When distributing the software, include this License Header
2410.18 * Notice in each file and include the License file at
2410.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2410.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2410.21 * particular file as subject to the "Classpath" exception as provided
2410.22 - * by Sun in the GPL Version 2 section of the License file that
2410.23 + * by Oracle in the GPL Version 2 section of the License file that
2410.24 * accompanied this code. If applicable, add the following below the
2410.25 * License Header, with the fields enclosed by brackets [] replaced by
2410.26 * your own identifying information:
2411.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonGroupBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2411.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonGroupBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2411.3 @@ -1,7 +1,10 @@
2411.4 /*
2411.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2411.6 *
2411.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2411.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2411.9 + *
2411.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2411.11 + * Other names may be trademarks of their respective owners.
2411.12 *
2411.13 * The contents of this file are subject to the terms of either the GNU
2411.14 * General Public License Version 2 only ("GPL") or the Common
2411.15 @@ -13,9 +16,9 @@
2411.16 * specific language governing permissions and limitations under the
2411.17 * License. When distributing the software, include this License Header
2411.18 * Notice in each file and include the License file at
2411.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2411.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2411.21 * particular file as subject to the "Classpath" exception as provided
2411.22 - * by Sun in the GPL Version 2 section of the License file that
2411.23 + * by Oracle in the GPL Version 2 section of the License file that
2411.24 * accompanied this code. If applicable, add the following below the
2411.25 * License Header, with the fields enclosed by brackets [] replaced by
2411.26 * your own identifying information:
2412.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonGroupBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2412.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonGroupBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2412.3 @@ -2,7 +2,10 @@
2412.4 /*
2412.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2412.6 *
2412.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2412.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2412.9 + *
2412.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2412.11 + * Other names may be trademarks of their respective owners.
2412.12 *
2412.13 * The contents of this file are subject to the terms of either the GNU
2412.14 * General Public License Version 2 only ("GPL") or the Common
2412.15 @@ -14,9 +17,9 @@
2412.16 * specific language governing permissions and limitations under the
2412.17 * License. When distributing the software, include this License Header
2412.18 * Notice in each file and include the License file at
2412.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2412.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2412.21 * particular file as subject to the "Classpath" exception as provided
2412.22 - * by Sun in the GPL Version 2 section of the License file that
2412.23 + * by Oracle in the GPL Version 2 section of the License file that
2412.24 * accompanied this code. If applicable, add the following below the
2412.25 * License Header, with the fields enclosed by brackets [] replaced by
2412.26 * your own identifying information:
2413.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonGroupDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2413.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RadioButtonGroupDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2413.3 @@ -1,7 +1,10 @@
2413.4 /*
2413.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2413.6 *
2413.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2413.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2413.9 + *
2413.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2413.11 + * Other names may be trademarks of their respective owners.
2413.12 *
2413.13 * The contents of this file are subject to the terms of either the GNU
2413.14 * General Public License Version 2 only ("GPL") or the Common
2413.15 @@ -13,9 +16,9 @@
2413.16 * specific language governing permissions and limitations under the
2413.17 * License. When distributing the software, include this License Header
2413.18 * Notice in each file and include the License file at
2413.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2413.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2413.21 * particular file as subject to the "Classpath" exception as provided
2413.22 - * by Sun in the GPL Version 2 section of the License file that
2413.23 + * by Oracle in the GPL Version 2 section of the License file that
2413.24 * accompanied this code. If applicable, add the following below the
2413.25 * License Header, with the fields enclosed by brackets [] replaced by
2413.26 * your own identifying information:
2414.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RbCbSelectorBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2414.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RbCbSelectorBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2414.3 @@ -1,7 +1,10 @@
2414.4 /*
2414.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2414.6 *
2414.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2414.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2414.9 + *
2414.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2414.11 + * Other names may be trademarks of their respective owners.
2414.12 *
2414.13 * The contents of this file are subject to the terms of either the GNU
2414.14 * General Public License Version 2 only ("GPL") or the Common
2414.15 @@ -13,9 +16,9 @@
2414.16 * specific language governing permissions and limitations under the
2414.17 * License. When distributing the software, include this License Header
2414.18 * Notice in each file and include the License file at
2414.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2414.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2414.21 * particular file as subject to the "Classpath" exception as provided
2414.22 - * by Sun in the GPL Version 2 section of the License file that
2414.23 + * by Oracle in the GPL Version 2 section of the License file that
2414.24 * accompanied this code. If applicable, add the following below the
2414.25 * License Header, with the fields enclosed by brackets [] replaced by
2414.26 * your own identifying information:
2415.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RbCbSelectorBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2415.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/RbCbSelectorBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2415.3 @@ -2,7 +2,10 @@
2415.4 /*
2415.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2415.6 *
2415.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2415.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2415.9 + *
2415.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2415.11 + * Other names may be trademarks of their respective owners.
2415.12 *
2415.13 * The contents of this file are subject to the terms of either the GNU
2415.14 * General Public License Version 2 only ("GPL") or the Common
2415.15 @@ -14,9 +17,9 @@
2415.16 * specific language governing permissions and limitations under the
2415.17 * License. When distributing the software, include this License Header
2415.18 * Notice in each file and include the License file at
2415.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2415.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2415.21 * particular file as subject to the "Classpath" exception as provided
2415.22 - * by Sun in the GPL Version 2 section of the License file that
2415.23 + * by Oracle in the GPL Version 2 section of the License file that
2415.24 * accompanied this code. If applicable, add the following below the
2415.25 * License Header, with the fields enclosed by brackets [] replaced by
2415.26 * your own identifying information:
2416.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ScriptBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2416.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ScriptBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2416.3 @@ -1,7 +1,10 @@
2416.4 /*
2416.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2416.6 *
2416.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2416.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2416.9 + *
2416.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2416.11 + * Other names may be trademarks of their respective owners.
2416.12 *
2416.13 * The contents of this file are subject to the terms of either the GNU
2416.14 * General Public License Version 2 only ("GPL") or the Common
2416.15 @@ -13,9 +16,9 @@
2416.16 * specific language governing permissions and limitations under the
2416.17 * License. When distributing the software, include this License Header
2416.18 * Notice in each file and include the License file at
2416.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2416.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2416.21 * particular file as subject to the "Classpath" exception as provided
2416.22 - * by Sun in the GPL Version 2 section of the License file that
2416.23 + * by Oracle in the GPL Version 2 section of the License file that
2416.24 * accompanied this code. If applicable, add the following below the
2416.25 * License Header, with the fields enclosed by brackets [] replaced by
2416.26 * your own identifying information:
2417.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ScriptBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2417.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ScriptBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2417.3 @@ -2,7 +2,10 @@
2417.4 /*
2417.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2417.6 *
2417.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2417.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2417.9 + *
2417.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2417.11 + * Other names may be trademarks of their respective owners.
2417.12 *
2417.13 * The contents of this file are subject to the terms of either the GNU
2417.14 * General Public License Version 2 only ("GPL") or the Common
2417.15 @@ -14,9 +17,9 @@
2417.16 * specific language governing permissions and limitations under the
2417.17 * License. When distributing the software, include this License Header
2417.18 * Notice in each file and include the License file at
2417.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2417.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2417.21 * particular file as subject to the "Classpath" exception as provided
2417.22 - * by Sun in the GPL Version 2 section of the License file that
2417.23 + * by Oracle in the GPL Version 2 section of the License file that
2417.24 * accompanied this code. If applicable, add the following below the
2417.25 * License Header, with the fields enclosed by brackets [] replaced by
2417.26 * your own identifying information:
2418.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/SelectorBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2418.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/SelectorBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2418.3 @@ -1,7 +1,10 @@
2418.4 /*
2418.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2418.6 *
2418.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2418.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2418.9 + *
2418.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2418.11 + * Other names may be trademarks of their respective owners.
2418.12 *
2418.13 * The contents of this file are subject to the terms of either the GNU
2418.14 * General Public License Version 2 only ("GPL") or the Common
2418.15 @@ -13,9 +16,9 @@
2418.16 * specific language governing permissions and limitations under the
2418.17 * License. When distributing the software, include this License Header
2418.18 * Notice in each file and include the License file at
2418.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2418.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2418.21 * particular file as subject to the "Classpath" exception as provided
2418.22 - * by Sun in the GPL Version 2 section of the License file that
2418.23 + * by Oracle in the GPL Version 2 section of the License file that
2418.24 * accompanied this code. If applicable, add the following below the
2418.25 * License Header, with the fields enclosed by brackets [] replaced by
2418.26 * your own identifying information:
2419.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/SelectorBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2419.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/SelectorBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2419.3 @@ -2,7 +2,10 @@
2419.4 /*
2419.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2419.6 *
2419.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2419.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2419.9 + *
2419.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2419.11 + * Other names may be trademarks of their respective owners.
2419.12 *
2419.13 * The contents of this file are subject to the terms of either the GNU
2419.14 * General Public License Version 2 only ("GPL") or the Common
2419.15 @@ -14,9 +17,9 @@
2419.16 * specific language governing permissions and limitations under the
2419.17 * License. When distributing the software, include this License Header
2419.18 * Notice in each file and include the License file at
2419.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2419.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2419.21 * particular file as subject to the "Classpath" exception as provided
2419.22 - * by Sun in the GPL Version 2 section of the License file that
2419.23 + * by Oracle in the GPL Version 2 section of the License file that
2419.24 * accompanied this code. If applicable, add the following below the
2419.25 * License Header, with the fields enclosed by brackets [] replaced by
2419.26 * your own identifying information:
2420.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/SelectorDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2420.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/SelectorDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2420.3 @@ -1,7 +1,10 @@
2420.4 /*
2420.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2420.6 *
2420.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2420.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2420.9 + *
2420.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2420.11 + * Other names may be trademarks of their respective owners.
2420.12 *
2420.13 * The contents of this file are subject to the terms of either the GNU
2420.14 * General Public License Version 2 only ("GPL") or the Common
2420.15 @@ -13,9 +16,9 @@
2420.16 * specific language governing permissions and limitations under the
2420.17 * License. When distributing the software, include this License Header
2420.18 * Notice in each file and include the License file at
2420.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2420.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2420.21 * particular file as subject to the "Classpath" exception as provided
2420.22 - * by Sun in the GPL Version 2 section of the License file that
2420.23 + * by Oracle in the GPL Version 2 section of the License file that
2420.24 * accompanied this code. If applicable, add the following below the
2420.25 * License Header, with the fields enclosed by brackets [] replaced by
2420.26 * your own identifying information:
2421.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/SkipHyperlinkBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2421.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/SkipHyperlinkBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2421.3 @@ -2,7 +2,10 @@
2421.4 /*
2421.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2421.6 *
2421.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2421.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2421.9 + *
2421.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2421.11 + * Other names may be trademarks of their respective owners.
2421.12 *
2421.13 * The contents of this file are subject to the terms of either the GNU
2421.14 * General Public License Version 2 only ("GPL") or the Common
2421.15 @@ -14,9 +17,9 @@
2421.16 * specific language governing permissions and limitations under the
2421.17 * License. When distributing the software, include this License Header
2421.18 * Notice in each file and include the License file at
2421.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2421.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2421.21 * particular file as subject to the "Classpath" exception as provided
2421.22 - * by Sun in the GPL Version 2 section of the License file that
2421.23 + * by Oracle in the GPL Version 2 section of the License file that
2421.24 * accompanied this code. If applicable, add the following below the
2421.25 * License Header, with the fields enclosed by brackets [] replaced by
2421.26 * your own identifying information:
2422.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/StaticTextBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2422.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/StaticTextBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2422.3 @@ -1,7 +1,10 @@
2422.4 /*
2422.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2422.6 *
2422.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2422.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2422.9 + *
2422.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2422.11 + * Other names may be trademarks of their respective owners.
2422.12 *
2422.13 * The contents of this file are subject to the terms of either the GNU
2422.14 * General Public License Version 2 only ("GPL") or the Common
2422.15 @@ -13,9 +16,9 @@
2422.16 * specific language governing permissions and limitations under the
2422.17 * License. When distributing the software, include this License Header
2422.18 * Notice in each file and include the License file at
2422.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2422.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2422.21 * particular file as subject to the "Classpath" exception as provided
2422.22 - * by Sun in the GPL Version 2 section of the License file that
2422.23 + * by Oracle in the GPL Version 2 section of the License file that
2422.24 * accompanied this code. If applicable, add the following below the
2422.25 * License Header, with the fields enclosed by brackets [] replaced by
2422.26 * your own identifying information:
2423.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/StaticTextBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2423.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/StaticTextBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2423.3 @@ -2,7 +2,10 @@
2423.4 /*
2423.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2423.6 *
2423.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2423.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2423.9 + *
2423.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2423.11 + * Other names may be trademarks of their respective owners.
2423.12 *
2423.13 * The contents of this file are subject to the terms of either the GNU
2423.14 * General Public License Version 2 only ("GPL") or the Common
2423.15 @@ -14,9 +17,9 @@
2423.16 * specific language governing permissions and limitations under the
2423.17 * License. When distributing the software, include this License Header
2423.18 * Notice in each file and include the License file at
2423.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2423.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2423.21 * particular file as subject to the "Classpath" exception as provided
2423.22 - * by Sun in the GPL Version 2 section of the License file that
2423.23 + * by Oracle in the GPL Version 2 section of the License file that
2423.24 * accompanied this code. If applicable, add the following below the
2423.25 * License Header, with the fields enclosed by brackets [] replaced by
2423.26 * your own identifying information:
2424.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/StaticTextDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2424.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/StaticTextDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2424.3 @@ -1,7 +1,10 @@
2424.4 /*
2424.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2424.6 *
2424.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2424.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2424.9 + *
2424.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2424.11 + * Other names may be trademarks of their respective owners.
2424.12 *
2424.13 * The contents of this file are subject to the terms of either the GNU
2424.14 * General Public License Version 2 only ("GPL") or the Common
2424.15 @@ -13,9 +16,9 @@
2424.16 * specific language governing permissions and limitations under the
2424.17 * License. When distributing the software, include this License Header
2424.18 * Notice in each file and include the License file at
2424.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2424.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2424.21 * particular file as subject to the "Classpath" exception as provided
2424.22 - * by Sun in the GPL Version 2 section of the License file that
2424.23 + * by Oracle in the GPL Version 2 section of the License file that
2424.24 * accompanied this code. If applicable, add the following below the
2424.25 * License Header, with the fields enclosed by brackets [] replaced by
2424.26 * your own identifying information:
2425.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2425.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2425.3 @@ -1,7 +1,10 @@
2425.4 /*
2425.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2425.6 *
2425.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2425.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2425.9 + *
2425.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2425.11 + * Other names may be trademarks of their respective owners.
2425.12 *
2425.13 * The contents of this file are subject to the terms of either the GNU
2425.14 * General Public License Version 2 only ("GPL") or the Common
2425.15 @@ -13,9 +16,9 @@
2425.16 * specific language governing permissions and limitations under the
2425.17 * License. When distributing the software, include this License Header
2425.18 * Notice in each file and include the License file at
2425.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2425.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2425.21 * particular file as subject to the "Classpath" exception as provided
2425.22 - * by Sun in the GPL Version 2 section of the License file that
2425.23 + * by Oracle in the GPL Version 2 section of the License file that
2425.24 * accompanied this code. If applicable, add the following below the
2425.25 * License Header, with the fields enclosed by brackets [] replaced by
2425.26 * your own identifying information:
2426.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2426.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2426.3 @@ -2,7 +2,10 @@
2426.4 /*
2426.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2426.6 *
2426.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2426.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2426.9 + *
2426.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2426.11 + * Other names may be trademarks of their respective owners.
2426.12 *
2426.13 * The contents of this file are subject to the terms of either the GNU
2426.14 * General Public License Version 2 only ("GPL") or the Common
2426.15 @@ -14,9 +17,9 @@
2426.16 * specific language governing permissions and limitations under the
2426.17 * License. When distributing the software, include this License Header
2426.18 * Notice in each file and include the License file at
2426.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2426.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2426.21 * particular file as subject to the "Classpath" exception as provided
2426.22 - * by Sun in the GPL Version 2 section of the License file that
2426.23 + * by Oracle in the GPL Version 2 section of the License file that
2426.24 * accompanied this code. If applicable, add the following below the
2426.25 * License Header, with the fields enclosed by brackets [] replaced by
2426.26 * your own identifying information:
2427.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2427.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2427.3 @@ -1,7 +1,10 @@
2427.4 /*
2427.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2427.6 *
2427.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2427.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2427.9 + *
2427.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2427.11 + * Other names may be trademarks of their respective owners.
2427.12 *
2427.13 * The contents of this file are subject to the terms of either the GNU
2427.14 * General Public License Version 2 only ("GPL") or the Common
2427.15 @@ -13,9 +16,9 @@
2427.16 * specific language governing permissions and limitations under the
2427.17 * License. When distributing the software, include this License Header
2427.18 * Notice in each file and include the License file at
2427.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2427.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2427.21 * particular file as subject to the "Classpath" exception as provided
2427.22 - * by Sun in the GPL Version 2 section of the License file that
2427.23 + * by Oracle in the GPL Version 2 section of the License file that
2427.24 * accompanied this code. If applicable, add the following below the
2427.25 * License Header, with the fields enclosed by brackets [] replaced by
2427.26 * your own identifying information:
2428.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabGridBeanCreateInfo.java Fri Jul 16 11:47:36 2010 -0400
2428.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabGridBeanCreateInfo.java Fri Jul 16 14:21:50 2010 -0400
2428.3 @@ -1,7 +1,10 @@
2428.4 /*
2428.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2428.6 *
2428.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2428.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2428.9 + *
2428.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2428.11 + * Other names may be trademarks of their respective owners.
2428.12 *
2428.13 * The contents of this file are subject to the terms of either the GNU
2428.14 * General Public License Version 2 only ("GPL") or the Common
2428.15 @@ -13,9 +16,9 @@
2428.16 * specific language governing permissions and limitations under the
2428.17 * License. When distributing the software, include this License Header
2428.18 * Notice in each file and include the License file at
2428.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2428.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2428.21 * particular file as subject to the "Classpath" exception as provided
2428.22 - * by Sun in the GPL Version 2 section of the License file that
2428.23 + * by Oracle in the GPL Version 2 section of the License file that
2428.24 * accompanied this code. If applicable, add the following below the
2428.25 * License Header, with the fields enclosed by brackets [] replaced by
2428.26 * your own identifying information:
2429.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabGridBeanCreateInfoDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2429.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabGridBeanCreateInfoDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2429.3 @@ -1,7 +1,10 @@
2429.4 /*
2429.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2429.6 *
2429.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2429.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2429.9 + *
2429.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2429.11 + * Other names may be trademarks of their respective owners.
2429.12 *
2429.13 * The contents of this file are subject to the terms of either the GNU
2429.14 * General Public License Version 2 only ("GPL") or the Common
2429.15 @@ -13,9 +16,9 @@
2429.16 * specific language governing permissions and limitations under the
2429.17 * License. When distributing the software, include this License Header
2429.18 * Notice in each file and include the License file at
2429.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2429.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2429.21 * particular file as subject to the "Classpath" exception as provided
2429.22 - * by Sun in the GPL Version 2 section of the License file that
2429.23 + * by Oracle in the GPL Version 2 section of the License file that
2429.24 * accompanied this code. If applicable, add the following below the
2429.25 * License Header, with the fields enclosed by brackets [] replaced by
2429.26 * your own identifying information:
2430.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabSetBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2430.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabSetBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2430.3 @@ -1,7 +1,10 @@
2430.4 /*
2430.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2430.6 *
2430.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2430.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2430.9 + *
2430.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2430.11 + * Other names may be trademarks of their respective owners.
2430.12 *
2430.13 * The contents of this file are subject to the terms of either the GNU
2430.14 * General Public License Version 2 only ("GPL") or the Common
2430.15 @@ -13,9 +16,9 @@
2430.16 * specific language governing permissions and limitations under the
2430.17 * License. When distributing the software, include this License Header
2430.18 * Notice in each file and include the License file at
2430.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2430.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2430.21 * particular file as subject to the "Classpath" exception as provided
2430.22 - * by Sun in the GPL Version 2 section of the License file that
2430.23 + * by Oracle in the GPL Version 2 section of the License file that
2430.24 * accompanied this code. If applicable, add the following below the
2430.25 * License Header, with the fields enclosed by brackets [] replaced by
2430.26 * your own identifying information:
2431.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabSetBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2431.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabSetBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2431.3 @@ -2,7 +2,10 @@
2431.4 /*
2431.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2431.6 *
2431.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2431.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2431.9 + *
2431.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2431.11 + * Other names may be trademarks of their respective owners.
2431.12 *
2431.13 * The contents of this file are subject to the terms of either the GNU
2431.14 * General Public License Version 2 only ("GPL") or the Common
2431.15 @@ -14,9 +17,9 @@
2431.16 * specific language governing permissions and limitations under the
2431.17 * License. When distributing the software, include this License Header
2431.18 * Notice in each file and include the License file at
2431.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2431.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2431.21 * particular file as subject to the "Classpath" exception as provided
2431.22 - * by Sun in the GPL Version 2 section of the License file that
2431.23 + * by Oracle in the GPL Version 2 section of the License file that
2431.24 * accompanied this code. If applicable, add the following below the
2431.25 * License Header, with the fields enclosed by brackets [] replaced by
2431.26 * your own identifying information:
2432.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabSetDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2432.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TabSetDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2432.3 @@ -1,7 +1,10 @@
2432.4 /*
2432.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2432.6 *
2432.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2432.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2432.9 + *
2432.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2432.11 + * Other names may be trademarks of their respective owners.
2432.12 *
2432.13 * The contents of this file are subject to the terms of either the GNU
2432.14 * General Public License Version 2 only ("GPL") or the Common
2432.15 @@ -13,9 +16,9 @@
2432.16 * specific language governing permissions and limitations under the
2432.17 * License. When distributing the software, include this License Header
2432.18 * Notice in each file and include the License file at
2432.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2432.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2432.21 * particular file as subject to the "Classpath" exception as provided
2432.22 - * by Sun in the GPL Version 2 section of the License file that
2432.23 + * by Oracle in the GPL Version 2 section of the License file that
2432.24 * accompanied this code. If applicable, add the following below the
2432.25 * License Header, with the fields enclosed by brackets [] replaced by
2432.26 * your own identifying information:
2433.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableActionsBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2433.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableActionsBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2433.3 @@ -2,7 +2,10 @@
2433.4 /*
2433.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2433.6 *
2433.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2433.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2433.9 + *
2433.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2433.11 + * Other names may be trademarks of their respective owners.
2433.12 *
2433.13 * The contents of this file are subject to the terms of either the GNU
2433.14 * General Public License Version 2 only ("GPL") or the Common
2433.15 @@ -14,9 +17,9 @@
2433.16 * specific language governing permissions and limitations under the
2433.17 * License. When distributing the software, include this License Header
2433.18 * Notice in each file and include the License file at
2433.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2433.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2433.21 * particular file as subject to the "Classpath" exception as provided
2433.22 - * by Sun in the GPL Version 2 section of the License file that
2433.23 + * by Oracle in the GPL Version 2 section of the License file that
2433.24 * accompanied this code. If applicable, add the following below the
2433.25 * License Header, with the fields enclosed by brackets [] replaced by
2433.26 * your own identifying information:
2434.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2434.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2434.3 @@ -1,7 +1,10 @@
2434.4 /*
2434.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2434.6 *
2434.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2434.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2434.9 + *
2434.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2434.11 + * Other names may be trademarks of their respective owners.
2434.12 *
2434.13 * The contents of this file are subject to the terms of either the GNU
2434.14 * General Public License Version 2 only ("GPL") or the Common
2434.15 @@ -13,9 +16,9 @@
2434.16 * specific language governing permissions and limitations under the
2434.17 * License. When distributing the software, include this License Header
2434.18 * Notice in each file and include the License file at
2434.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2434.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2434.21 * particular file as subject to the "Classpath" exception as provided
2434.22 - * by Sun in the GPL Version 2 section of the License file that
2434.23 + * by Oracle in the GPL Version 2 section of the License file that
2434.24 * accompanied this code. If applicable, add the following below the
2434.25 * License Header, with the fields enclosed by brackets [] replaced by
2434.26 * your own identifying information:
2435.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2435.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2435.3 @@ -2,7 +2,10 @@
2435.4 /*
2435.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2435.6 *
2435.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2435.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2435.9 + *
2435.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2435.11 + * Other names may be trademarks of their respective owners.
2435.12 *
2435.13 * The contents of this file are subject to the terms of either the GNU
2435.14 * General Public License Version 2 only ("GPL") or the Common
2435.15 @@ -14,9 +17,9 @@
2435.16 * specific language governing permissions and limitations under the
2435.17 * License. When distributing the software, include this License Header
2435.18 * Notice in each file and include the License file at
2435.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2435.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2435.21 * particular file as subject to the "Classpath" exception as provided
2435.22 - * by Sun in the GPL Version 2 section of the License file that
2435.23 + * by Oracle in the GPL Version 2 section of the License file that
2435.24 * accompanied this code. If applicable, add the following below the
2435.25 * License Header, with the fields enclosed by brackets [] replaced by
2435.26 * your own identifying information:
2436.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableColumnBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2436.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableColumnBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2436.3 @@ -1,7 +1,10 @@
2436.4 /*
2436.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2436.6 *
2436.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2436.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2436.9 + *
2436.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2436.11 + * Other names may be trademarks of their respective owners.
2436.12 *
2436.13 * The contents of this file are subject to the terms of either the GNU
2436.14 * General Public License Version 2 only ("GPL") or the Common
2436.15 @@ -13,9 +16,9 @@
2436.16 * specific language governing permissions and limitations under the
2436.17 * License. When distributing the software, include this License Header
2436.18 * Notice in each file and include the License file at
2436.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2436.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2436.21 * particular file as subject to the "Classpath" exception as provided
2436.22 - * by Sun in the GPL Version 2 section of the License file that
2436.23 + * by Oracle in the GPL Version 2 section of the License file that
2436.24 * accompanied this code. If applicable, add the following below the
2436.25 * License Header, with the fields enclosed by brackets [] replaced by
2436.26 * your own identifying information:
2437.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableColumnBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2437.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableColumnBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2437.3 @@ -2,7 +2,10 @@
2437.4 /*
2437.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2437.6 *
2437.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2437.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2437.9 + *
2437.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2437.11 + * Other names may be trademarks of their respective owners.
2437.12 *
2437.13 * The contents of this file are subject to the terms of either the GNU
2437.14 * General Public License Version 2 only ("GPL") or the Common
2437.15 @@ -14,9 +17,9 @@
2437.16 * specific language governing permissions and limitations under the
2437.17 * License. When distributing the software, include this License Header
2437.18 * Notice in each file and include the License file at
2437.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2437.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2437.21 * particular file as subject to the "Classpath" exception as provided
2437.22 - * by Sun in the GPL Version 2 section of the License file that
2437.23 + * by Oracle in the GPL Version 2 section of the License file that
2437.24 * accompanied this code. If applicable, add the following below the
2437.25 * License Header, with the fields enclosed by brackets [] replaced by
2437.26 * your own identifying information:
2438.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableColumnDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2438.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableColumnDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2438.3 @@ -1,7 +1,10 @@
2438.4 /*
2438.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2438.6 *
2438.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2438.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2438.9 + *
2438.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2438.11 + * Other names may be trademarks of their respective owners.
2438.12 *
2438.13 * The contents of this file are subject to the terms of either the GNU
2438.14 * General Public License Version 2 only ("GPL") or the Common
2438.15 @@ -13,9 +16,9 @@
2438.16 * specific language governing permissions and limitations under the
2438.17 * License. When distributing the software, include this License Header
2438.18 * Notice in each file and include the License file at
2438.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2438.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2438.21 * particular file as subject to the "Classpath" exception as provided
2438.22 - * by Sun in the GPL Version 2 section of the License file that
2438.23 + * by Oracle in the GPL Version 2 section of the License file that
2438.24 * accompanied this code. If applicable, add the following below the
2438.25 * License Header, with the fields enclosed by brackets [] replaced by
2438.26 * your own identifying information:
2439.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2439.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2439.3 @@ -1,7 +1,10 @@
2439.4 /*
2439.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2439.6 *
2439.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2439.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2439.9 + *
2439.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2439.11 + * Other names may be trademarks of their respective owners.
2439.12 *
2439.13 * The contents of this file are subject to the terms of either the GNU
2439.14 * General Public License Version 2 only ("GPL") or the Common
2439.15 @@ -13,9 +16,9 @@
2439.16 * specific language governing permissions and limitations under the
2439.17 * License. When distributing the software, include this License Header
2439.18 * Notice in each file and include the License file at
2439.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2439.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2439.21 * particular file as subject to the "Classpath" exception as provided
2439.22 - * by Sun in the GPL Version 2 section of the License file that
2439.23 + * by Oracle in the GPL Version 2 section of the License file that
2439.24 * accompanied this code. If applicable, add the following below the
2439.25 * License Header, with the fields enclosed by brackets [] replaced by
2439.26 * your own identifying information:
2440.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableFooterBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2440.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableFooterBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2440.3 @@ -2,7 +2,10 @@
2440.4 /*
2440.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2440.6 *
2440.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2440.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2440.9 + *
2440.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2440.11 + * Other names may be trademarks of their respective owners.
2440.12 *
2440.13 * The contents of this file are subject to the terms of either the GNU
2440.14 * General Public License Version 2 only ("GPL") or the Common
2440.15 @@ -14,9 +17,9 @@
2440.16 * specific language governing permissions and limitations under the
2440.17 * License. When distributing the software, include this License Header
2440.18 * Notice in each file and include the License file at
2440.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2440.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2440.21 * particular file as subject to the "Classpath" exception as provided
2440.22 - * by Sun in the GPL Version 2 section of the License file that
2440.23 + * by Oracle in the GPL Version 2 section of the License file that
2440.24 * accompanied this code. If applicable, add the following below the
2440.25 * License Header, with the fields enclosed by brackets [] replaced by
2440.26 * your own identifying information:
2441.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableHeaderBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2441.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableHeaderBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2441.3 @@ -2,7 +2,10 @@
2441.4 /*
2441.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2441.6 *
2441.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2441.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2441.9 + *
2441.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2441.11 + * Other names may be trademarks of their respective owners.
2441.12 *
2441.13 * The contents of this file are subject to the terms of either the GNU
2441.14 * General Public License Version 2 only ("GPL") or the Common
2441.15 @@ -14,9 +17,9 @@
2441.16 * specific language governing permissions and limitations under the
2441.17 * License. When distributing the software, include this License Header
2441.18 * Notice in each file and include the License file at
2441.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2441.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2441.21 * particular file as subject to the "Classpath" exception as provided
2441.22 - * by Sun in the GPL Version 2 section of the License file that
2441.23 + * by Oracle in the GPL Version 2 section of the License file that
2441.24 * accompanied this code. If applicable, add the following below the
2441.25 * License Header, with the fields enclosed by brackets [] replaced by
2441.26 * your own identifying information:
2442.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TablePanelsBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2442.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TablePanelsBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2442.3 @@ -2,7 +2,10 @@
2442.4 /*
2442.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2442.6 *
2442.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2442.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2442.9 + *
2442.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2442.11 + * Other names may be trademarks of their respective owners.
2442.12 *
2442.13 * The contents of this file are subject to the terms of either the GNU
2442.14 * General Public License Version 2 only ("GPL") or the Common
2442.15 @@ -14,9 +17,9 @@
2442.16 * specific language governing permissions and limitations under the
2442.17 * License. When distributing the software, include this License Header
2442.18 * Notice in each file and include the License file at
2442.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2442.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2442.21 * particular file as subject to the "Classpath" exception as provided
2442.22 - * by Sun in the GPL Version 2 section of the License file that
2442.23 + * by Oracle in the GPL Version 2 section of the License file that
2442.24 * accompanied this code. If applicable, add the following below the
2442.25 * License Header, with the fields enclosed by brackets [] replaced by
2442.26 * your own identifying information:
2443.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableRowGroupBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2443.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableRowGroupBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2443.3 @@ -1,7 +1,10 @@
2443.4 /*
2443.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2443.6 *
2443.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2443.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2443.9 + *
2443.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2443.11 + * Other names may be trademarks of their respective owners.
2443.12 *
2443.13 * The contents of this file are subject to the terms of either the GNU
2443.14 * General Public License Version 2 only ("GPL") or the Common
2443.15 @@ -13,9 +16,9 @@
2443.16 * specific language governing permissions and limitations under the
2443.17 * License. When distributing the software, include this License Header
2443.18 * Notice in each file and include the License file at
2443.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2443.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2443.21 * particular file as subject to the "Classpath" exception as provided
2443.22 - * by Sun in the GPL Version 2 section of the License file that
2443.23 + * by Oracle in the GPL Version 2 section of the License file that
2443.24 * accompanied this code. If applicable, add the following below the
2443.25 * License Header, with the fields enclosed by brackets [] replaced by
2443.26 * your own identifying information:
2444.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableRowGroupBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2444.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableRowGroupBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2444.3 @@ -2,7 +2,10 @@
2444.4 /*
2444.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2444.6 *
2444.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2444.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2444.9 + *
2444.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2444.11 + * Other names may be trademarks of their respective owners.
2444.12 *
2444.13 * The contents of this file are subject to the terms of either the GNU
2444.14 * General Public License Version 2 only ("GPL") or the Common
2444.15 @@ -14,9 +17,9 @@
2444.16 * specific language governing permissions and limitations under the
2444.17 * License. When distributing the software, include this License Header
2444.18 * Notice in each file and include the License file at
2444.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2444.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2444.21 * particular file as subject to the "Classpath" exception as provided
2444.22 - * by Sun in the GPL Version 2 section of the License file that
2444.23 + * by Oracle in the GPL Version 2 section of the License file that
2444.24 * accompanied this code. If applicable, add the following below the
2444.25 * License Header, with the fields enclosed by brackets [] replaced by
2444.26 * your own identifying information:
2445.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableRowGroupDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2445.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TableRowGroupDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2445.3 @@ -1,7 +1,10 @@
2445.4 /*
2445.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2445.6 *
2445.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2445.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2445.9 + *
2445.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2445.11 + * Other names may be trademarks of their respective owners.
2445.12 *
2445.13 * The contents of this file are subject to the terms of either the GNU
2445.14 * General Public License Version 2 only ("GPL") or the Common
2445.15 @@ -13,9 +16,9 @@
2445.16 * specific language governing permissions and limitations under the
2445.17 * License. When distributing the software, include this License Header
2445.18 * Notice in each file and include the License file at
2445.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2445.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2445.21 * particular file as subject to the "Classpath" exception as provided
2445.22 - * by Sun in the GPL Version 2 section of the License file that
2445.23 + * by Oracle in the GPL Version 2 section of the License file that
2445.24 * accompanied this code. If applicable, add the following below the
2445.25 * License Header, with the fields enclosed by brackets [] replaced by
2445.26 * your own identifying information:
2446.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TemplateComponentBaseBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2446.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TemplateComponentBaseBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2446.3 @@ -2,7 +2,10 @@
2446.4 /*
2446.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2446.6 *
2446.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2446.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2446.9 + *
2446.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2446.11 + * Other names may be trademarks of their respective owners.
2446.12 *
2446.13 * The contents of this file are subject to the terms of either the GNU
2446.14 * General Public License Version 2 only ("GPL") or the Common
2446.15 @@ -14,9 +17,9 @@
2446.16 * specific language governing permissions and limitations under the
2446.17 * License. When distributing the software, include this License Header
2446.18 * Notice in each file and include the License file at
2446.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2446.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2446.21 * particular file as subject to the "Classpath" exception as provided
2446.22 - * by Sun in the GPL Version 2 section of the License file that
2446.23 + * by Oracle in the GPL Version 2 section of the License file that
2446.24 * accompanied this code. If applicable, add the following below the
2446.25 * License Header, with the fields enclosed by brackets [] replaced by
2446.26 * your own identifying information:
2447.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextAreaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2447.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextAreaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2447.3 @@ -1,7 +1,10 @@
2447.4 /*
2447.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2447.6 *
2447.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2447.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2447.9 + *
2447.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2447.11 + * Other names may be trademarks of their respective owners.
2447.12 *
2447.13 * The contents of this file are subject to the terms of either the GNU
2447.14 * General Public License Version 2 only ("GPL") or the Common
2447.15 @@ -13,9 +16,9 @@
2447.16 * specific language governing permissions and limitations under the
2447.17 * License. When distributing the software, include this License Header
2447.18 * Notice in each file and include the License file at
2447.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2447.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2447.21 * particular file as subject to the "Classpath" exception as provided
2447.22 - * by Sun in the GPL Version 2 section of the License file that
2447.23 + * by Oracle in the GPL Version 2 section of the License file that
2447.24 * accompanied this code. If applicable, add the following below the
2447.25 * License Header, with the fields enclosed by brackets [] replaced by
2447.26 * your own identifying information:
2448.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextAreaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2448.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextAreaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2448.3 @@ -2,7 +2,10 @@
2448.4 /*
2448.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2448.6 *
2448.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2448.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2448.9 + *
2448.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2448.11 + * Other names may be trademarks of their respective owners.
2448.12 *
2448.13 * The contents of this file are subject to the terms of either the GNU
2448.14 * General Public License Version 2 only ("GPL") or the Common
2448.15 @@ -14,9 +17,9 @@
2448.16 * specific language governing permissions and limitations under the
2448.17 * License. When distributing the software, include this License Header
2448.18 * Notice in each file and include the License file at
2448.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2448.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2448.21 * particular file as subject to the "Classpath" exception as provided
2448.22 - * by Sun in the GPL Version 2 section of the License file that
2448.23 + * by Oracle in the GPL Version 2 section of the License file that
2448.24 * accompanied this code. If applicable, add the following below the
2448.25 * License Header, with the fields enclosed by brackets [] replaced by
2448.26 * your own identifying information:
2449.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextAreaDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2449.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextAreaDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2449.3 @@ -1,7 +1,10 @@
2449.4 /*
2449.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2449.6 *
2449.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2449.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2449.9 + *
2449.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2449.11 + * Other names may be trademarks of their respective owners.
2449.12 *
2449.13 * The contents of this file are subject to the terms of either the GNU
2449.14 * General Public License Version 2 only ("GPL") or the Common
2449.15 @@ -13,9 +16,9 @@
2449.16 * specific language governing permissions and limitations under the
2449.17 * License. When distributing the software, include this License Header
2449.18 * Notice in each file and include the License file at
2449.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2449.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2449.21 * particular file as subject to the "Classpath" exception as provided
2449.22 - * by Sun in the GPL Version 2 section of the License file that
2449.23 + * by Oracle in the GPL Version 2 section of the License file that
2449.24 * accompanied this code. If applicable, add the following below the
2449.25 * License Header, with the fields enclosed by brackets [] replaced by
2449.26 * your own identifying information:
2450.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextFieldBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2450.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextFieldBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2450.3 @@ -1,7 +1,10 @@
2450.4 /*
2450.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2450.6 *
2450.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2450.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2450.9 + *
2450.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2450.11 + * Other names may be trademarks of their respective owners.
2450.12 *
2450.13 * The contents of this file are subject to the terms of either the GNU
2450.14 * General Public License Version 2 only ("GPL") or the Common
2450.15 @@ -13,9 +16,9 @@
2450.16 * specific language governing permissions and limitations under the
2450.17 * License. When distributing the software, include this License Header
2450.18 * Notice in each file and include the License file at
2450.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2450.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2450.21 * particular file as subject to the "Classpath" exception as provided
2450.22 - * by Sun in the GPL Version 2 section of the License file that
2450.23 + * by Oracle in the GPL Version 2 section of the License file that
2450.24 * accompanied this code. If applicable, add the following below the
2450.25 * License Header, with the fields enclosed by brackets [] replaced by
2450.26 * your own identifying information:
2451.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextFieldBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2451.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextFieldBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2451.3 @@ -2,7 +2,10 @@
2451.4 /*
2451.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2451.6 *
2451.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2451.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2451.9 + *
2451.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2451.11 + * Other names may be trademarks of their respective owners.
2451.12 *
2451.13 * The contents of this file are subject to the terms of either the GNU
2451.14 * General Public License Version 2 only ("GPL") or the Common
2451.15 @@ -14,9 +17,9 @@
2451.16 * specific language governing permissions and limitations under the
2451.17 * License. When distributing the software, include this License Header
2451.18 * Notice in each file and include the License file at
2451.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2451.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2451.21 * particular file as subject to the "Classpath" exception as provided
2451.22 - * by Sun in the GPL Version 2 section of the License file that
2451.23 + * by Oracle in the GPL Version 2 section of the License file that
2451.24 * accompanied this code. If applicable, add the following below the
2451.25 * License Header, with the fields enclosed by brackets [] replaced by
2451.26 * your own identifying information:
2452.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextFieldDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2452.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TextFieldDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2452.3 @@ -1,7 +1,10 @@
2452.4 /*
2452.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2452.6 *
2452.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2452.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2452.9 + *
2452.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2452.11 + * Other names may be trademarks of their respective owners.
2452.12 *
2452.13 * The contents of this file are subject to the terms of either the GNU
2452.14 * General Public License Version 2 only ("GPL") or the Common
2452.15 @@ -13,9 +16,9 @@
2452.16 * specific language governing permissions and limitations under the
2452.17 * License. When distributing the software, include this License Header
2452.18 * Notice in each file and include the License file at
2452.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2452.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2452.21 * particular file as subject to the "Classpath" exception as provided
2452.22 - * by Sun in the GPL Version 2 section of the License file that
2452.23 + * by Oracle in the GPL Version 2 section of the License file that
2452.24 * accompanied this code. If applicable, add the following below the
2452.25 * License Header, with the fields enclosed by brackets [] replaced by
2452.26 * your own identifying information:
2453.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ThemeLinksBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2453.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ThemeLinksBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2453.3 @@ -1,7 +1,10 @@
2453.4 /*
2453.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2453.6 *
2453.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2453.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2453.9 + *
2453.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2453.11 + * Other names may be trademarks of their respective owners.
2453.12 *
2453.13 * The contents of this file are subject to the terms of either the GNU
2453.14 * General Public License Version 2 only ("GPL") or the Common
2453.15 @@ -13,9 +16,9 @@
2453.16 * specific language governing permissions and limitations under the
2453.17 * License. When distributing the software, include this License Header
2453.18 * Notice in each file and include the License file at
2453.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2453.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2453.21 * particular file as subject to the "Classpath" exception as provided
2453.22 - * by Sun in the GPL Version 2 section of the License file that
2453.23 + * by Oracle in the GPL Version 2 section of the License file that
2453.24 * accompanied this code. If applicable, add the following below the
2453.25 * License Header, with the fields enclosed by brackets [] replaced by
2453.26 * your own identifying information:
2454.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ThemeLinksBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2454.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/ThemeLinksBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2454.3 @@ -2,7 +2,10 @@
2454.4 /*
2454.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2454.6 *
2454.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2454.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2454.9 + *
2454.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2454.11 + * Other names may be trademarks of their respective owners.
2454.12 *
2454.13 * The contents of this file are subject to the terms of either the GNU
2454.14 * General Public License Version 2 only ("GPL") or the Common
2454.15 @@ -14,9 +17,9 @@
2454.16 * specific language governing permissions and limitations under the
2454.17 * License. When distributing the software, include this License Header
2454.18 * Notice in each file and include the License file at
2454.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2454.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2454.21 * particular file as subject to the "Classpath" exception as provided
2454.22 - * by Sun in the GPL Version 2 section of the License file that
2454.23 + * by Oracle in the GPL Version 2 section of the License file that
2454.24 * accompanied this code. If applicable, add the following below the
2454.25 * License Header, with the fields enclosed by brackets [] replaced by
2454.26 * your own identifying information:
2455.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TimeBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2455.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TimeBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2455.3 @@ -2,7 +2,10 @@
2455.4 /*
2455.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2455.6 *
2455.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2455.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2455.9 + *
2455.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2455.11 + * Other names may be trademarks of their respective owners.
2455.12 *
2455.13 * The contents of this file are subject to the terms of either the GNU
2455.14 * General Public License Version 2 only ("GPL") or the Common
2455.15 @@ -14,9 +17,9 @@
2455.16 * specific language governing permissions and limitations under the
2455.17 * License. When distributing the software, include this License Header
2455.18 * Notice in each file and include the License file at
2455.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2455.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2455.21 * particular file as subject to the "Classpath" exception as provided
2455.22 - * by Sun in the GPL Version 2 section of the License file that
2455.23 + * by Oracle in the GPL Version 2 section of the License file that
2455.24 * accompanied this code. If applicable, add the following below the
2455.25 * License Header, with the fields enclosed by brackets [] replaced by
2455.26 * your own identifying information:
2456.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2456.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2456.3 @@ -1,7 +1,10 @@
2456.4 /*
2456.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2456.6 *
2456.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2456.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2456.9 + *
2456.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2456.11 + * Other names may be trademarks of their respective owners.
2456.12 *
2456.13 * The contents of this file are subject to the terms of either the GNU
2456.14 * General Public License Version 2 only ("GPL") or the Common
2456.15 @@ -13,9 +16,9 @@
2456.16 * specific language governing permissions and limitations under the
2456.17 * License. When distributing the software, include this License Header
2456.18 * Notice in each file and include the License file at
2456.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2456.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2456.21 * particular file as subject to the "Classpath" exception as provided
2456.22 - * by Sun in the GPL Version 2 section of the License file that
2456.23 + * by Oracle in the GPL Version 2 section of the License file that
2456.24 * accompanied this code. If applicable, add the following below the
2456.25 * License Header, with the fields enclosed by brackets [] replaced by
2456.26 * your own identifying information:
2457.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2457.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2457.3 @@ -2,7 +2,10 @@
2457.4 /*
2457.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2457.6 *
2457.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2457.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2457.9 + *
2457.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2457.11 + * Other names may be trademarks of their respective owners.
2457.12 *
2457.13 * The contents of this file are subject to the terms of either the GNU
2457.14 * General Public License Version 2 only ("GPL") or the Common
2457.15 @@ -14,9 +17,9 @@
2457.16 * specific language governing permissions and limitations under the
2457.17 * License. When distributing the software, include this License Header
2457.18 * Notice in each file and include the License file at
2457.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2457.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2457.21 * particular file as subject to the "Classpath" exception as provided
2457.22 - * by Sun in the GPL Version 2 section of the License file that
2457.23 + * by Oracle in the GPL Version 2 section of the License file that
2457.24 * accompanied this code. If applicable, add the following below the
2457.25 * License Header, with the fields enclosed by brackets [] replaced by
2457.26 * your own identifying information:
2458.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2458.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2458.3 @@ -1,7 +1,10 @@
2458.4 /*
2458.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2458.6 *
2458.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2458.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2458.9 + *
2458.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2458.11 + * Other names may be trademarks of their respective owners.
2458.12 *
2458.13 * The contents of this file are subject to the terms of either the GNU
2458.14 * General Public License Version 2 only ("GPL") or the Common
2458.15 @@ -13,9 +16,9 @@
2458.16 * specific language governing permissions and limitations under the
2458.17 * License. When distributing the software, include this License Header
2458.18 * Notice in each file and include the License file at
2458.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2458.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2458.21 * particular file as subject to the "Classpath" exception as provided
2458.22 - * by Sun in the GPL Version 2 section of the License file that
2458.23 + * by Oracle in the GPL Version 2 section of the License file that
2458.24 * accompanied this code. If applicable, add the following below the
2458.25 * License Header, with the fields enclosed by brackets [] replaced by
2458.26 * your own identifying information:
2459.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeNodeBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2459.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeNodeBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2459.3 @@ -1,7 +1,10 @@
2459.4 /*
2459.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2459.6 *
2459.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2459.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2459.9 + *
2459.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2459.11 + * Other names may be trademarks of their respective owners.
2459.12 *
2459.13 * The contents of this file are subject to the terms of either the GNU
2459.14 * General Public License Version 2 only ("GPL") or the Common
2459.15 @@ -13,9 +16,9 @@
2459.16 * specific language governing permissions and limitations under the
2459.17 * License. When distributing the software, include this License Header
2459.18 * Notice in each file and include the License file at
2459.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2459.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2459.21 * particular file as subject to the "Classpath" exception as provided
2459.22 - * by Sun in the GPL Version 2 section of the License file that
2459.23 + * by Oracle in the GPL Version 2 section of the License file that
2459.24 * accompanied this code. If applicable, add the following below the
2459.25 * License Header, with the fields enclosed by brackets [] replaced by
2459.26 * your own identifying information:
2460.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeNodeBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2460.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeNodeBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2460.3 @@ -2,7 +2,10 @@
2460.4 /*
2460.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2460.6 *
2460.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2460.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2460.9 + *
2460.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2460.11 + * Other names may be trademarks of their respective owners.
2460.12 *
2460.13 * The contents of this file are subject to the terms of either the GNU
2460.14 * General Public License Version 2 only ("GPL") or the Common
2460.15 @@ -14,9 +17,9 @@
2460.16 * specific language governing permissions and limitations under the
2460.17 * License. When distributing the software, include this License Header
2460.18 * Notice in each file and include the License file at
2460.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2460.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2460.21 * particular file as subject to the "Classpath" exception as provided
2460.22 - * by Sun in the GPL Version 2 section of the License file that
2460.23 + * by Oracle in the GPL Version 2 section of the License file that
2460.24 * accompanied this code. If applicable, add the following below the
2460.25 * License Header, with the fields enclosed by brackets [] replaced by
2460.26 * your own identifying information:
2461.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeNodeDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2461.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/TreeNodeDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2461.3 @@ -1,7 +1,10 @@
2461.4 /*
2461.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2461.6 *
2461.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2461.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2461.9 + *
2461.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2461.11 + * Other names may be trademarks of their respective owners.
2461.12 *
2461.13 * The contents of this file are subject to the terms of either the GNU
2461.14 * General Public License Version 2 only ("GPL") or the Common
2461.15 @@ -13,9 +16,9 @@
2461.16 * specific language governing permissions and limitations under the
2461.17 * License. When distributing the software, include this License Header
2461.18 * Notice in each file and include the License file at
2461.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2461.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2461.21 * particular file as subject to the "Classpath" exception as provided
2461.22 - * by Sun in the GPL Version 2 section of the License file that
2461.23 + * by Oracle in the GPL Version 2 section of the License file that
2461.24 * accompanied this code. If applicable, add the following below the
2461.25 * License Header, with the fields enclosed by brackets [] replaced by
2461.26 * your own identifying information:
2462.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/UploadBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2462.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/UploadBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2462.3 @@ -1,7 +1,10 @@
2462.4 /*
2462.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2462.6 *
2462.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2462.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2462.9 + *
2462.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2462.11 + * Other names may be trademarks of their respective owners.
2462.12 *
2462.13 * The contents of this file are subject to the terms of either the GNU
2462.14 * General Public License Version 2 only ("GPL") or the Common
2462.15 @@ -13,9 +16,9 @@
2462.16 * specific language governing permissions and limitations under the
2462.17 * License. When distributing the software, include this License Header
2462.18 * Notice in each file and include the License file at
2462.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2462.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2462.21 * particular file as subject to the "Classpath" exception as provided
2462.22 - * by Sun in the GPL Version 2 section of the License file that
2462.23 + * by Oracle in the GPL Version 2 section of the License file that
2462.24 * accompanied this code. If applicable, add the following below the
2462.25 * License Header, with the fields enclosed by brackets [] replaced by
2462.26 * your own identifying information:
2463.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/UploadBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2463.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/UploadBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2463.3 @@ -2,7 +2,10 @@
2463.4 /*
2463.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2463.6 *
2463.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2463.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2463.9 + *
2463.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2463.11 + * Other names may be trademarks of their respective owners.
2463.12 *
2463.13 * The contents of this file are subject to the terms of either the GNU
2463.14 * General Public License Version 2 only ("GPL") or the Common
2463.15 @@ -14,9 +17,9 @@
2463.16 * specific language governing permissions and limitations under the
2463.17 * License. When distributing the software, include this License Header
2463.18 * Notice in each file and include the License file at
2463.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2463.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2463.21 * particular file as subject to the "Classpath" exception as provided
2463.22 - * by Sun in the GPL Version 2 section of the License file that
2463.23 + * by Oracle in the GPL Version 2 section of the License file that
2463.24 * accompanied this code. If applicable, add the following below the
2463.25 * License Header, with the fields enclosed by brackets [] replaced by
2463.26 * your own identifying information:
2464.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/UploadDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
2464.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/UploadDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
2464.3 @@ -1,7 +1,10 @@
2464.4 /*
2464.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2464.6 *
2464.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2464.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2464.9 + *
2464.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2464.11 + * Other names may be trademarks of their respective owners.
2464.12 *
2464.13 * The contents of this file are subject to the terms of either the GNU
2464.14 * General Public License Version 2 only ("GPL") or the Common
2464.15 @@ -13,9 +16,9 @@
2464.16 * specific language governing permissions and limitations under the
2464.17 * License. When distributing the software, include this License Header
2464.18 * Notice in each file and include the License file at
2464.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2464.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2464.21 * particular file as subject to the "Classpath" exception as provided
2464.22 - * by Sun in the GPL Version 2 section of the License file that
2464.23 + * by Oracle in the GPL Version 2 section of the License file that
2464.24 * accompanied this code. If applicable, add the following below the
2464.25 * License Header, with the fields enclosed by brackets [] replaced by
2464.26 * your own identifying information:
2465.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/AutoSubmitOnChangeAction.java Fri Jul 16 11:47:36 2010 -0400
2465.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/AutoSubmitOnChangeAction.java Fri Jul 16 14:21:50 2010 -0400
2465.3 @@ -1,7 +1,10 @@
2465.4 /*
2465.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2465.6 *
2465.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2465.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2465.9 + *
2465.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2465.11 + * Other names may be trademarks of their respective owners.
2465.12 *
2465.13 * The contents of this file are subject to the terms of either the GNU
2465.14 * General Public License Version 2 only ("GPL") or the Common
2465.15 @@ -13,9 +16,9 @@
2465.16 * specific language governing permissions and limitations under the
2465.17 * License. When distributing the software, include this License Header
2465.18 * Notice in each file and include the License file at
2465.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2465.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2465.21 * particular file as subject to the "Classpath" exception as provided
2465.22 - * by Sun in the GPL Version 2 section of the License file that
2465.23 + * by Oracle in the GPL Version 2 section of the License file that
2465.24 * accompanied this code. If applicable, add the following below the
2465.25 * License Header, with the fields enclosed by brackets [] replaced by
2465.26 * your own identifying information:
2466.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/Bundle-DT.properties Fri Jul 16 11:47:36 2010 -0400
2466.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/Bundle-DT.properties Fri Jul 16 14:21:50 2010 -0400
2466.3 @@ -1,6 +1,9 @@
2466.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2466.5 #
2466.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2466.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2466.8 +#
2466.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2466.10 +# Other names may be trademarks of their respective owners.
2466.11 #
2466.12 # The contents of this file are subject to the terms of either the GNU
2466.13 # General Public License Version 2 only ("GPL") or the Common
2466.14 @@ -12,9 +15,9 @@
2466.15 # specific language governing permissions and limitations under the
2466.16 # License. When distributing the software, include this License Header
2466.17 # Notice in each file and include the License file at
2466.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2466.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2466.20 # particular file as subject to the "Classpath" exception as provided
2466.21 -# by Sun in the GPL Version 2 section of the License file that
2466.22 +# by Oracle in the GPL Version 2 section of the License file that
2466.23 # accompanied this code. If applicable, add the following below the
2466.24 # License Header, with the fields enclosed by brackets [] replaced by
2466.25 # your own identifying information:
2467.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/ImageCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2467.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/ImageCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2467.3 @@ -1,7 +1,10 @@
2467.4 /*
2467.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2467.6 *
2467.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2467.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2467.9 + *
2467.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2467.11 + * Other names may be trademarks of their respective owners.
2467.12 *
2467.13 * The contents of this file are subject to the terms of either the GNU
2467.14 * General Public License Version 2 only ("GPL") or the Common
2467.15 @@ -13,9 +16,9 @@
2467.16 * specific language governing permissions and limitations under the
2467.17 * License. When distributing the software, include this License Header
2467.18 * Notice in each file and include the License file at
2467.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2467.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2467.21 * particular file as subject to the "Classpath" exception as provided
2467.22 - * by Sun in the GPL Version 2 section of the License file that
2467.23 + * by Oracle in the GPL Version 2 section of the License file that
2467.24 * accompanied this code. If applicable, add the following below the
2467.25 * License Header, with the fields enclosed by brackets [] replaced by
2467.26 * your own identifying information:
2468.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/ImageCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
2468.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/ImageCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
2468.3 @@ -1,7 +1,10 @@
2468.4 /*
2468.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2468.6 *
2468.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2468.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2468.9 + *
2468.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2468.11 + * Other names may be trademarks of their respective owners.
2468.12 *
2468.13 * The contents of this file are subject to the terms of either the GNU
2468.14 * General Public License Version 2 only ("GPL") or the Common
2468.15 @@ -13,9 +16,9 @@
2468.16 * specific language governing permissions and limitations under the
2468.17 * License. When distributing the software, include this License Header
2468.18 * Notice in each file and include the License file at
2468.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2468.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2468.21 * particular file as subject to the "Classpath" exception as provided
2468.22 - * by Sun in the GPL Version 2 section of the License file that
2468.23 + * by Oracle in the GPL Version 2 section of the License file that
2468.24 * accompanied this code. If applicable, add the following below the
2468.25 * License Header, with the fields enclosed by brackets [] replaced by
2468.26 * your own identifying information:
2469.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/ImageCustomizerPanel.java Fri Jul 16 11:47:36 2010 -0400
2469.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/ImageCustomizerPanel.java Fri Jul 16 14:21:50 2010 -0400
2469.3 @@ -1,7 +1,10 @@
2469.4 /*
2469.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2469.6 *
2469.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2469.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2469.9 + *
2469.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2469.11 + * Other names may be trademarks of their respective owners.
2469.12 *
2469.13 * The contents of this file are subject to the terms of either the GNU
2469.14 * General Public License Version 2 only ("GPL") or the Common
2469.15 @@ -13,9 +16,9 @@
2469.16 * specific language governing permissions and limitations under the
2469.17 * License. When distributing the software, include this License Header
2469.18 * Notice in each file and include the License file at
2469.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2469.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2469.21 * particular file as subject to the "Classpath" exception as provided
2469.22 - * by Sun in the GPL Version 2 section of the License file that
2469.23 + * by Oracle in the GPL Version 2 section of the License file that
2469.24 * accompanied this code. If applicable, add the following below the
2469.25 * License Header, with the fields enclosed by brackets [] replaced by
2469.26 * your own identifying information:
2470.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/ImageFilter.java Fri Jul 16 11:47:36 2010 -0400
2470.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/ImageFilter.java Fri Jul 16 14:21:50 2010 -0400
2470.3 @@ -1,7 +1,10 @@
2470.4 /*
2470.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2470.6 *
2470.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2470.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2470.9 + *
2470.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2470.11 + * Other names may be trademarks of their respective owners.
2470.12 *
2470.13 * The contents of this file are subject to the terms of either the GNU
2470.14 * General Public License Version 2 only ("GPL") or the Common
2470.15 @@ -13,9 +16,9 @@
2470.16 * specific language governing permissions and limitations under the
2470.17 * License. When distributing the software, include this License Header
2470.18 * Notice in each file and include the License file at
2470.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2470.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2470.21 * particular file as subject to the "Classpath" exception as provided
2470.22 - * by Sun in the GPL Version 2 section of the License file that
2470.23 + * by Oracle in the GPL Version 2 section of the License file that
2470.24 * accompanied this code. If applicable, add the following below the
2470.25 * License Header, with the fields enclosed by brackets [] replaced by
2470.26 * your own identifying information:
2471.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/OptionsListCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2471.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/OptionsListCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2471.3 @@ -1,7 +1,10 @@
2471.4 /*
2471.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2471.6 *
2471.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2471.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2471.9 + *
2471.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2471.11 + * Other names may be trademarks of their respective owners.
2471.12 *
2471.13 * The contents of this file are subject to the terms of either the GNU
2471.14 * General Public License Version 2 only ("GPL") or the Common
2471.15 @@ -13,9 +16,9 @@
2471.16 * specific language governing permissions and limitations under the
2471.17 * License. When distributing the software, include this License Header
2471.18 * Notice in each file and include the License file at
2471.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2471.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2471.21 * particular file as subject to the "Classpath" exception as provided
2471.22 - * by Sun in the GPL Version 2 section of the License file that
2471.23 + * by Oracle in the GPL Version 2 section of the License file that
2471.24 * accompanied this code. If applicable, add the following below the
2471.25 * License Header, with the fields enclosed by brackets [] replaced by
2471.26 * your own identifying information:
2472.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/OptionsListCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
2472.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/OptionsListCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
2472.3 @@ -1,7 +1,10 @@
2472.4 /*
2472.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2472.6 *
2472.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2472.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2472.9 + *
2472.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2472.11 + * Other names may be trademarks of their respective owners.
2472.12 *
2472.13 * The contents of this file are subject to the terms of either the GNU
2472.14 * General Public License Version 2 only ("GPL") or the Common
2472.15 @@ -13,9 +16,9 @@
2472.16 * specific language governing permissions and limitations under the
2472.17 * License. When distributing the software, include this License Header
2472.18 * Notice in each file and include the License file at
2472.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2472.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2472.21 * particular file as subject to the "Classpath" exception as provided
2472.22 - * by Sun in the GPL Version 2 section of the License file that
2472.23 + * by Oracle in the GPL Version 2 section of the License file that
2472.24 * accompanied this code. If applicable, add the following below the
2472.25 * License Header, with the fields enclosed by brackets [] replaced by
2472.26 * your own identifying information:
2473.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/OptionsListPanel.java Fri Jul 16 11:47:36 2010 -0400
2473.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/OptionsListPanel.java Fri Jul 16 14:21:50 2010 -0400
2473.3 @@ -1,7 +1,10 @@
2473.4 /*
2473.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2473.6 *
2473.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2473.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2473.9 + *
2473.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2473.11 + * Other names may be trademarks of their respective owners.
2473.12 *
2473.13 * The contents of this file are subject to the terms of either the GNU
2473.14 * General Public License Version 2 only ("GPL") or the Common
2473.15 @@ -13,9 +16,9 @@
2473.16 * specific language governing permissions and limitations under the
2473.17 * License. When distributing the software, include this License Header
2473.18 * Notice in each file and include the License file at
2473.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2473.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2473.21 * particular file as subject to the "Classpath" exception as provided
2473.22 - * by Sun in the GPL Version 2 section of the License file that
2473.23 + * by Oracle in the GPL Version 2 section of the License file that
2473.24 * accompanied this code. If applicable, add the following below the
2473.25 * License Header, with the fields enclosed by brackets [] replaced by
2473.26 * your own identifying information:
2474.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/TableBindToDataAction.java Fri Jul 16 11:47:36 2010 -0400
2474.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/TableBindToDataAction.java Fri Jul 16 14:21:50 2010 -0400
2474.3 @@ -1,7 +1,10 @@
2474.4 /*
2474.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2474.6 *
2474.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2474.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2474.9 + *
2474.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2474.11 + * Other names may be trademarks of their respective owners.
2474.12 *
2474.13 * The contents of this file are subject to the terms of either the GNU
2474.14 * General Public License Version 2 only ("GPL") or the Common
2474.15 @@ -13,9 +16,9 @@
2474.16 * specific language governing permissions and limitations under the
2474.17 * License. When distributing the software, include this License Header
2474.18 * Notice in each file and include the License file at
2474.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2474.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2474.21 * particular file as subject to the "Classpath" exception as provided
2474.22 - * by Sun in the GPL Version 2 section of the License file that
2474.23 + * by Oracle in the GPL Version 2 section of the License file that
2474.24 * accompanied this code. If applicable, add the following below the
2474.25 * License Header, with the fields enclosed by brackets [] replaced by
2474.26 * your own identifying information:
2475.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/TableBindToDataCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2475.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/TableBindToDataCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2475.3 @@ -1,7 +1,10 @@
2475.4 /*
2475.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2475.6 *
2475.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2475.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2475.9 + *
2475.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2475.11 + * Other names may be trademarks of their respective owners.
2475.12 *
2475.13 * The contents of this file are subject to the terms of either the GNU
2475.14 * General Public License Version 2 only ("GPL") or the Common
2475.15 @@ -13,9 +16,9 @@
2475.16 * specific language governing permissions and limitations under the
2475.17 * License. When distributing the software, include this License Header
2475.18 * Notice in each file and include the License file at
2475.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2475.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2475.21 * particular file as subject to the "Classpath" exception as provided
2475.22 - * by Sun in the GPL Version 2 section of the License file that
2475.23 + * by Oracle in the GPL Version 2 section of the License file that
2475.24 * accompanied this code. If applicable, add the following below the
2475.25 * License Header, with the fields enclosed by brackets [] replaced by
2475.26 * your own identifying information:
2476.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/TableCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2476.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/TableCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2476.3 @@ -1,7 +1,10 @@
2476.4 /*
2476.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2476.6 *
2476.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2476.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2476.9 + *
2476.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2476.11 + * Other names may be trademarks of their respective owners.
2476.12 *
2476.13 * The contents of this file are subject to the terms of either the GNU
2476.14 * General Public License Version 2 only ("GPL") or the Common
2476.15 @@ -13,9 +16,9 @@
2476.16 * specific language governing permissions and limitations under the
2476.17 * License. When distributing the software, include this License Header
2476.18 * Notice in each file and include the License file at
2476.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2476.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2476.21 * particular file as subject to the "Classpath" exception as provided
2476.22 - * by Sun in the GPL Version 2 section of the License file that
2476.23 + * by Oracle in the GPL Version 2 section of the License file that
2476.24 * accompanied this code. If applicable, add the following below the
2476.25 * License Header, with the fields enclosed by brackets [] replaced by
2476.26 * your own identifying information:
2477.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/TableCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
2477.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/TableCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
2477.3 @@ -1,7 +1,10 @@
2477.4 /*
2477.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2477.6 *
2477.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2477.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2477.9 + *
2477.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2477.11 + * Other names may be trademarks of their respective owners.
2477.12 *
2477.13 * The contents of this file are subject to the terms of either the GNU
2477.14 * General Public License Version 2 only ("GPL") or the Common
2477.15 @@ -13,9 +16,9 @@
2477.16 * specific language governing permissions and limitations under the
2477.17 * License. When distributing the software, include this License Header
2477.18 * Notice in each file and include the License file at
2477.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2477.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2477.21 * particular file as subject to the "Classpath" exception as provided
2477.22 - * by Sun in the GPL Version 2 section of the License file that
2477.23 + * by Oracle in the GPL Version 2 section of the License file that
2477.24 * accompanied this code. If applicable, add the following below the
2477.25 * License Header, with the fields enclosed by brackets [] replaced by
2477.26 * your own identifying information:
2478.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/Utils.java Fri Jul 16 11:47:36 2010 -0400
2478.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/Utils.java Fri Jul 16 14:21:50 2010 -0400
2478.3 @@ -1,7 +1,10 @@
2478.4 /*
2478.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2478.6 *
2478.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2478.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2478.9 + *
2478.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2478.11 + * Other names may be trademarks of their respective owners.
2478.12 *
2478.13 * The contents of this file are subject to the terms of either the GNU
2478.14 * General Public License Version 2 only ("GPL") or the Common
2478.15 @@ -13,9 +16,9 @@
2478.16 * specific language governing permissions and limitations under the
2478.17 * License. When distributing the software, include this License Header
2478.18 * Notice in each file and include the License file at
2478.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2478.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2478.21 * particular file as subject to the "Classpath" exception as provided
2478.22 - * by Sun in the GPL Version 2 section of the License file that
2478.23 + * by Oracle in the GPL Version 2 section of the License file that
2478.24 * accompanied this code. If applicable, add the following below the
2478.25 * License Header, with the fields enclosed by brackets [] replaced by
2478.26 * your own identifying information:
2479.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/AlertTypesDomain.java Fri Jul 16 11:47:36 2010 -0400
2479.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/AlertTypesDomain.java Fri Jul 16 14:21:50 2010 -0400
2479.3 @@ -1,7 +1,10 @@
2479.4 /*
2479.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2479.6 *
2479.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2479.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2479.9 + *
2479.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2479.11 + * Other names may be trademarks of their respective owners.
2479.12 *
2479.13 * The contents of this file are subject to the terms of either the GNU
2479.14 * General Public License Version 2 only ("GPL") or the Common
2479.15 @@ -13,9 +16,9 @@
2479.16 * specific language governing permissions and limitations under the
2479.17 * License. When distributing the software, include this License Header
2479.18 * Notice in each file and include the License file at
2479.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2479.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2479.21 * particular file as subject to the "Classpath" exception as provided
2479.22 - * by Sun in the GPL Version 2 section of the License file that
2479.23 + * by Oracle in the GPL Version 2 section of the License file that
2479.24 * accompanied this code. If applicable, add the following below the
2479.25 * License Header, with the fields enclosed by brackets [] replaced by
2479.26 * your own identifying information:
2480.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/Bundle-DT.properties Fri Jul 16 11:47:36 2010 -0400
2480.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/Bundle-DT.properties Fri Jul 16 14:21:50 2010 -0400
2480.3 @@ -1,6 +1,9 @@
2480.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2480.5 #
2480.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2480.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2480.8 +#
2480.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2480.10 +# Other names may be trademarks of their respective owners.
2480.11 #
2480.12 # The contents of this file are subject to the terms of either the GNU
2480.13 # General Public License Version 2 only ("GPL") or the Common
2480.14 @@ -12,9 +15,9 @@
2480.15 # specific language governing permissions and limitations under the
2480.16 # License. When distributing the software, include this License Header
2480.17 # Notice in each file and include the License file at
2480.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2480.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2480.20 # particular file as subject to the "Classpath" exception as provided
2480.21 -# by Sun in the GPL Version 2 section of the License file that
2480.22 +# by Oracle in the GPL Version 2 section of the License file that
2480.23 # accompanied this code. If applicable, add the following below the
2480.24 # License Header, with the fields enclosed by brackets [] replaced by
2480.25 # your own identifying information:
2481.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/ClientIdsDomain.java Fri Jul 16 11:47:36 2010 -0400
2481.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/ClientIdsDomain.java Fri Jul 16 14:21:50 2010 -0400
2481.3 @@ -1,7 +1,10 @@
2481.4 /*
2481.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2481.6 *
2481.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2481.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2481.9 + *
2481.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2481.11 + * Other names may be trademarks of their respective owners.
2481.12 *
2481.13 * The contents of this file are subject to the terms of either the GNU
2481.14 * General Public License Version 2 only ("GPL") or the Common
2481.15 @@ -13,9 +16,9 @@
2481.16 * specific language governing permissions and limitations under the
2481.17 * License. When distributing the software, include this License Header
2481.18 * Notice in each file and include the License file at
2481.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2481.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2481.21 * particular file as subject to the "Classpath" exception as provided
2481.22 - * by Sun in the GPL Version 2 section of the License file that
2481.23 + * by Oracle in the GPL Version 2 section of the License file that
2481.24 * accompanied this code. If applicable, add the following below the
2481.25 * License Header, with the fields enclosed by brackets [] replaced by
2481.26 * your own identifying information:
2482.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/EventClientIdsDomain.java Fri Jul 16 11:47:36 2010 -0400
2482.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/EventClientIdsDomain.java Fri Jul 16 14:21:50 2010 -0400
2482.3 @@ -1,7 +1,10 @@
2482.4 /*
2482.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2482.6 *
2482.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2482.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2482.9 + *
2482.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2482.11 + * Other names may be trademarks of their respective owners.
2482.12 *
2482.13 * The contents of this file are subject to the terms of either the GNU
2482.14 * General Public License Version 2 only ("GPL") or the Common
2482.15 @@ -13,9 +16,9 @@
2482.16 * specific language governing permissions and limitations under the
2482.17 * License. When distributing the software, include this License Header
2482.18 * Notice in each file and include the License file at
2482.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2482.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2482.21 * particular file as subject to the "Classpath" exception as provided
2482.22 - * by Sun in the GPL Version 2 section of the License file that
2482.23 + * by Oracle in the GPL Version 2 section of the License file that
2482.24 * accompanied this code. If applicable, add the following below the
2482.25 * License Header, with the fields enclosed by brackets [] replaced by
2482.26 * your own identifying information:
2483.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/FileTypesDomain.java Fri Jul 16 11:47:36 2010 -0400
2483.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/FileTypesDomain.java Fri Jul 16 14:21:50 2010 -0400
2483.3 @@ -1,7 +1,10 @@
2483.4 /*
2483.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2483.6 *
2483.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2483.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2483.9 + *
2483.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2483.11 + * Other names may be trademarks of their respective owners.
2483.12 *
2483.13 * The contents of this file are subject to the terms of either the GNU
2483.14 * General Public License Version 2 only ("GPL") or the Common
2483.15 @@ -13,9 +16,9 @@
2483.16 * specific language governing permissions and limitations under the
2483.17 * License. When distributing the software, include this License Header
2483.18 * Notice in each file and include the License file at
2483.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2483.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2483.21 * particular file as subject to the "Classpath" exception as provided
2483.22 - * by Sun in the GPL Version 2 section of the License file that
2483.23 + * by Oracle in the GPL Version 2 section of the License file that
2483.24 * accompanied this code. If applicable, add the following below the
2483.25 * License Header, with the fields enclosed by brackets [] replaced by
2483.26 * your own identifying information:
2484.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/JSF1_1ConverterPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2484.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/JSF1_1ConverterPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2484.3 @@ -1,7 +1,10 @@
2484.4 /*
2484.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2484.6 *
2484.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2484.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2484.9 + *
2484.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2484.11 + * Other names may be trademarks of their respective owners.
2484.12 *
2484.13 * The contents of this file are subject to the terms of either the GNU
2484.14 * General Public License Version 2 only ("GPL") or the Common
2484.15 @@ -13,9 +16,9 @@
2484.16 * specific language governing permissions and limitations under the
2484.17 * License. When distributing the software, include this License Header
2484.18 * Notice in each file and include the License file at
2484.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2484.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2484.21 * particular file as subject to the "Classpath" exception as provided
2484.22 - * by Sun in the GPL Version 2 section of the License file that
2484.23 + * by Oracle in the GPL Version 2 section of the License file that
2484.24 * accompanied this code. If applicable, add the following below the
2484.25 * License Header, with the fields enclosed by brackets [] replaced by
2484.26 * your own identifying information:
2485.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/JSF1_1ValidatorPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2485.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/JSF1_1ValidatorPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2485.3 @@ -1,7 +1,10 @@
2485.4 /*
2485.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2485.6 *
2485.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2485.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2485.9 + *
2485.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2485.11 + * Other names may be trademarks of their respective owners.
2485.12 *
2485.13 * The contents of this file are subject to the terms of either the GNU
2485.14 * General Public License Version 2 only ("GPL") or the Common
2485.15 @@ -13,9 +16,9 @@
2485.16 * specific language governing permissions and limitations under the
2485.17 * License. When distributing the software, include this License Header
2485.18 * Notice in each file and include the License file at
2485.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2485.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2485.21 * particular file as subject to the "Classpath" exception as provided
2485.22 - * by Sun in the GPL Version 2 section of the License file that
2485.23 + * by Oracle in the GPL Version 2 section of the License file that
2485.24 * accompanied this code. If applicable, add the following below the
2485.25 * License Header, with the fields enclosed by brackets [] replaced by
2485.26 * your own identifying information:
2486.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/LabelLevelsDomain.java Fri Jul 16 11:47:36 2010 -0400
2486.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/LabelLevelsDomain.java Fri Jul 16 14:21:50 2010 -0400
2486.3 @@ -1,7 +1,10 @@
2486.4 /*
2486.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2486.6 *
2486.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2486.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2486.9 + *
2486.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2486.11 + * Other names may be trademarks of their respective owners.
2486.12 *
2486.13 * The contents of this file are subject to the terms of either the GNU
2486.14 * General Public License Version 2 only ("GPL") or the Common
2486.15 @@ -13,9 +16,9 @@
2486.16 * specific language governing permissions and limitations under the
2486.17 * License. When distributing the software, include this License Header
2486.18 * Notice in each file and include the License file at
2486.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2486.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2486.21 * particular file as subject to the "Classpath" exception as provided
2486.22 - * by Sun in the GPL Version 2 section of the License file that
2486.23 + * by Oracle in the GPL Version 2 section of the License file that
2486.24 * accompanied this code. If applicable, add the following below the
2486.25 * License Header, with the fields enclosed by brackets [] replaced by
2486.26 * your own identifying information:
2487.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/OptionsPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2487.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/OptionsPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2487.3 @@ -1,7 +1,10 @@
2487.4 /*
2487.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2487.6 *
2487.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2487.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2487.9 + *
2487.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2487.11 + * Other names may be trademarks of their respective owners.
2487.12 *
2487.13 * The contents of this file are subject to the terms of either the GNU
2487.14 * General Public License Version 2 only ("GPL") or the Common
2487.15 @@ -13,9 +16,9 @@
2487.16 * specific language governing permissions and limitations under the
2487.17 * License. When distributing the software, include this License Header
2487.18 * Notice in each file and include the License file at
2487.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2487.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2487.21 * particular file as subject to the "Classpath" exception as provided
2487.22 - * by Sun in the GPL Version 2 section of the License file that
2487.23 + * by Oracle in the GPL Version 2 section of the License file that
2487.24 * accompanied this code. If applicable, add the following below the
2487.25 * License Header, with the fields enclosed by brackets [] replaced by
2487.26 * your own identifying information:
2488.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/PageAlertTypesDomain.java Fri Jul 16 11:47:36 2010 -0400
2488.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/PageAlertTypesDomain.java Fri Jul 16 14:21:50 2010 -0400
2488.3 @@ -1,7 +1,10 @@
2488.4 /*
2488.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2488.6 *
2488.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2488.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2488.9 + *
2488.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2488.11 + * Other names may be trademarks of their respective owners.
2488.12 *
2488.13 * The contents of this file are subject to the terms of either the GNU
2488.14 * General Public License Version 2 only ("GPL") or the Common
2488.15 @@ -13,9 +16,9 @@
2488.16 * specific language governing permissions and limitations under the
2488.17 * License. When distributing the software, include this License Header
2488.18 * Notice in each file and include the License file at
2488.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2488.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2488.21 * particular file as subject to the "Classpath" exception as provided
2488.22 - * by Sun in the GPL Version 2 section of the License file that
2488.23 + * by Oracle in the GPL Version 2 section of the License file that
2488.24 * accompanied this code. If applicable, add the following below the
2488.25 * License Header, with the fields enclosed by brackets [] replaced by
2488.26 * your own identifying information:
2489.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/RbCbSelectedPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2489.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/RbCbSelectedPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2489.3 @@ -1,7 +1,10 @@
2489.4 /*
2489.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2489.6 *
2489.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2489.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2489.9 + *
2489.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2489.11 + * Other names may be trademarks of their respective owners.
2489.12 *
2489.13 * The contents of this file are subject to the terms of either the GNU
2489.14 * General Public License Version 2 only ("GPL") or the Common
2489.15 @@ -13,9 +16,9 @@
2489.16 * specific language governing permissions and limitations under the
2489.17 * License. When distributing the software, include this License Header
2489.18 * Notice in each file and include the License file at
2489.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2489.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2489.21 * particular file as subject to the "Classpath" exception as provided
2489.22 - * by Sun in the GPL Version 2 section of the License file that
2489.23 + * by Oracle in the GPL Version 2 section of the License file that
2489.24 * accompanied this code. If applicable, add the following below the
2489.25 * License Header, with the fields enclosed by brackets [] replaced by
2489.26 * your own identifying information:
2490.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/RequiredFieldsPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2490.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/RequiredFieldsPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2490.3 @@ -1,7 +1,10 @@
2490.4 /*
2490.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2490.6 *
2490.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2490.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2490.9 + *
2490.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2490.11 + * Other names may be trademarks of their respective owners.
2490.12 *
2490.13 * The contents of this file are subject to the terms of either the GNU
2490.14 * General Public License Version 2 only ("GPL") or the Common
2490.15 @@ -13,9 +16,9 @@
2490.16 * specific language governing permissions and limitations under the
2490.17 * License. When distributing the software, include this License Header
2490.18 * Notice in each file and include the License file at
2490.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2490.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2490.21 * particular file as subject to the "Classpath" exception as provided
2490.22 - * by Sun in the GPL Version 2 section of the License file that
2490.23 + * by Oracle in the GPL Version 2 section of the License file that
2490.24 * accompanied this code. If applicable, add the following below the
2490.25 * License Header, with the fields enclosed by brackets [] replaced by
2490.26 * your own identifying information:
2491.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/SelectedValuesPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2491.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/SelectedValuesPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2491.3 @@ -1,7 +1,10 @@
2491.4 /*
2491.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2491.6 *
2491.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2491.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2491.9 + *
2491.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2491.11 + * Other names may be trademarks of their respective owners.
2491.12 *
2491.13 * The contents of this file are subject to the terms of either the GNU
2491.14 * General Public License Version 2 only ("GPL") or the Common
2491.15 @@ -13,9 +16,9 @@
2491.16 * specific language governing permissions and limitations under the
2491.17 * License. When distributing the software, include this License Header
2491.18 * Notice in each file and include the License file at
2491.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2491.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2491.21 * particular file as subject to the "Classpath" exception as provided
2491.22 - * by Sun in the GPL Version 2 section of the License file that
2491.23 + * by Oracle in the GPL Version 2 section of the License file that
2491.24 * accompanied this code. If applicable, add the following below the
2491.25 * License Header, with the fields enclosed by brackets [] replaced by
2491.26 * your own identifying information:
2492.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/SortFieldDomain.java Fri Jul 16 11:47:36 2010 -0400
2492.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/SortFieldDomain.java Fri Jul 16 14:21:50 2010 -0400
2492.3 @@ -1,7 +1,10 @@
2492.4 /*
2492.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2492.6 *
2492.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2492.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2492.9 + *
2492.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2492.11 + * Other names may be trademarks of their respective owners.
2492.12 *
2492.13 * The contents of this file are subject to the terms of either the GNU
2492.14 * General Public License Version 2 only ("GPL") or the Common
2492.15 @@ -13,9 +16,9 @@
2492.16 * specific language governing permissions and limitations under the
2492.17 * License. When distributing the software, include this License Header
2492.18 * Notice in each file and include the License file at
2492.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2492.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2492.21 * particular file as subject to the "Classpath" exception as provided
2492.22 - * by Sun in the GPL Version 2 section of the License file that
2492.23 + * by Oracle in the GPL Version 2 section of the License file that
2492.24 * accompanied this code. If applicable, add the following below the
2492.25 * License Header, with the fields enclosed by brackets [] replaced by
2492.26 * your own identifying information:
2493.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/SunWebUrlPropertyEditor.java Fri Jul 16 11:47:36 2010 -0400
2493.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/SunWebUrlPropertyEditor.java Fri Jul 16 14:21:50 2010 -0400
2493.3 @@ -1,7 +1,10 @@
2493.4 /*
2493.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2493.6 *
2493.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2493.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2493.9 + *
2493.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2493.11 + * Other names may be trademarks of their respective owners.
2493.12 *
2493.13 * The contents of this file are subject to the terms of either the GNU
2493.14 * General Public License Version 2 only ("GPL") or the Common
2493.15 @@ -13,9 +16,9 @@
2493.16 * specific language governing permissions and limitations under the
2493.17 * License. When distributing the software, include this License Header
2493.18 * Notice in each file and include the License file at
2493.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2493.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2493.21 * particular file as subject to the "Classpath" exception as provided
2493.22 - * by Sun in the GPL Version 2 section of the License file that
2493.23 + * by Oracle in the GPL Version 2 section of the License file that
2493.24 * accompanied this code. If applicable, add the following below the
2493.25 * License Header, with the fields enclosed by brackets [] replaced by
2493.26 * your own identifying information:
2494.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/TabIdsDomain.java Fri Jul 16 11:47:36 2010 -0400
2494.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/TabIdsDomain.java Fri Jul 16 14:21:50 2010 -0400
2494.3 @@ -1,7 +1,10 @@
2494.4 /*
2494.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2494.6 *
2494.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2494.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2494.9 + *
2494.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2494.11 + * Other names may be trademarks of their respective owners.
2494.12 *
2494.13 * The contents of this file are subject to the terms of either the GNU
2494.14 * General Public License Version 2 only ("GPL") or the Common
2494.15 @@ -13,9 +16,9 @@
2494.16 * specific language governing permissions and limitations under the
2494.17 * License. When distributing the software, include this License Header
2494.18 * Notice in each file and include the License file at
2494.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2494.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2494.21 * particular file as subject to the "Classpath" exception as provided
2494.22 - * by Sun in the GPL Version 2 section of the License file that
2494.23 + * by Oracle in the GPL Version 2 section of the License file that
2494.24 * accompanied this code. If applicable, add the following below the
2494.25 * License Header, with the fields enclosed by brackets [] replaced by
2494.26 * your own identifying information:
2495.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/ThemeIconsDomain.java Fri Jul 16 11:47:36 2010 -0400
2495.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/propertyeditors/ThemeIconsDomain.java Fri Jul 16 14:21:50 2010 -0400
2495.3 @@ -1,7 +1,10 @@
2495.4 /*
2495.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2495.6 *
2495.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2495.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2495.9 + *
2495.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2495.11 + * Other names may be trademarks of their respective owners.
2495.12 *
2495.13 * The contents of this file are subject to the terms of either the GNU
2495.14 * General Public License Version 2 only ("GPL") or the Common
2495.15 @@ -13,9 +16,9 @@
2495.16 * specific language governing permissions and limitations under the
2495.17 * License. When distributing the software, include this License Header
2495.18 * Notice in each file and include the License file at
2495.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2495.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2495.21 * particular file as subject to the "Classpath" exception as provided
2495.22 - * by Sun in the GPL Version 2 section of the License file that
2495.23 + * by Oracle in the GPL Version 2 section of the License file that
2495.24 * accompanied this code. If applicable, add the following below the
2495.25 * License Header, with the fields enclosed by brackets [] replaced by
2495.26 * your own identifying information:
2496.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2496.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2496.3 @@ -1,6 +1,9 @@
2496.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2496.5 #
2496.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2496.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2496.8 +#
2496.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2496.10 +# Other names may be trademarks of their respective owners.
2496.11 #
2496.12 # The contents of this file are subject to the terms of either the GNU
2496.13 # General Public License Version 2 only ("GPL") or the Common
2496.14 @@ -12,9 +15,9 @@
2496.15 # specific language governing permissions and limitations under the
2496.16 # License. When distributing the software, include this License Header
2496.17 # Notice in each file and include the License file at
2496.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2496.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2496.20 # particular file as subject to the "Classpath" exception as provided
2496.21 -# by Sun in the GPL Version 2 section of the License file that
2496.22 +# by Oracle in the GPL Version 2 section of the License file that
2496.23 # accompanied this code. If applicable, add the following below the
2496.24 # License Header, with the fields enclosed by brackets [] replaced by
2496.25 # your own identifying information:
2497.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableBindToDataPanel.java Fri Jul 16 11:47:36 2010 -0400
2497.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableBindToDataPanel.java Fri Jul 16 14:21:50 2010 -0400
2497.3 @@ -1,7 +1,10 @@
2497.4 /*
2497.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2497.6 *
2497.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2497.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2497.9 + *
2497.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2497.11 + * Other names may be trademarks of their respective owners.
2497.12 *
2497.13 * The contents of this file are subject to the terms of either the GNU
2497.14 * General Public License Version 2 only ("GPL") or the Common
2497.15 @@ -13,9 +16,9 @@
2497.16 * specific language governing permissions and limitations under the
2497.17 * License. When distributing the software, include this License Header
2497.18 * Notice in each file and include the License file at
2497.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2497.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2497.21 * particular file as subject to the "Classpath" exception as provided
2497.22 - * by Sun in the GPL Version 2 section of the License file that
2497.23 + * by Oracle in the GPL Version 2 section of the License file that
2497.24 * accompanied this code. If applicable, add the following below the
2497.25 * License Header, with the fields enclosed by brackets [] replaced by
2497.26 * your own identifying information:
2498.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableColumnDesignState.java Fri Jul 16 11:47:36 2010 -0400
2498.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableColumnDesignState.java Fri Jul 16 14:21:50 2010 -0400
2498.3 @@ -1,7 +1,10 @@
2498.4 /*
2498.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2498.6 *
2498.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2498.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2498.9 + *
2498.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2498.11 + * Other names may be trademarks of their respective owners.
2498.12 *
2498.13 * The contents of this file are subject to the terms of either the GNU
2498.14 * General Public License Version 2 only ("GPL") or the Common
2498.15 @@ -13,9 +16,9 @@
2498.16 * specific language governing permissions and limitations under the
2498.17 * License. When distributing the software, include this License Header
2498.18 * Notice in each file and include the License file at
2498.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2498.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2498.21 * particular file as subject to the "Classpath" exception as provided
2498.22 - * by Sun in the GPL Version 2 section of the License file that
2498.23 + * by Oracle in the GPL Version 2 section of the License file that
2498.24 * accompanied this code. If applicable, add the following below the
2498.25 * License Header, with the fields enclosed by brackets [] replaced by
2498.26 * your own identifying information:
2499.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableCustomizerMainPanel.java Fri Jul 16 11:47:36 2010 -0400
2499.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableCustomizerMainPanel.java Fri Jul 16 14:21:50 2010 -0400
2499.3 @@ -1,7 +1,10 @@
2499.4 /*
2499.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2499.6 *
2499.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2499.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2499.9 + *
2499.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2499.11 + * Other names may be trademarks of their respective owners.
2499.12 *
2499.13 * The contents of this file are subject to the terms of either the GNU
2499.14 * General Public License Version 2 only ("GPL") or the Common
2499.15 @@ -13,9 +16,9 @@
2499.16 * specific language governing permissions and limitations under the
2499.17 * License. When distributing the software, include this License Header
2499.18 * Notice in each file and include the License file at
2499.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2499.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2499.21 * particular file as subject to the "Classpath" exception as provided
2499.22 - * by Sun in the GPL Version 2 section of the License file that
2499.23 + * by Oracle in the GPL Version 2 section of the License file that
2499.24 * accompanied this code. If applicable, add the following below the
2499.25 * License Header, with the fields enclosed by brackets [] replaced by
2499.26 * your own identifying information:
2500.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableDataProviderDesignState.java Fri Jul 16 11:47:36 2010 -0400
2500.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableDataProviderDesignState.java Fri Jul 16 14:21:50 2010 -0400
2500.3 @@ -1,7 +1,10 @@
2500.4 /*
2500.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2500.6 *
2500.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2500.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2500.9 + *
2500.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2500.11 + * Other names may be trademarks of their respective owners.
2500.12 *
2500.13 * The contents of this file are subject to the terms of either the GNU
2500.14 * General Public License Version 2 only ("GPL") or the Common
2500.15 @@ -13,9 +16,9 @@
2500.16 * specific language governing permissions and limitations under the
2500.17 * License. When distributing the software, include this License Header
2500.18 * Notice in each file and include the License file at
2500.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2500.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2500.21 * particular file as subject to the "Classpath" exception as provided
2500.22 - * by Sun in the GPL Version 2 section of the License file that
2500.23 + * by Oracle in the GPL Version 2 section of the License file that
2500.24 * accompanied this code. If applicable, add the following below the
2500.25 * License Header, with the fields enclosed by brackets [] replaced by
2500.26 * your own identifying information:
2501.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableDesignHelper.java Fri Jul 16 11:47:36 2010 -0400
2501.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableDesignHelper.java Fri Jul 16 14:21:50 2010 -0400
2501.3 @@ -1,7 +1,10 @@
2501.4 /*
2501.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2501.6 *
2501.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2501.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2501.9 + *
2501.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2501.11 + * Other names may be trademarks of their respective owners.
2501.12 *
2501.13 * The contents of this file are subject to the terms of either the GNU
2501.14 * General Public License Version 2 only ("GPL") or the Common
2501.15 @@ -13,9 +16,9 @@
2501.16 * specific language governing permissions and limitations under the
2501.17 * License. When distributing the software, include this License Header
2501.18 * Notice in each file and include the License file at
2501.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2501.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2501.21 * particular file as subject to the "Classpath" exception as provided
2501.22 - * by Sun in the GPL Version 2 section of the License file that
2501.23 + * by Oracle in the GPL Version 2 section of the License file that
2501.24 * accompanied this code. If applicable, add the following below the
2501.25 * License Header, with the fields enclosed by brackets [] replaced by
2501.26 * your own identifying information:
2502.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableDesignState.java Fri Jul 16 11:47:36 2010 -0400
2502.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableDesignState.java Fri Jul 16 14:21:50 2010 -0400
2502.3 @@ -1,7 +1,10 @@
2502.4 /*
2502.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2502.6 *
2502.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2502.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2502.9 + *
2502.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2502.11 + * Other names may be trademarks of their respective owners.
2502.12 *
2502.13 * The contents of this file are subject to the terms of either the GNU
2502.14 * General Public License Version 2 only ("GPL") or the Common
2502.15 @@ -13,9 +16,9 @@
2502.16 * specific language governing permissions and limitations under the
2502.17 * License. When distributing the software, include this License Header
2502.18 * Notice in each file and include the License file at
2502.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2502.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2502.21 * particular file as subject to the "Classpath" exception as provided
2502.22 - * by Sun in the GPL Version 2 section of the License file that
2502.23 + * by Oracle in the GPL Version 2 section of the License file that
2502.24 * accompanied this code. If applicable, add the following below the
2502.25 * License Header, with the fields enclosed by brackets [] replaced by
2502.26 * your own identifying information:
2503.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableRowGroupDesignState.java Fri Jul 16 11:47:36 2010 -0400
2503.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/table/TableRowGroupDesignState.java Fri Jul 16 14:21:50 2010 -0400
2503.3 @@ -1,7 +1,10 @@
2503.4 /*
2503.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2503.6 *
2503.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2503.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2503.9 + *
2503.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2503.11 + * Other names may be trademarks of their respective owners.
2503.12 *
2503.13 * The contents of this file are subject to the terms of either the GNU
2503.14 * General Public License Version 2 only ("GPL") or the Common
2503.15 @@ -13,9 +16,9 @@
2503.16 * specific language governing permissions and limitations under the
2503.17 * License. When distributing the software, include this License Header
2503.18 * Notice in each file and include the License file at
2503.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2503.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2503.21 * particular file as subject to the "Classpath" exception as provided
2503.22 - * by Sun in the GPL Version 2 section of the License file that
2503.23 + * by Oracle in the GPL Version 2 section of the License file that
2503.24 * accompanied this code. If applicable, add the following below the
2503.25 * License Header, with the fields enclosed by brackets [] replaced by
2503.26 * your own identifying information:
2504.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/util/Bundle-DT.properties Fri Jul 16 11:47:36 2010 -0400
2504.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/util/Bundle-DT.properties Fri Jul 16 14:21:50 2010 -0400
2504.3 @@ -1,6 +1,9 @@
2504.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2504.5 #
2504.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2504.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2504.8 +#
2504.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2504.10 +# Other names may be trademarks of their respective owners.
2504.11 #
2504.12 # The contents of this file are subject to the terms of either the GNU
2504.13 # General Public License Version 2 only ("GPL") or the Common
2504.14 @@ -12,9 +15,9 @@
2504.15 # specific language governing permissions and limitations under the
2504.16 # License. When distributing the software, include this License Header
2504.17 # Notice in each file and include the License file at
2504.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2504.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2504.20 # particular file as subject to the "Classpath" exception as provided
2504.21 -# by Sun in the GPL Version 2 section of the License file that
2504.22 +# by Oracle in the GPL Version 2 section of the License file that
2504.23 # accompanied this code. If applicable, add the following below the
2504.24 # License Header, with the fields enclosed by brackets [] replaced by
2504.25 # your own identifying information:
2505.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/util/DesignMessageUtil.java Fri Jul 16 11:47:36 2010 -0400
2505.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/util/DesignMessageUtil.java Fri Jul 16 14:21:50 2010 -0400
2505.3 @@ -1,7 +1,10 @@
2505.4 /*
2505.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2505.6 *
2505.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2505.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2505.9 + *
2505.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2505.11 + * Other names may be trademarks of their respective owners.
2505.12 *
2505.13 * The contents of this file are subject to the terms of either the GNU
2505.14 * General Public License Version 2 only ("GPL") or the Common
2505.15 @@ -13,9 +16,9 @@
2505.16 * specific language governing permissions and limitations under the
2505.17 * License. When distributing the software, include this License Header
2505.18 * Notice in each file and include the License file at
2505.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2505.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2505.21 * particular file as subject to the "Classpath" exception as provided
2505.22 - * by Sun in the GPL Version 2 section of the License file that
2505.23 + * by Oracle in the GPL Version 2 section of the License file that
2505.24 * accompanied this code. If applicable, add the following below the
2505.25 * License Header, with the fields enclosed by brackets [] replaced by
2505.26 * your own identifying information:
2506.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/util/DesignUtil.java Fri Jul 16 11:47:36 2010 -0400
2506.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/util/DesignUtil.java Fri Jul 16 14:21:50 2010 -0400
2506.3 @@ -1,7 +1,10 @@
2506.4 /*
2506.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2506.6 *
2506.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2506.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2506.9 + *
2506.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2506.11 + * Other names may be trademarks of their respective owners.
2506.12 *
2506.13 * The contents of this file are subject to the terms of either the GNU
2506.14 * General Public License Version 2 only ("GPL") or the Common
2506.15 @@ -13,9 +16,9 @@
2506.16 * specific language governing permissions and limitations under the
2506.17 * License. When distributing the software, include this License Header
2506.18 * Notice in each file and include the License file at
2506.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2506.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2506.21 * particular file as subject to the "Classpath" exception as provided
2506.22 - * by Sun in the GPL Version 2 section of the License file that
2506.23 + * by Oracle in the GPL Version 2 section of the License file that
2506.24 * accompanied this code. If applicable, add the following below the
2506.25 * License Header, with the fields enclosed by brackets [] replaced by
2506.26 * your own identifying information:
2507.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/EditVirtualFormsCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2507.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/EditVirtualFormsCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2507.3 @@ -1,7 +1,10 @@
2507.4 /*
2507.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2507.6 *
2507.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2507.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2507.9 + *
2507.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2507.11 + * Other names may be trademarks of their respective owners.
2507.12 *
2507.13 * The contents of this file are subject to the terms of either the GNU
2507.14 * General Public License Version 2 only ("GPL") or the Common
2507.15 @@ -13,9 +16,9 @@
2507.16 * specific language governing permissions and limitations under the
2507.17 * License. When distributing the software, include this License Header
2507.18 * Notice in each file and include the License file at
2507.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2507.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2507.21 * particular file as subject to the "Classpath" exception as provided
2507.22 - * by Sun in the GPL Version 2 section of the License file that
2507.23 + * by Oracle in the GPL Version 2 section of the License file that
2507.24 * accompanied this code. If applicable, add the following below the
2507.25 * License Header, with the fields enclosed by brackets [] replaced by
2507.26 * your own identifying information:
2508.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/EditVirtualFormsCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
2508.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/EditVirtualFormsCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
2508.3 @@ -1,7 +1,10 @@
2508.4 /*
2508.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2508.6 *
2508.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2508.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2508.9 + *
2508.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2508.11 + * Other names may be trademarks of their respective owners.
2508.12 *
2508.13 * The contents of this file are subject to the terms of either the GNU
2508.14 * General Public License Version 2 only ("GPL") or the Common
2508.15 @@ -13,9 +16,9 @@
2508.16 * specific language governing permissions and limitations under the
2508.17 * License. When distributing the software, include this License Header
2508.18 * Notice in each file and include the License file at
2508.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2508.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2508.21 * particular file as subject to the "Classpath" exception as provided
2508.22 - * by Sun in the GPL Version 2 section of the License file that
2508.23 + * by Oracle in the GPL Version 2 section of the License file that
2508.24 * accompanied this code. If applicable, add the following below the
2508.25 * License Header, with the fields enclosed by brackets [] replaced by
2508.26 * your own identifying information:
2509.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/EditVirtualFormsCustomizerPanel.java Fri Jul 16 11:47:36 2010 -0400
2509.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/EditVirtualFormsCustomizerPanel.java Fri Jul 16 14:21:50 2010 -0400
2509.3 @@ -1,7 +1,10 @@
2509.4 /*
2509.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2509.6 *
2509.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2509.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2509.9 + *
2509.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2509.11 + * Other names may be trademarks of their respective owners.
2509.12 *
2509.13 * The contents of this file are subject to the terms of either the GNU
2509.14 * General Public License Version 2 only ("GPL") or the Common
2509.15 @@ -13,9 +16,9 @@
2509.16 * specific language governing permissions and limitations under the
2509.17 * License. When distributing the software, include this License Header
2509.18 * Notice in each file and include the License file at
2509.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2509.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2509.21 * particular file as subject to the "Classpath" exception as provided
2509.22 - * by Sun in the GPL Version 2 section of the License file that
2509.23 + * by Oracle in the GPL Version 2 section of the License file that
2509.24 * accompanied this code. If applicable, add the following below the
2509.25 * License Header, with the fields enclosed by brackets [] replaced by
2509.26 * your own identifying information:
2510.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/HomogonousCellRenderer.java Fri Jul 16 11:47:36 2010 -0400
2510.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/HomogonousCellRenderer.java Fri Jul 16 14:21:50 2010 -0400
2510.3 @@ -1,7 +1,10 @@
2510.4 /*
2510.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2510.6 *
2510.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2510.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2510.9 + *
2510.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2510.11 + * Other names may be trademarks of their respective owners.
2510.12 *
2510.13 * The contents of this file are subject to the terms of either the GNU
2510.14 * General Public License Version 2 only ("GPL") or the Common
2510.15 @@ -13,9 +16,9 @@
2510.16 * specific language governing permissions and limitations under the
2510.17 * License. When distributing the software, include this License Header
2510.18 * Notice in each file and include the License file at
2510.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2510.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2510.21 * particular file as subject to the "Classpath" exception as provided
2510.22 - * by Sun in the GPL Version 2 section of the License file that
2510.23 + * by Oracle in the GPL Version 2 section of the License file that
2510.24 * accompanied this code. If applicable, add the following below the
2510.25 * License Header, with the fields enclosed by brackets [] replaced by
2510.26 * your own identifying information:
2511.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/TextFieldCellEditor.java Fri Jul 16 11:47:36 2010 -0400
2511.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/TextFieldCellEditor.java Fri Jul 16 14:21:50 2010 -0400
2511.3 @@ -1,7 +1,10 @@
2511.4 /*
2511.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2511.6 *
2511.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2511.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2511.9 + *
2511.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2511.11 + * Other names may be trademarks of their respective owners.
2511.12 *
2511.13 * The contents of this file are subject to the terms of either the GNU
2511.14 * General Public License Version 2 only ("GPL") or the Common
2511.15 @@ -13,9 +16,9 @@
2511.16 * specific language governing permissions and limitations under the
2511.17 * License. When distributing the software, include this License Header
2511.18 * Notice in each file and include the License file at
2511.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2511.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2511.21 * particular file as subject to the "Classpath" exception as provided
2511.22 - * by Sun in the GPL Version 2 section of the License file that
2511.23 + * by Oracle in the GPL Version 2 section of the License file that
2511.24 * accompanied this code. If applicable, add the following below the
2511.25 * License Header, with the fields enclosed by brackets [] replaced by
2511.26 * your own identifying information:
2512.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/VirtualFormsCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2512.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/VirtualFormsCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2512.3 @@ -1,7 +1,10 @@
2512.4 /*
2512.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2512.6 *
2512.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2512.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2512.9 + *
2512.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2512.11 + * Other names may be trademarks of their respective owners.
2512.12 *
2512.13 * The contents of this file are subject to the terms of either the GNU
2512.14 * General Public License Version 2 only ("GPL") or the Common
2512.15 @@ -13,9 +16,9 @@
2512.16 * specific language governing permissions and limitations under the
2512.17 * License. When distributing the software, include this License Header
2512.18 * Notice in each file and include the License file at
2512.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2512.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2512.21 * particular file as subject to the "Classpath" exception as provided
2512.22 - * by Sun in the GPL Version 2 section of the License file that
2512.23 + * by Oracle in the GPL Version 2 section of the License file that
2512.24 * accompanied this code. If applicable, add the following below the
2512.25 * License Header, with the fields enclosed by brackets [] replaced by
2512.26 * your own identifying information:
2513.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/VirtualFormsCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
2513.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/VirtualFormsCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
2513.3 @@ -1,7 +1,10 @@
2513.4 /*
2513.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2513.6 *
2513.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2513.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2513.9 + *
2513.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2513.11 + * Other names may be trademarks of their respective owners.
2513.12 *
2513.13 * The contents of this file are subject to the terms of either the GNU
2513.14 * General Public License Version 2 only ("GPL") or the Common
2513.15 @@ -13,9 +16,9 @@
2513.16 * specific language governing permissions and limitations under the
2513.17 * License. When distributing the software, include this License Header
2513.18 * Notice in each file and include the License file at
2513.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2513.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2513.21 * particular file as subject to the "Classpath" exception as provided
2513.22 - * by Sun in the GPL Version 2 section of the License file that
2513.23 + * by Oracle in the GPL Version 2 section of the License file that
2513.24 * accompanied this code. If applicable, add the following below the
2513.25 * License Header, with the fields enclosed by brackets [] replaced by
2513.26 * your own identifying information:
2514.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/VirtualFormsCustomizerPanel.java Fri Jul 16 11:47:36 2010 -0400
2514.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/VirtualFormsCustomizerPanel.java Fri Jul 16 14:21:50 2010 -0400
2514.3 @@ -1,7 +1,10 @@
2514.4 /*
2514.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2514.6 *
2514.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2514.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2514.9 + *
2514.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2514.11 + * Other names may be trademarks of their respective owners.
2514.12 *
2514.13 * The contents of this file are subject to the terms of either the GNU
2514.14 * General Public License Version 2 only ("GPL") or the Common
2514.15 @@ -13,9 +16,9 @@
2514.16 * specific language governing permissions and limitations under the
2514.17 * License. When distributing the software, include this License Header
2514.18 * Notice in each file and include the License file at
2514.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2514.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2514.21 * particular file as subject to the "Classpath" exception as provided
2514.22 - * by Sun in the GPL Version 2 section of the License file that
2514.23 + * by Oracle in the GPL Version 2 section of the License file that
2514.24 * accompanied this code. If applicable, add the following below the
2514.25 * License Header, with the fields enclosed by brackets [] replaced by
2514.26 * your own identifying information:
2515.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/VirtualFormsHelper.java Fri Jul 16 11:47:36 2010 -0400
2515.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/component/vforms/VirtualFormsHelper.java Fri Jul 16 14:21:50 2010 -0400
2515.3 @@ -1,7 +1,10 @@
2515.4 /*
2515.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2515.6 *
2515.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2515.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2515.9 + *
2515.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2515.11 + * Other names may be trademarks of their respective owners.
2515.12 *
2515.13 * The contents of this file are subject to the terms of either the GNU
2515.14 * General Public License Version 2 only ("GPL") or the Common
2515.15 @@ -13,9 +16,9 @@
2515.16 * specific language governing permissions and limitations under the
2515.17 * License. When distributing the software, include this License Header
2515.18 * Notice in each file and include the License file at
2515.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2515.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2515.21 * particular file as subject to the "Classpath" exception as provided
2515.22 - * by Sun in the GPL Version 2 section of the License file that
2515.23 + * by Oracle in the GPL Version 2 section of the License file that
2515.24 * accompanied this code. If applicable, add the following below the
2515.25 * License Header, with the fields enclosed by brackets [] replaced by
2515.26 * your own identifying information:
2516.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/Bundle-JSF.properties Fri Jul 16 11:47:36 2010 -0400
2516.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/Bundle-JSF.properties Fri Jul 16 14:21:50 2010 -0400
2516.3 @@ -1,6 +1,9 @@
2516.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2516.5 #
2516.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2516.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2516.8 +#
2516.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2516.10 +# Other names may be trademarks of their respective owners.
2516.11 #
2516.12 # The contents of this file are subject to the terms of either the GNU
2516.13 # General Public License Version 2 only ("GPL") or the Common
2516.14 @@ -12,9 +15,9 @@
2516.15 # specific language governing permissions and limitations under the
2516.16 # License. When distributing the software, include this License Header
2516.17 # Notice in each file and include the License file at
2516.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2516.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2516.20 # particular file as subject to the "Classpath" exception as provided
2516.21 -# by Sun in the GPL Version 2 section of the License file that
2516.22 +# by Oracle in the GPL Version 2 section of the License file that
2516.23 # accompanied this code. If applicable, add the following below the
2516.24 # License Header, with the fields enclosed by brackets [] replaced by
2516.25 # your own identifying information:
2517.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueBindingFilterCriteriaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2517.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueBindingFilterCriteriaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2517.3 @@ -1,7 +1,10 @@
2517.4 /*
2517.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2517.6 *
2517.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2517.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2517.9 + *
2517.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2517.11 + * Other names may be trademarks of their respective owners.
2517.12 *
2517.13 * The contents of this file are subject to the terms of either the GNU
2517.14 * General Public License Version 2 only ("GPL") or the Common
2517.15 @@ -13,9 +16,9 @@
2517.16 * specific language governing permissions and limitations under the
2517.17 * License. When distributing the software, include this License Header
2517.18 * Notice in each file and include the License file at
2517.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2517.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2517.21 * particular file as subject to the "Classpath" exception as provided
2517.22 - * by Sun in the GPL Version 2 section of the License file that
2517.23 + * by Oracle in the GPL Version 2 section of the License file that
2517.24 * accompanied this code. If applicable, add the following below the
2517.25 * License Header, with the fields enclosed by brackets [] replaced by
2517.26 * your own identifying information:
2518.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueBindingFilterCriteriaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2518.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueBindingFilterCriteriaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2518.3 @@ -2,7 +2,10 @@
2518.4 /*
2518.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2518.6 *
2518.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2518.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2518.9 + *
2518.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2518.11 + * Other names may be trademarks of their respective owners.
2518.12 *
2518.13 * The contents of this file are subject to the terms of either the GNU
2518.14 * General Public License Version 2 only ("GPL") or the Common
2518.15 @@ -14,9 +17,9 @@
2518.16 * specific language governing permissions and limitations under the
2518.17 * License. When distributing the software, include this License Header
2518.18 * Notice in each file and include the License file at
2518.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2518.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2518.21 * particular file as subject to the "Classpath" exception as provided
2518.22 - * by Sun in the GPL Version 2 section of the License file that
2518.23 + * by Oracle in the GPL Version 2 section of the License file that
2518.24 * accompanied this code. If applicable, add the following below the
2518.25 * License Header, with the fields enclosed by brackets [] replaced by
2518.26 * your own identifying information:
2519.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueBindingSortCriteriaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2519.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueBindingSortCriteriaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2519.3 @@ -1,7 +1,10 @@
2519.4 /*
2519.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2519.6 *
2519.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2519.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2519.9 + *
2519.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2519.11 + * Other names may be trademarks of their respective owners.
2519.12 *
2519.13 * The contents of this file are subject to the terms of either the GNU
2519.14 * General Public License Version 2 only ("GPL") or the Common
2519.15 @@ -13,9 +16,9 @@
2519.16 * specific language governing permissions and limitations under the
2519.17 * License. When distributing the software, include this License Header
2519.18 * Notice in each file and include the License file at
2519.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2519.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2519.21 * particular file as subject to the "Classpath" exception as provided
2519.22 - * by Sun in the GPL Version 2 section of the License file that
2519.23 + * by Oracle in the GPL Version 2 section of the License file that
2519.24 * accompanied this code. If applicable, add the following below the
2519.25 * License Header, with the fields enclosed by brackets [] replaced by
2519.26 * your own identifying information:
2520.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueBindingSortCriteriaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2520.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueBindingSortCriteriaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2520.3 @@ -2,7 +2,10 @@
2520.4 /*
2520.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2520.6 *
2520.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2520.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2520.9 + *
2520.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2520.11 + * Other names may be trademarks of their respective owners.
2520.12 *
2520.13 * The contents of this file are subject to the terms of either the GNU
2520.14 * General Public License Version 2 only ("GPL") or the Common
2520.15 @@ -14,9 +17,9 @@
2520.16 * specific language governing permissions and limitations under the
2520.17 * License. When distributing the software, include this License Header
2520.18 * Notice in each file and include the License file at
2520.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2520.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2520.21 * particular file as subject to the "Classpath" exception as provided
2520.22 - * by Sun in the GPL Version 2 section of the License file that
2520.23 + * by Oracle in the GPL Version 2 section of the License file that
2520.24 * accompanied this code. If applicable, add the following below the
2520.25 * License Header, with the fields enclosed by brackets [] replaced by
2520.26 * your own identifying information:
2521.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueExpressionFilterCriteriaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2521.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueExpressionFilterCriteriaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2521.3 @@ -1,7 +1,10 @@
2521.4 /*
2521.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2521.6 *
2521.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2521.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2521.9 + *
2521.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2521.11 + * Other names may be trademarks of their respective owners.
2521.12 *
2521.13 * The contents of this file are subject to the terms of either the GNU
2521.14 * General Public License Version 2 only ("GPL") or the Common
2521.15 @@ -13,9 +16,9 @@
2521.16 * specific language governing permissions and limitations under the
2521.17 * License. When distributing the software, include this License Header
2521.18 * Notice in each file and include the License file at
2521.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2521.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2521.21 * particular file as subject to the "Classpath" exception as provided
2521.22 - * by Sun in the GPL Version 2 section of the License file that
2521.23 + * by Oracle in the GPL Version 2 section of the License file that
2521.24 * accompanied this code. If applicable, add the following below the
2521.25 * License Header, with the fields enclosed by brackets [] replaced by
2521.26 * your own identifying information:
2522.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueExpressionFilterCriteriaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2522.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueExpressionFilterCriteriaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2522.3 @@ -2,7 +2,10 @@
2522.4 /*
2522.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2522.6 *
2522.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2522.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2522.9 + *
2522.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2522.11 + * Other names may be trademarks of their respective owners.
2522.12 *
2522.13 * The contents of this file are subject to the terms of either the GNU
2522.14 * General Public License Version 2 only ("GPL") or the Common
2522.15 @@ -14,9 +17,9 @@
2522.16 * specific language governing permissions and limitations under the
2522.17 * License. When distributing the software, include this License Header
2522.18 * Notice in each file and include the License file at
2522.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2522.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2522.21 * particular file as subject to the "Classpath" exception as provided
2522.22 - * by Sun in the GPL Version 2 section of the License file that
2522.23 + * by Oracle in the GPL Version 2 section of the License file that
2522.24 * accompanied this code. If applicable, add the following below the
2522.25 * License Header, with the fields enclosed by brackets [] replaced by
2522.26 * your own identifying information:
2523.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueExpressionSortCriteriaBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2523.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueExpressionSortCriteriaBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2523.3 @@ -1,7 +1,10 @@
2523.4 /*
2523.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2523.6 *
2523.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2523.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2523.9 + *
2523.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2523.11 + * Other names may be trademarks of their respective owners.
2523.12 *
2523.13 * The contents of this file are subject to the terms of either the GNU
2523.14 * General Public License Version 2 only ("GPL") or the Common
2523.15 @@ -13,9 +16,9 @@
2523.16 * specific language governing permissions and limitations under the
2523.17 * License. When distributing the software, include this License Header
2523.18 * Notice in each file and include the License file at
2523.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2523.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2523.21 * particular file as subject to the "Classpath" exception as provided
2523.22 - * by Sun in the GPL Version 2 section of the License file that
2523.23 + * by Oracle in the GPL Version 2 section of the License file that
2523.24 * accompanied this code. If applicable, add the following below the
2523.25 * License Header, with the fields enclosed by brackets [] replaced by
2523.26 * your own identifying information:
2524.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueExpressionSortCriteriaBeanInfoBase.java Fri Jul 16 11:47:36 2010 -0400
2524.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/faces/ValueExpressionSortCriteriaBeanInfoBase.java Fri Jul 16 14:21:50 2010 -0400
2524.3 @@ -2,7 +2,10 @@
2524.4 /*
2524.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2524.6 *
2524.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2524.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2524.9 + *
2524.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2524.11 + * Other names may be trademarks of their respective owners.
2524.12 *
2524.13 * The contents of this file are subject to the terms of either the GNU
2524.14 * General Public License Version 2 only ("GPL") or the Common
2524.15 @@ -14,9 +17,9 @@
2524.16 * specific language governing permissions and limitations under the
2524.17 * License. When distributing the software, include this License Header
2524.18 * Notice in each file and include the License file at
2524.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2524.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2524.21 * particular file as subject to the "Classpath" exception as provided
2524.22 - * by Sun in the GPL Version 2 section of the License file that
2524.23 + * by Oracle in the GPL Version 2 section of the License file that
2524.24 * accompanied this code. If applicable, add the following below the
2524.25 * License Header, with the fields enclosed by brackets [] replaced by
2524.26 * your own identifying information:
2525.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/model/DefaultOptionsListBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2525.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/model/DefaultOptionsListBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2525.3 @@ -1,7 +1,10 @@
2525.4 /*
2525.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2525.6 *
2525.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2525.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2525.9 + *
2525.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2525.11 + * Other names may be trademarks of their respective owners.
2525.12 *
2525.13 * The contents of this file are subject to the terms of either the GNU
2525.14 * General Public License Version 2 only ("GPL") or the Common
2525.15 @@ -13,9 +16,9 @@
2525.16 * specific language governing permissions and limitations under the
2525.17 * License. When distributing the software, include this License Header
2525.18 * Notice in each file and include the License file at
2525.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2525.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2525.21 * particular file as subject to the "Classpath" exception as provided
2525.22 - * by Sun in the GPL Version 2 section of the License file that
2525.23 + * by Oracle in the GPL Version 2 section of the License file that
2525.24 * accompanied this code. If applicable, add the following below the
2525.25 * License Header, with the fields enclosed by brackets [] replaced by
2525.26 * your own identifying information:
2526.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/model/MultipleSelectOptionsListBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2526.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/model/MultipleSelectOptionsListBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2526.3 @@ -1,7 +1,10 @@
2526.4 /*
2526.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2526.6 *
2526.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2526.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2526.9 + *
2526.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2526.11 + * Other names may be trademarks of their respective owners.
2526.12 *
2526.13 * The contents of this file are subject to the terms of either the GNU
2526.14 * General Public License Version 2 only ("GPL") or the Common
2526.15 @@ -13,9 +16,9 @@
2526.16 * specific language governing permissions and limitations under the
2526.17 * License. When distributing the software, include this License Header
2526.18 * Notice in each file and include the License file at
2526.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2526.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2526.21 * particular file as subject to the "Classpath" exception as provided
2526.22 - * by Sun in the GPL Version 2 section of the License file that
2526.23 + * by Oracle in the GPL Version 2 section of the License file that
2526.24 * accompanied this code. If applicable, add the following below the
2526.25 * License Header, with the fields enclosed by brackets [] replaced by
2526.26 * your own identifying information:
2527.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/model/OptionsListBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2527.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/model/OptionsListBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2527.3 @@ -1,7 +1,10 @@
2527.4 /*
2527.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2527.6 *
2527.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2527.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2527.9 + *
2527.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2527.11 + * Other names may be trademarks of their respective owners.
2527.12 *
2527.13 * The contents of this file are subject to the terms of either the GNU
2527.14 * General Public License Version 2 only ("GPL") or the Common
2527.15 @@ -13,9 +16,9 @@
2527.16 * specific language governing permissions and limitations under the
2527.17 * License. When distributing the software, include this License Header
2527.18 * Notice in each file and include the License file at
2527.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2527.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2527.21 * particular file as subject to the "Classpath" exception as provided
2527.22 - * by Sun in the GPL Version 2 section of the License file that
2527.23 + * by Oracle in the GPL Version 2 section of the License file that
2527.24 * accompanied this code. If applicable, add the following below the
2527.25 * License Header, with the fields enclosed by brackets [] replaced by
2527.26 * your own identifying information:
2528.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/model/SingleSelectOptionsListBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
2528.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/model/SingleSelectOptionsListBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
2528.3 @@ -1,7 +1,10 @@
2528.4 /*
2528.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2528.6 *
2528.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2528.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2528.9 + *
2528.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2528.11 + * Other names may be trademarks of their respective owners.
2528.12 *
2528.13 * The contents of this file are subject to the terms of either the GNU
2528.14 * General Public License Version 2 only ("GPL") or the Common
2528.15 @@ -13,9 +16,9 @@
2528.16 * specific language governing permissions and limitations under the
2528.17 * License. When distributing the software, include this License Header
2528.18 * Notice in each file and include the License file at
2528.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2528.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2528.21 * particular file as subject to the "Classpath" exception as provided
2528.22 - * by Sun in the GPL Version 2 section of the License file that
2528.23 + * by Oracle in the GPL Version 2 section of the License file that
2528.24 * accompanied this code. If applicable, add the following below the
2528.25 * License Header, with the fields enclosed by brackets [] replaced by
2528.26 * your own identifying information:
2529.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/AbstractDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2529.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/AbstractDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2529.3 @@ -1,7 +1,10 @@
2529.4 /*
2529.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2529.6 *
2529.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2529.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2529.9 + *
2529.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2529.11 + * Other names may be trademarks of their respective owners.
2529.12 *
2529.13 * The contents of this file are subject to the terms of either the GNU
2529.14 * General Public License Version 2 only ("GPL") or the Common
2529.15 @@ -13,9 +16,9 @@
2529.16 * specific language governing permissions and limitations under the
2529.17 * License. When distributing the software, include this License Header
2529.18 * Notice in each file and include the License file at
2529.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2529.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2529.21 * particular file as subject to the "Classpath" exception as provided
2529.22 - * by Sun in the GPL Version 2 section of the License file that
2529.23 + * by Oracle in the GPL Version 2 section of the License file that
2529.24 * accompanied this code. If applicable, add the following below the
2529.25 * License Header, with the fields enclosed by brackets [] replaced by
2529.26 * your own identifying information:
2530.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ActionSourceDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2530.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ActionSourceDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2530.3 @@ -1,7 +1,10 @@
2530.4 /*
2530.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2530.6 *
2530.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2530.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2530.9 + *
2530.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2530.11 + * Other names may be trademarks of their respective owners.
2530.12 *
2530.13 * The contents of this file are subject to the terms of either the GNU
2530.14 * General Public License Version 2 only ("GPL") or the Common
2530.15 @@ -13,9 +16,9 @@
2530.16 * specific language governing permissions and limitations under the
2530.17 * License. When distributing the software, include this License Header
2530.18 * Notice in each file and include the License file at
2530.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2530.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2530.21 * particular file as subject to the "Classpath" exception as provided
2530.22 - * by Sun in the GPL Version 2 section of the License file that
2530.23 + * by Oracle in the GPL Version 2 section of the License file that
2530.24 * accompanied this code. If applicable, add the following below the
2530.25 * License Header, with the fields enclosed by brackets [] replaced by
2530.26 * your own identifying information:
2531.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/AddRemoveDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2531.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/AddRemoveDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2531.3 @@ -1,7 +1,10 @@
2531.4 /*
2531.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2531.6 *
2531.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2531.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2531.9 + *
2531.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2531.11 + * Other names may be trademarks of their respective owners.
2531.12 *
2531.13 * The contents of this file are subject to the terms of either the GNU
2531.14 * General Public License Version 2 only ("GPL") or the Common
2531.15 @@ -13,9 +16,9 @@
2531.16 * specific language governing permissions and limitations under the
2531.17 * License. When distributing the software, include this License Header
2531.18 * Notice in each file and include the License file at
2531.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2531.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2531.21 * particular file as subject to the "Classpath" exception as provided
2531.22 - * by Sun in the GPL Version 2 section of the License file that
2531.23 + * by Oracle in the GPL Version 2 section of the License file that
2531.24 * accompanied this code. If applicable, add the following below the
2531.25 * License Header, with the fields enclosed by brackets [] replaced by
2531.26 * your own identifying information:
2532.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/AlertDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2532.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/AlertDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2532.3 @@ -1,7 +1,10 @@
2532.4 /*
2532.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2532.6 *
2532.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2532.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2532.9 + *
2532.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2532.11 + * Other names may be trademarks of their respective owners.
2532.12 *
2532.13 * The contents of this file are subject to the terms of either the GNU
2532.14 * General Public License Version 2 only ("GPL") or the Common
2532.15 @@ -13,9 +16,9 @@
2532.16 * specific language governing permissions and limitations under the
2532.17 * License. When distributing the software, include this License Header
2532.18 * Notice in each file and include the License file at
2532.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2532.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2532.21 * particular file as subject to the "Classpath" exception as provided
2532.22 - * by Sun in the GPL Version 2 section of the License file that
2532.23 + * by Oracle in the GPL Version 2 section of the License file that
2532.24 * accompanied this code. If applicable, add the following below the
2532.25 * License Header, with the fields enclosed by brackets [] replaced by
2532.26 * your own identifying information:
2533.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/AnchorDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2533.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/AnchorDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2533.3 @@ -1,7 +1,10 @@
2533.4 /*
2533.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2533.6 *
2533.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2533.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2533.9 + *
2533.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2533.11 + * Other names may be trademarks of their respective owners.
2533.12 *
2533.13 * The contents of this file are subject to the terms of either the GNU
2533.14 * General Public License Version 2 only ("GPL") or the Common
2533.15 @@ -13,9 +16,9 @@
2533.16 * specific language governing permissions and limitations under the
2533.17 * License. When distributing the software, include this License Header
2533.18 * Notice in each file and include the License file at
2533.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2533.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2533.21 * particular file as subject to the "Classpath" exception as provided
2533.22 - * by Sun in the GPL Version 2 section of the License file that
2533.23 + * by Oracle in the GPL Version 2 section of the License file that
2533.24 * accompanied this code. If applicable, add the following below the
2533.25 * License Header, with the fields enclosed by brackets [] replaced by
2533.26 * your own identifying information:
2534.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/BreadcrumbsDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2534.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/BreadcrumbsDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2534.3 @@ -1,7 +1,10 @@
2534.4 /*
2534.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2534.6 *
2534.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2534.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2534.9 + *
2534.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2534.11 + * Other names may be trademarks of their respective owners.
2534.12 *
2534.13 * The contents of this file are subject to the terms of either the GNU
2534.14 * General Public License Version 2 only ("GPL") or the Common
2534.15 @@ -13,9 +16,9 @@
2534.16 * specific language governing permissions and limitations under the
2534.17 * License. When distributing the software, include this License Header
2534.18 * Notice in each file and include the License file at
2534.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2534.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2534.21 * particular file as subject to the "Classpath" exception as provided
2534.22 - * by Sun in the GPL Version 2 section of the License file that
2534.23 + * by Oracle in the GPL Version 2 section of the License file that
2534.24 * accompanied this code. If applicable, add the following below the
2534.25 * License Header, with the fields enclosed by brackets [] replaced by
2534.26 * your own identifying information:
2535.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/Bundle-DT.properties Fri Jul 16 11:47:36 2010 -0400
2535.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/Bundle-DT.properties Fri Jul 16 14:21:50 2010 -0400
2535.3 @@ -1,6 +1,9 @@
2535.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2535.5 #
2535.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2535.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2535.8 +#
2535.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2535.10 +# Other names may be trademarks of their respective owners.
2535.11 #
2535.12 # The contents of this file are subject to the terms of either the GNU
2535.13 # General Public License Version 2 only ("GPL") or the Common
2535.14 @@ -12,9 +15,9 @@
2535.15 # specific language governing permissions and limitations under the
2535.16 # License. When distributing the software, include this License Header
2535.17 # Notice in each file and include the License file at
2535.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2535.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2535.20 # particular file as subject to the "Classpath" exception as provided
2535.21 -# by Sun in the GPL Version 2 section of the License file that
2535.22 +# by Oracle in the GPL Version 2 section of the License file that
2535.23 # accompanied this code. If applicable, add the following below the
2535.24 # License Header, with the fields enclosed by brackets [] replaced by
2535.25 # your own identifying information:
2536.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ButtonDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2536.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ButtonDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2536.3 @@ -1,7 +1,10 @@
2536.4 /*
2536.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2536.6 *
2536.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2536.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2536.9 + *
2536.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2536.11 + * Other names may be trademarks of their respective owners.
2536.12 *
2536.13 * The contents of this file are subject to the terms of either the GNU
2536.14 * General Public License Version 2 only ("GPL") or the Common
2536.15 @@ -13,9 +16,9 @@
2536.16 * specific language governing permissions and limitations under the
2536.17 * License. When distributing the software, include this License Header
2536.18 * Notice in each file and include the License file at
2536.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2536.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2536.21 * particular file as subject to the "Classpath" exception as provided
2536.22 - * by Sun in the GPL Version 2 section of the License file that
2536.23 + * by Oracle in the GPL Version 2 section of the License file that
2536.24 * accompanied this code. If applicable, add the following below the
2536.25 * License Header, with the fields enclosed by brackets [] replaced by
2536.26 * your own identifying information:
2537.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/CheckboxGroupDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2537.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/CheckboxGroupDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2537.3 @@ -1,7 +1,10 @@
2537.4 /*
2537.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2537.6 *
2537.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2537.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2537.9 + *
2537.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2537.11 + * Other names may be trademarks of their respective owners.
2537.12 *
2537.13 * The contents of this file are subject to the terms of either the GNU
2537.14 * General Public License Version 2 only ("GPL") or the Common
2537.15 @@ -13,9 +16,9 @@
2537.16 * specific language governing permissions and limitations under the
2537.17 * License. When distributing the software, include this License Header
2537.18 * Notice in each file and include the License file at
2537.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2537.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2537.21 * particular file as subject to the "Classpath" exception as provided
2537.22 - * by Sun in the GPL Version 2 section of the License file that
2537.23 + * by Oracle in the GPL Version 2 section of the License file that
2537.24 * accompanied this code. If applicable, add the following below the
2537.25 * License Header, with the fields enclosed by brackets [] replaced by
2537.26 * your own identifying information:
2538.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/DropDownDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2538.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/DropDownDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2538.3 @@ -1,7 +1,10 @@
2538.4 /*
2538.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2538.6 *
2538.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2538.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2538.9 + *
2538.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2538.11 + * Other names may be trademarks of their respective owners.
2538.12 *
2538.13 * The contents of this file are subject to the terms of either the GNU
2538.14 * General Public License Version 2 only ("GPL") or the Common
2538.15 @@ -13,9 +16,9 @@
2538.16 * specific language governing permissions and limitations under the
2538.17 * License. When distributing the software, include this License Header
2538.18 * Notice in each file and include the License file at
2538.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2538.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2538.21 * particular file as subject to the "Classpath" exception as provided
2538.22 - * by Sun in the GPL Version 2 section of the License file that
2538.23 + * by Oracle in the GPL Version 2 section of the License file that
2538.24 * accompanied this code. If applicable, add the following below the
2538.25 * License Header, with the fields enclosed by brackets [] replaced by
2538.26 * your own identifying information:
2539.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/FieldDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2539.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/FieldDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2539.3 @@ -1,7 +1,10 @@
2539.4 /*
2539.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2539.6 *
2539.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2539.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2539.9 + *
2539.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2539.11 + * Other names may be trademarks of their respective owners.
2539.12 *
2539.13 * The contents of this file are subject to the terms of either the GNU
2539.14 * General Public License Version 2 only ("GPL") or the Common
2539.15 @@ -13,9 +16,9 @@
2539.16 * specific language governing permissions and limitations under the
2539.17 * License. When distributing the software, include this License Header
2539.18 * Notice in each file and include the License file at
2539.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2539.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2539.21 * particular file as subject to the "Classpath" exception as provided
2539.22 - * by Sun in the GPL Version 2 section of the License file that
2539.23 + * by Oracle in the GPL Version 2 section of the License file that
2539.24 * accompanied this code. If applicable, add the following below the
2539.25 * License Header, with the fields enclosed by brackets [] replaced by
2539.26 * your own identifying information:
2540.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/HelpInlineDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2540.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/HelpInlineDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2540.3 @@ -1,7 +1,10 @@
2540.4 /*
2540.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2540.6 *
2540.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2540.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2540.9 + *
2540.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2540.11 + * Other names may be trademarks of their respective owners.
2540.12 *
2540.13 * The contents of this file are subject to the terms of either the GNU
2540.14 * General Public License Version 2 only ("GPL") or the Common
2540.15 @@ -13,9 +16,9 @@
2540.16 * specific language governing permissions and limitations under the
2540.17 * License. When distributing the software, include this License Header
2540.18 * Notice in each file and include the License file at
2540.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2540.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2540.21 * particular file as subject to the "Classpath" exception as provided
2540.22 - * by Sun in the GPL Version 2 section of the License file that
2540.23 + * by Oracle in the GPL Version 2 section of the License file that
2540.24 * accompanied this code. If applicable, add the following below the
2540.25 * License Header, with the fields enclosed by brackets [] replaced by
2540.26 * your own identifying information:
2541.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/HyperlinkDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2541.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/HyperlinkDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2541.3 @@ -1,7 +1,10 @@
2541.4 /*
2541.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2541.6 *
2541.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2541.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2541.9 + *
2541.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2541.11 + * Other names may be trademarks of their respective owners.
2541.12 *
2541.13 * The contents of this file are subject to the terms of either the GNU
2541.14 * General Public License Version 2 only ("GPL") or the Common
2541.15 @@ -13,9 +16,9 @@
2541.16 * specific language governing permissions and limitations under the
2541.17 * License. When distributing the software, include this License Header
2541.18 * Notice in each file and include the License file at
2541.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2541.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2541.21 * particular file as subject to the "Classpath" exception as provided
2541.22 - * by Sun in the GPL Version 2 section of the License file that
2541.23 + * by Oracle in the GPL Version 2 section of the License file that
2541.24 * accompanied this code. If applicable, add the following below the
2541.25 * License Header, with the fields enclosed by brackets [] replaced by
2541.26 * your own identifying information:
2542.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ImageDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2542.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ImageDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2542.3 @@ -1,7 +1,10 @@
2542.4 /*
2542.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2542.6 *
2542.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2542.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2542.9 + *
2542.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2542.11 + * Other names may be trademarks of their respective owners.
2542.12 *
2542.13 * The contents of this file are subject to the terms of either the GNU
2542.14 * General Public License Version 2 only ("GPL") or the Common
2542.15 @@ -13,9 +16,9 @@
2542.16 * specific language governing permissions and limitations under the
2542.17 * License. When distributing the software, include this License Header
2542.18 * Notice in each file and include the License file at
2542.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2542.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2542.21 * particular file as subject to the "Classpath" exception as provided
2542.22 - * by Sun in the GPL Version 2 section of the License file that
2542.23 + * by Oracle in the GPL Version 2 section of the License file that
2542.24 * accompanied this code. If applicable, add the following below the
2542.25 * License Header, with the fields enclosed by brackets [] replaced by
2542.26 * your own identifying information:
2543.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ImageHyperlinkDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2543.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ImageHyperlinkDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2543.3 @@ -1,7 +1,10 @@
2543.4 /*
2543.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2543.6 *
2543.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2543.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2543.9 + *
2543.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2543.11 + * Other names may be trademarks of their respective owners.
2543.12 *
2543.13 * The contents of this file are subject to the terms of either the GNU
2543.14 * General Public License Version 2 only ("GPL") or the Common
2543.15 @@ -13,9 +16,9 @@
2543.16 * specific language governing permissions and limitations under the
2543.17 * License. When distributing the software, include this License Header
2543.18 * Notice in each file and include the License file at
2543.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2543.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2543.21 * particular file as subject to the "Classpath" exception as provided
2543.22 - * by Sun in the GPL Version 2 section of the License file that
2543.23 + * by Oracle in the GPL Version 2 section of the License file that
2543.24 * accompanied this code. If applicable, add the following below the
2543.25 * License Header, with the fields enclosed by brackets [] replaced by
2543.26 * your own identifying information:
2544.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/LabelDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2544.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/LabelDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2544.3 @@ -1,7 +1,10 @@
2544.4 /*
2544.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2544.6 *
2544.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2544.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2544.9 + *
2544.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2544.11 + * Other names may be trademarks of their respective owners.
2544.12 *
2544.13 * The contents of this file are subject to the terms of either the GNU
2544.14 * General Public License Version 2 only ("GPL") or the Common
2544.15 @@ -13,9 +16,9 @@
2544.16 * specific language governing permissions and limitations under the
2544.17 * License. When distributing the software, include this License Header
2544.18 * Notice in each file and include the License file at
2544.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2544.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2544.21 * particular file as subject to the "Classpath" exception as provided
2544.22 - * by Sun in the GPL Version 2 section of the License file that
2544.23 + * by Oracle in the GPL Version 2 section of the License file that
2544.24 * accompanied this code. If applicable, add the following below the
2544.25 * License Header, with the fields enclosed by brackets [] replaced by
2544.26 * your own identifying information:
2545.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ListboxDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2545.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ListboxDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2545.3 @@ -1,7 +1,10 @@
2545.4 /*
2545.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2545.6 *
2545.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2545.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2545.9 + *
2545.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2545.11 + * Other names may be trademarks of their respective owners.
2545.12 *
2545.13 * The contents of this file are subject to the terms of either the GNU
2545.14 * General Public License Version 2 only ("GPL") or the Common
2545.15 @@ -13,9 +16,9 @@
2545.16 * specific language governing permissions and limitations under the
2545.17 * License. When distributing the software, include this License Header
2545.18 * Notice in each file and include the License file at
2545.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2545.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2545.21 * particular file as subject to the "Classpath" exception as provided
2545.22 - * by Sun in the GPL Version 2 section of the License file that
2545.23 + * by Oracle in the GPL Version 2 section of the License file that
2545.24 * accompanied this code. If applicable, add the following below the
2545.25 * License Header, with the fields enclosed by brackets [] replaced by
2545.26 * your own identifying information:
2546.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PageAlertDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2546.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PageAlertDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2546.3 @@ -1,7 +1,10 @@
2546.4 /*
2546.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2546.6 *
2546.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2546.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2546.9 + *
2546.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2546.11 + * Other names may be trademarks of their respective owners.
2546.12 *
2546.13 * The contents of this file are subject to the terms of either the GNU
2546.14 * General Public License Version 2 only ("GPL") or the Common
2546.15 @@ -13,9 +16,9 @@
2546.16 * specific language governing permissions and limitations under the
2546.17 * License. When distributing the software, include this License Header
2546.18 * Notice in each file and include the License file at
2546.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2546.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2546.21 * particular file as subject to the "Classpath" exception as provided
2546.22 - * by Sun in the GPL Version 2 section of the License file that
2546.23 + * by Oracle in the GPL Version 2 section of the License file that
2546.24 * accompanied this code. If applicable, add the following below the
2546.25 * License Header, with the fields enclosed by brackets [] replaced by
2546.26 * your own identifying information:
2547.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PanelDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2547.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PanelDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2547.3 @@ -1,7 +1,10 @@
2547.4 /*
2547.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2547.6 *
2547.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2547.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2547.9 + *
2547.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2547.11 + * Other names may be trademarks of their respective owners.
2547.12 *
2547.13 * The contents of this file are subject to the terms of either the GNU
2547.14 * General Public License Version 2 only ("GPL") or the Common
2547.15 @@ -13,9 +16,9 @@
2547.16 * specific language governing permissions and limitations under the
2547.17 * License. When distributing the software, include this License Header
2547.18 * Notice in each file and include the License file at
2547.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2547.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2547.21 * particular file as subject to the "Classpath" exception as provided
2547.22 - * by Sun in the GPL Version 2 section of the License file that
2547.23 + * by Oracle in the GPL Version 2 section of the License file that
2547.24 * accompanied this code. If applicable, add the following below the
2547.25 * License Header, with the fields enclosed by brackets [] replaced by
2547.26 * your own identifying information:
2548.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PanelGroupDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2548.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PanelGroupDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2548.3 @@ -1,7 +1,10 @@
2548.4 /*
2548.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2548.6 *
2548.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2548.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2548.9 + *
2548.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2548.11 + * Other names may be trademarks of their respective owners.
2548.12 *
2548.13 * The contents of this file are subject to the terms of either the GNU
2548.14 * General Public License Version 2 only ("GPL") or the Common
2548.15 @@ -13,9 +16,9 @@
2548.16 * specific language governing permissions and limitations under the
2548.17 * License. When distributing the software, include this License Header
2548.18 * Notice in each file and include the License file at
2548.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2548.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2548.21 * particular file as subject to the "Classpath" exception as provided
2548.22 - * by Sun in the GPL Version 2 section of the License file that
2548.23 + * by Oracle in the GPL Version 2 section of the License file that
2548.24 * accompanied this code. If applicable, add the following below the
2548.25 * License Header, with the fields enclosed by brackets [] replaced by
2548.26 * your own identifying information:
2549.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PanelLayoutDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2549.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PanelLayoutDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2549.3 @@ -1,7 +1,10 @@
2549.4 /*
2549.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2549.6 *
2549.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2549.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2549.9 + *
2549.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2549.11 + * Other names may be trademarks of their respective owners.
2549.12 *
2549.13 * The contents of this file are subject to the terms of either the GNU
2549.14 * General Public License Version 2 only ("GPL") or the Common
2549.15 @@ -13,9 +16,9 @@
2549.16 * specific language governing permissions and limitations under the
2549.17 * License. When distributing the software, include this License Header
2549.18 * Notice in each file and include the License file at
2549.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2549.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2549.21 * particular file as subject to the "Classpath" exception as provided
2549.22 - * by Sun in the GPL Version 2 section of the License file that
2549.23 + * by Oracle in the GPL Version 2 section of the License file that
2549.24 * accompanied this code. If applicable, add the following below the
2549.25 * License Header, with the fields enclosed by brackets [] replaced by
2549.26 * your own identifying information:
2550.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PasswordFieldDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2550.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/PasswordFieldDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2550.3 @@ -1,7 +1,10 @@
2550.4 /*
2550.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2550.6 *
2550.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2550.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2550.9 + *
2550.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2550.11 + * Other names may be trademarks of their respective owners.
2550.12 *
2550.13 * The contents of this file are subject to the terms of either the GNU
2550.14 * General Public License Version 2 only ("GPL") or the Common
2550.15 @@ -13,9 +16,9 @@
2550.16 * specific language governing permissions and limitations under the
2550.17 * License. When distributing the software, include this License Header
2550.18 * Notice in each file and include the License file at
2550.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2550.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2550.21 * particular file as subject to the "Classpath" exception as provided
2550.22 - * by Sun in the GPL Version 2 section of the License file that
2550.23 + * by Oracle in the GPL Version 2 section of the License file that
2550.24 * accompanied this code. If applicable, add the following below the
2550.25 * License Header, with the fields enclosed by brackets [] replaced by
2550.26 * your own identifying information:
2551.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/RadioButtonGroupDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2551.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/RadioButtonGroupDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2551.3 @@ -1,7 +1,10 @@
2551.4 /*
2551.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2551.6 *
2551.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2551.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2551.9 + *
2551.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2551.11 + * Other names may be trademarks of their respective owners.
2551.12 *
2551.13 * The contents of this file are subject to the terms of either the GNU
2551.14 * General Public License Version 2 only ("GPL") or the Common
2551.15 @@ -13,9 +16,9 @@
2551.16 * specific language governing permissions and limitations under the
2551.17 * License. When distributing the software, include this License Header
2551.18 * Notice in each file and include the License file at
2551.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2551.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2551.21 * particular file as subject to the "Classpath" exception as provided
2551.22 - * by Sun in the GPL Version 2 section of the License file that
2551.23 + * by Oracle in the GPL Version 2 section of the License file that
2551.24 * accompanied this code. If applicable, add the following below the
2551.25 * License Header, with the fields enclosed by brackets [] replaced by
2551.26 * your own identifying information:
2552.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/RbCbGroupDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2552.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/RbCbGroupDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2552.3 @@ -1,7 +1,10 @@
2552.4 /*
2552.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2552.6 *
2552.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2552.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2552.9 + *
2552.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2552.11 + * Other names may be trademarks of their respective owners.
2552.12 *
2552.13 * The contents of this file are subject to the terms of either the GNU
2552.14 * General Public License Version 2 only ("GPL") or the Common
2552.15 @@ -13,9 +16,9 @@
2552.16 * specific language governing permissions and limitations under the
2552.17 * License. When distributing the software, include this License Header
2552.18 * Notice in each file and include the License file at
2552.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2552.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2552.21 * particular file as subject to the "Classpath" exception as provided
2552.22 - * by Sun in the GPL Version 2 section of the License file that
2552.23 + * by Oracle in the GPL Version 2 section of the License file that
2552.24 * accompanied this code. If applicable, add the following below the
2552.25 * License Header, with the fields enclosed by brackets [] replaced by
2552.26 * your own identifying information:
2553.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/SelectorDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2553.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/SelectorDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2553.3 @@ -1,7 +1,10 @@
2553.4 /*
2553.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2553.6 *
2553.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2553.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2553.9 + *
2553.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2553.11 + * Other names may be trademarks of their respective owners.
2553.12 *
2553.13 * The contents of this file are subject to the terms of either the GNU
2553.14 * General Public License Version 2 only ("GPL") or the Common
2553.15 @@ -13,9 +16,9 @@
2553.16 * specific language governing permissions and limitations under the
2553.17 * License. When distributing the software, include this License Header
2553.18 * Notice in each file and include the License file at
2553.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2553.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2553.21 * particular file as subject to the "Classpath" exception as provided
2553.22 - * by Sun in the GPL Version 2 section of the License file that
2553.23 + * by Oracle in the GPL Version 2 section of the License file that
2553.24 * accompanied this code. If applicable, add the following below the
2553.25 * License Header, with the fields enclosed by brackets [] replaced by
2553.26 * your own identifying information:
2554.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/StaticTextDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2554.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/StaticTextDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2554.3 @@ -1,7 +1,10 @@
2554.4 /*
2554.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2554.6 *
2554.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2554.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2554.9 + *
2554.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2554.11 + * Other names may be trademarks of their respective owners.
2554.12 *
2554.13 * The contents of this file are subject to the terms of either the GNU
2554.14 * General Public License Version 2 only ("GPL") or the Common
2554.15 @@ -13,9 +16,9 @@
2554.16 * specific language governing permissions and limitations under the
2554.17 * License. When distributing the software, include this License Header
2554.18 * Notice in each file and include the License file at
2554.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2554.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2554.21 * particular file as subject to the "Classpath" exception as provided
2554.22 - * by Sun in the GPL Version 2 section of the License file that
2554.23 + * by Oracle in the GPL Version 2 section of the License file that
2554.24 * accompanied this code. If applicable, add the following below the
2554.25 * License Header, with the fields enclosed by brackets [] replaced by
2554.26 * your own identifying information:
2555.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TabDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2555.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TabDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2555.3 @@ -1,7 +1,10 @@
2555.4 /*
2555.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2555.6 *
2555.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2555.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2555.9 + *
2555.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2555.11 + * Other names may be trademarks of their respective owners.
2555.12 *
2555.13 * The contents of this file are subject to the terms of either the GNU
2555.14 * General Public License Version 2 only ("GPL") or the Common
2555.15 @@ -13,9 +16,9 @@
2555.16 * specific language governing permissions and limitations under the
2555.17 * License. When distributing the software, include this License Header
2555.18 * Notice in each file and include the License file at
2555.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2555.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2555.21 * particular file as subject to the "Classpath" exception as provided
2555.22 - * by Sun in the GPL Version 2 section of the License file that
2555.23 + * by Oracle in the GPL Version 2 section of the License file that
2555.24 * accompanied this code. If applicable, add the following below the
2555.25 * License Header, with the fields enclosed by brackets [] replaced by
2555.26 * your own identifying information:
2556.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TabSetDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2556.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TabSetDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2556.3 @@ -1,7 +1,10 @@
2556.4 /*
2556.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2556.6 *
2556.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2556.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2556.9 + *
2556.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2556.11 + * Other names may be trademarks of their respective owners.
2556.12 *
2556.13 * The contents of this file are subject to the terms of either the GNU
2556.14 * General Public License Version 2 only ("GPL") or the Common
2556.15 @@ -13,9 +16,9 @@
2556.16 * specific language governing permissions and limitations under the
2556.17 * License. When distributing the software, include this License Header
2556.18 * Notice in each file and include the License file at
2556.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2556.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2556.21 * particular file as subject to the "Classpath" exception as provided
2556.22 - * by Sun in the GPL Version 2 section of the License file that
2556.23 + * by Oracle in the GPL Version 2 section of the License file that
2556.24 * accompanied this code. If applicable, add the following below the
2556.25 * License Header, with the fields enclosed by brackets [] replaced by
2556.26 * your own identifying information:
2557.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TextAreaDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2557.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TextAreaDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2557.3 @@ -1,7 +1,10 @@
2557.4 /*
2557.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2557.6 *
2557.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2557.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2557.9 + *
2557.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2557.11 + * Other names may be trademarks of their respective owners.
2557.12 *
2557.13 * The contents of this file are subject to the terms of either the GNU
2557.14 * General Public License Version 2 only ("GPL") or the Common
2557.15 @@ -13,9 +16,9 @@
2557.16 * specific language governing permissions and limitations under the
2557.17 * License. When distributing the software, include this License Header
2557.18 * Notice in each file and include the License file at
2557.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2557.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2557.21 * particular file as subject to the "Classpath" exception as provided
2557.22 - * by Sun in the GPL Version 2 section of the License file that
2557.23 + * by Oracle in the GPL Version 2 section of the License file that
2557.24 * accompanied this code. If applicable, add the following below the
2557.25 * License Header, with the fields enclosed by brackets [] replaced by
2557.26 * your own identifying information:
2558.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TextFieldDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2558.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TextFieldDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2558.3 @@ -1,7 +1,10 @@
2558.4 /*
2558.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2558.6 *
2558.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2558.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2558.9 + *
2558.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2558.11 + * Other names may be trademarks of their respective owners.
2558.12 *
2558.13 * The contents of this file are subject to the terms of either the GNU
2558.14 * General Public License Version 2 only ("GPL") or the Common
2558.15 @@ -13,9 +16,9 @@
2558.16 * specific language governing permissions and limitations under the
2558.17 * License. When distributing the software, include this License Header
2558.18 * Notice in each file and include the License file at
2558.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2558.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2558.21 * particular file as subject to the "Classpath" exception as provided
2558.22 - * by Sun in the GPL Version 2 section of the License file that
2558.23 + * by Oracle in the GPL Version 2 section of the License file that
2558.24 * accompanied this code. If applicable, add the following below the
2558.25 * License Header, with the fields enclosed by brackets [] replaced by
2558.26 * your own identifying information:
2559.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TreeNodeDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2559.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/TreeNodeDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2559.3 @@ -1,7 +1,10 @@
2559.4 /*
2559.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2559.6 *
2559.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2559.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2559.9 + *
2559.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2559.11 + * Other names may be trademarks of their respective owners.
2559.12 *
2559.13 * The contents of this file are subject to the terms of either the GNU
2559.14 * General Public License Version 2 only ("GPL") or the Common
2559.15 @@ -13,9 +16,9 @@
2559.16 * specific language governing permissions and limitations under the
2559.17 * License. When distributing the software, include this License Header
2559.18 * Notice in each file and include the License file at
2559.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2559.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2559.21 * particular file as subject to the "Classpath" exception as provided
2559.22 - * by Sun in the GPL Version 2 section of the License file that
2559.23 + * by Oracle in the GPL Version 2 section of the License file that
2559.24 * accompanied this code. If applicable, add the following below the
2559.25 * License Header, with the fields enclosed by brackets [] replaced by
2559.26 * your own identifying information:
2560.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/UploadDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2560.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/UploadDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2560.3 @@ -1,7 +1,10 @@
2560.4 /*
2560.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2560.6 *
2560.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2560.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2560.9 + *
2560.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2560.11 + * Other names may be trademarks of their respective owners.
2560.12 *
2560.13 * The contents of this file are subject to the terms of either the GNU
2560.14 * General Public License Version 2 only ("GPL") or the Common
2560.15 @@ -13,9 +16,9 @@
2560.16 * specific language governing permissions and limitations under the
2560.17 * License. When distributing the software, include this License Header
2560.18 * Notice in each file and include the License file at
2560.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2560.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2560.21 * particular file as subject to the "Classpath" exception as provided
2560.22 - * by Sun in the GPL Version 2 section of the License file that
2560.23 + * by Oracle in the GPL Version 2 section of the License file that
2560.24 * accompanied this code. If applicable, add the following below the
2560.25 * License Header, with the fields enclosed by brackets [] replaced by
2560.26 * your own identifying information:
2561.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ValueHolderDesignTimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2561.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/web/ui/dt/renderer/ValueHolderDesignTimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2561.3 @@ -1,7 +1,10 @@
2561.4 /*
2561.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2561.6 *
2561.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2561.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2561.9 + *
2561.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2561.11 + * Other names may be trademarks of their respective owners.
2561.12 *
2561.13 * The contents of this file are subject to the terms of either the GNU
2561.14 * General Public License Version 2 only ("GPL") or the Common
2561.15 @@ -13,9 +16,9 @@
2561.16 * specific language governing permissions and limitations under the
2561.17 * License. When distributing the software, include this License Header
2561.18 * Notice in each file and include the License file at
2561.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2561.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2561.21 * particular file as subject to the "Classpath" exception as provided
2561.22 - * by Sun in the GPL Version 2 section of the License file that
2561.23 + * by Oracle in the GPL Version 2 section of the License file that
2561.24 * accompanied this code. If applicable, add the following below the
2561.25 * License Header, with the fields enclosed by brackets [] replaced by
2561.26 * your own identifying information:
2562.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/webui/designtime/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2562.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/webui/designtime/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2562.3 @@ -1,6 +1,9 @@
2562.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2562.5 #
2562.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2562.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2562.8 +#
2562.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2562.10 +# Other names may be trademarks of their respective owners.
2562.11 #
2562.12 # The contents of this file are subject to the terms of either the GNU
2562.13 # General Public License Version 2 only ("GPL") or the Common
2562.14 @@ -12,9 +15,9 @@
2562.15 # specific language governing permissions and limitations under the
2562.16 # License. When distributing the software, include this License Header
2562.17 # Notice in each file and include the License file at
2562.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2562.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2562.20 # particular file as subject to the "Classpath" exception as provided
2562.21 -# by Sun in the GPL Version 2 section of the License file that
2562.22 +# by Oracle in the GPL Version 2 section of the License file that
2562.23 # accompanied this code. If applicable, add the following below the
2562.24 # License Header, with the fields enclosed by brackets [] replaced by
2562.25 # your own identifying information:
2563.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/webui/designtime/Install.java Fri Jul 16 11:47:36 2010 -0400
2563.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/webui/designtime/Install.java Fri Jul 16 14:21:50 2010 -0400
2563.3 @@ -1,7 +1,10 @@
2563.4 /*
2563.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2563.6 *
2563.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2563.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2563.9 + *
2563.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2563.11 + * Other names may be trademarks of their respective owners.
2563.12 *
2563.13 * The contents of this file are subject to the terms of either the GNU
2563.14 * General Public License Version 2 only ("GPL") or the Common
2563.15 @@ -13,9 +16,9 @@
2563.16 * specific language governing permissions and limitations under the
2563.17 * License. When distributing the software, include this License Header
2563.18 * Notice in each file and include the License file at
2563.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2563.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2563.21 * particular file as subject to the "Classpath" exception as provided
2563.22 - * by Sun in the GPL Version 2 section of the License file that
2563.23 + * by Oracle in the GPL Version 2 section of the License file that
2563.24 * accompanied this code. If applicable, add the following below the
2563.25 * License Header, with the fields enclosed by brackets [] replaced by
2563.26 * your own identifying information:
2564.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/webui/designtime/layer.xml Fri Jul 16 11:47:36 2010 -0400
2564.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/webui/designtime/layer.xml Fri Jul 16 14:21:50 2010 -0400
2564.3 @@ -2,7 +2,10 @@
2564.4 <!--
2564.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2564.6
2564.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2564.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2564.9 +
2564.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2564.11 +Other names may be trademarks of their respective owners.
2564.12
2564.13
2564.14 The contents of this file are subject to the terms of either the GNU
2564.15 @@ -15,9 +18,9 @@
2564.16 specific language governing permissions and limitations under the
2564.17 License. When distributing the software, include this License Header
2564.18 Notice in each file and include the License file at
2564.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2564.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2564.21 particular file as subject to the "Classpath" exception as provided
2564.22 -by Sun in the GPL Version 2 section of the License file that
2564.23 +by Oracle in the GPL Version 2 section of the License file that
2564.24 accompanied this code. If applicable, add the following below the
2564.25 License Header, with the fields enclosed by brackets [] replaced by
2564.26 your own identifying information:
2565.1 --- a/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/webui/designtime/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2565.2 +++ b/visualweb.webui.designtime/src/org/netbeans/modules/visualweb/webui/designtime/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2565.3 @@ -1,6 +1,9 @@
2565.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2565.5 #
2565.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2565.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2565.8 +#
2565.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2565.10 +# Other names may be trademarks of their respective owners.
2565.11 #
2565.12 # The contents of this file are subject to the terms of either the GNU
2565.13 # General Public License Version 2 only ("GPL") or the Common
2565.14 @@ -12,9 +15,9 @@
2565.15 # specific language governing permissions and limitations under the
2565.16 # License. When distributing the software, include this License Header
2565.17 # Notice in each file and include the License file at
2565.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2565.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2565.20 # particular file as subject to the "Classpath" exception as provided
2565.21 -# by Sun in the GPL Version 2 section of the License file that
2565.22 +# by Oracle in the GPL Version 2 section of the License file that
2565.23 # accompanied this code. If applicable, add the following below the
2565.24 # License Header, with the fields enclosed by brackets [] replaced by
2565.25 # your own identifying information:
2566.1 --- a/visualweb.webui.designtime/test/unit/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/OptionsListCustomizerTest.java Fri Jul 16 11:47:36 2010 -0400
2566.2 +++ b/visualweb.webui.designtime/test/unit/src/org/netbeans/modules/visualweb/web/ui/dt/component/customizers/OptionsListCustomizerTest.java Fri Jul 16 14:21:50 2010 -0400
2566.3 @@ -1,8 +1,11 @@
2566.4 /*
2566.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2566.6 - *
2566.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2566.8 - *
2566.9 + *
2566.10 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2566.11 + *
2566.12 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2566.13 + * Other names may be trademarks of their respective owners.
2566.14 + *
2566.15 * The contents of this file are subject to the terms of either the GNU
2566.16 * General Public License Version 2 only ("GPL") or the Common
2566.17 * Development and Distribution License("CDDL") (collectively, the
2566.18 @@ -13,9 +16,9 @@
2566.19 * specific language governing permissions and limitations under the
2566.20 * License. When distributing the software, include this License Header
2566.21 * Notice in each file and include the License file at
2566.22 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2566.23 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2566.24 * particular file as subject to the "Classpath" exception as provided
2566.25 - * by Sun in the GPL Version 2 section of the License file that
2566.26 + * by Oracle in the GPL Version 2 section of the License file that
2566.27 * accompanied this code. If applicable, add the following below the
2566.28 * License Header, with the fields enclosed by brackets [] replaced by
2566.29 * your own identifying information:
2567.1 --- a/visualweb.webui.jsf.defaulttheme/build.xml Fri Jul 16 11:47:36 2010 -0400
2567.2 +++ b/visualweb.webui.jsf.defaulttheme/build.xml Fri Jul 16 14:21:50 2010 -0400
2567.3 @@ -2,7 +2,10 @@
2567.4 <!--
2567.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2567.6
2567.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2567.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2567.9 +
2567.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2567.11 +Other names may be trademarks of their respective owners.
2567.12
2567.13
2567.14 The contents of this file are subject to the terms of either the GNU
2567.15 @@ -15,9 +18,9 @@
2567.16 specific language governing permissions and limitations under the
2567.17 License. When distributing the software, include this License Header
2567.18 Notice in each file and include the License file at
2567.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2567.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2567.21 particular file as subject to the "Classpath" exception as provided
2567.22 -by Sun in the GPL Version 2 section of the License file that
2567.23 +by Oracle in the GPL Version 2 section of the License file that
2567.24 accompanied this code. If applicable, add the following below the
2567.25 License Header, with the fields enclosed by brackets [] replaced by
2567.26 your own identifying information:
2568.1 --- a/visualweb.webui.jsf.defaulttheme/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2568.2 +++ b/visualweb.webui.jsf.defaulttheme/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2568.3 @@ -1,6 +1,9 @@
2568.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2568.5 #
2568.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2568.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2568.8 +#
2568.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2568.10 +# Other names may be trademarks of their respective owners.
2568.11 #
2568.12 # The contents of this file are subject to the terms of either the GNU
2568.13 # General Public License Version 2 only ("GPL") or the Common
2568.14 @@ -12,9 +15,9 @@
2568.15 # specific language governing permissions and limitations under the
2568.16 # License. When distributing the software, include this License Header
2568.17 # Notice in each file and include the License file at
2568.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2568.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2568.20 # particular file as subject to the "Classpath" exception as provided
2568.21 -# by Sun in the GPL Version 2 section of the License file that
2568.22 +# by Oracle in the GPL Version 2 section of the License file that
2568.23 # accompanied this code. If applicable, add the following below the
2568.24 # License Header, with the fields enclosed by brackets [] replaced by
2568.25 # your own identifying information:
2568.26 @@ -38,7 +41,7 @@
2568.27 # made subject to such option by the copyright holder.
2568.28
2568.29 javac.compilerargs=-Xlint -Xlint:-serial
2568.30 -javac.source=1.5
2568.31 +javac.source=1.6
2568.32
2568.33 release.external/woodstock-defaulttheme-4.2.zip!/webui-jsf-suntheme.jar=modules/ext/webui-jsf-suntheme.jar
2568.34 release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_de.jar=modules/ext/locale/webui-jsf_de.jar
2569.1 --- a/visualweb.webui.jsf.defaulttheme/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2569.2 +++ b/visualweb.webui.jsf.defaulttheme/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2569.3 @@ -2,7 +2,10 @@
2569.4 <!--
2569.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2569.6
2569.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2569.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2569.9 +
2569.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2569.11 +Other names may be trademarks of their respective owners.
2569.12
2569.13
2569.14 The contents of this file are subject to the terms of either the GNU
2569.15 @@ -15,9 +18,9 @@
2569.16 specific language governing permissions and limitations under the
2569.17 License. When distributing the software, include this License Header
2569.18 Notice in each file and include the License file at
2569.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2569.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2569.21 particular file as subject to the "Classpath" exception as provided
2569.22 -by Sun in the GPL Version 2 section of the License file that
2569.23 +by Oracle in the GPL Version 2 section of the License file that
2569.24 accompanied this code. If applicable, add the following below the
2569.25 License Header, with the fields enclosed by brackets [] replaced by
2569.26 your own identifying information:
2569.27 @@ -111,7 +114,15 @@
2569.28 <build-prerequisite/>
2569.29 <compile-dependency/>
2569.30 <run-dependency>
2569.31 - <specification-version>7.21</specification-version>
2569.32 + <specification-version>8.0</specification-version>
2569.33 + </run-dependency>
2569.34 + </dependency>
2569.35 + <dependency>
2569.36 + <code-name-base>org.openide.util.lookup</code-name-base>
2569.37 + <build-prerequisite/>
2569.38 + <compile-dependency/>
2569.39 + <run-dependency>
2569.40 + <specification-version>8.0</specification-version>
2569.41 </run-dependency>
2569.42 </dependency>
2569.43 </module-dependencies>
2570.1 --- a/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2570.2 +++ b/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2570.3 @@ -1,6 +1,9 @@
2570.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2570.5 #
2570.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2570.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2570.8 +#
2570.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2570.10 +# Other names may be trademarks of their respective owners.
2570.11 #
2570.12 # The contents of this file are subject to the terms of either the GNU
2570.13 # General Public License Version 2 only ("GPL") or the Common
2570.14 @@ -12,9 +15,9 @@
2570.15 # specific language governing permissions and limitations under the
2570.16 # License. When distributing the software, include this License Header
2570.17 # Notice in each file and include the License file at
2570.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2570.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2570.20 # particular file as subject to the "Classpath" exception as provided
2570.21 -# by Sun in the GPL Version 2 section of the License file that
2570.22 +# by Oracle in the GPL Version 2 section of the License file that
2570.23 # accompanied this code. If applicable, add the following below the
2570.24 # License Header, with the fields enclosed by brackets [] replaced by
2570.25 # your own identifying information:
2571.1 --- a/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2571.2 +++ b/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2571.3 @@ -1,6 +1,9 @@
2571.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2571.5 #
2571.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2571.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2571.8 +#
2571.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2571.10 +# Other names may be trademarks of their respective owners.
2571.11 #
2571.12 # The contents of this file are subject to the terms of either the GNU
2571.13 # General Public License Version 2 only ("GPL") or the Common
2571.14 @@ -12,9 +15,9 @@
2571.15 # specific language governing permissions and limitations under the
2571.16 # License. When distributing the software, include this License Header
2571.17 # Notice in each file and include the License file at
2571.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2571.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2571.20 # particular file as subject to the "Classpath" exception as provided
2571.21 -# by Sun in the GPL Version 2 section of the License file that
2571.22 +# by Oracle in the GPL Version 2 section of the License file that
2571.23 # accompanied this code. If applicable, add the following below the
2571.24 # License Header, with the fields enclosed by brackets [] replaced by
2571.25 # your own identifying information:
2572.1 --- a/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/ComponentLibraryTypeProvider.java Fri Jul 16 11:47:36 2010 -0400
2572.2 +++ b/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/ComponentLibraryTypeProvider.java Fri Jul 16 14:21:50 2010 -0400
2572.3 @@ -1,7 +1,10 @@
2572.4 /*
2572.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2572.6 *
2572.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2572.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2572.9 + *
2572.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2572.11 + * Other names may be trademarks of their respective owners.
2572.12 *
2572.13 * The contents of this file are subject to the terms of either the GNU
2572.14 * General Public License Version 2 only ("GPL") or the Common
2572.15 @@ -13,9 +16,9 @@
2572.16 * specific language governing permissions and limitations under the
2572.17 * License. When distributing the software, include this License Header
2572.18 * Notice in each file and include the License file at
2572.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2572.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2572.21 * particular file as subject to the "Classpath" exception as provided
2572.22 - * by Sun in the GPL Version 2 section of the License file that
2572.23 + * by Oracle in the GPL Version 2 section of the License file that
2572.24 * accompanied this code. If applicable, add the following below the
2572.25 * License Header, with the fields enclosed by brackets [] replaced by
2572.26 * your own identifying information:
2573.1 --- a/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/ComponentVolumeCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2573.2 +++ b/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/ComponentVolumeCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2573.3 @@ -1,7 +1,10 @@
2573.4 /*
2573.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2573.6 *
2573.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2573.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2573.9 + *
2573.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2573.11 + * Other names may be trademarks of their respective owners.
2573.12 *
2573.13 * The contents of this file are subject to the terms of either the GNU
2573.14 * General Public License Version 2 only ("GPL") or the Common
2573.15 @@ -13,9 +16,9 @@
2573.16 * specific language governing permissions and limitations under the
2573.17 * License. When distributing the software, include this License Header
2573.18 * Notice in each file and include the License file at
2573.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2573.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2573.21 * particular file as subject to the "Classpath" exception as provided
2573.22 - * by Sun in the GPL Version 2 section of the License file that
2573.23 + * by Oracle in the GPL Version 2 section of the License file that
2573.24 * accompanied this code. If applicable, add the following below the
2573.25 * License Header, with the fields enclosed by brackets [] replaced by
2573.26 * your own identifying information:
2574.1 --- a/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/JavadocForBinaryQueryLibraryImpl.java Fri Jul 16 11:47:36 2010 -0400
2574.2 +++ b/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/JavadocForBinaryQueryLibraryImpl.java Fri Jul 16 14:21:50 2010 -0400
2574.3 @@ -1,7 +1,10 @@
2574.4 /*
2574.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2574.6 *
2574.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2574.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2574.9 + *
2574.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2574.11 + * Other names may be trademarks of their respective owners.
2574.12 *
2574.13 * The contents of this file are subject to the terms of either the GNU
2574.14 * General Public License Version 2 only ("GPL") or the Common
2574.15 @@ -13,9 +16,9 @@
2574.16 * specific language governing permissions and limitations under the
2574.17 * License. When distributing the software, include this License Header
2574.18 * Notice in each file and include the License file at
2574.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2574.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2574.21 * particular file as subject to the "Classpath" exception as provided
2574.22 - * by Sun in the GPL Version 2 section of the License file that
2574.23 + * by Oracle in the GPL Version 2 section of the License file that
2574.24 * accompanied this code. If applicable, add the following below the
2574.25 * License Header, with the fields enclosed by brackets [] replaced by
2574.26 * your own identifying information:
2575.1 --- a/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/ThemeLibraryTypeProvider.java Fri Jul 16 11:47:36 2010 -0400
2575.2 +++ b/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/ThemeLibraryTypeProvider.java Fri Jul 16 14:21:50 2010 -0400
2575.3 @@ -1,7 +1,10 @@
2575.4 /*
2575.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2575.6 *
2575.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2575.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2575.9 + *
2575.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2575.11 + * Other names may be trademarks of their respective owners.
2575.12 *
2575.13 * The contents of this file are subject to the terms of either the GNU
2575.14 * General Public License Version 2 only ("GPL") or the Common
2575.15 @@ -13,9 +16,9 @@
2575.16 * specific language governing permissions and limitations under the
2575.17 * License. When distributing the software, include this License Header
2575.18 * Notice in each file and include the License file at
2575.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2575.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2575.21 * particular file as subject to the "Classpath" exception as provided
2575.22 - * by Sun in the GPL Version 2 section of the License file that
2575.23 + * by Oracle in the GPL Version 2 section of the License file that
2575.24 * accompanied this code. If applicable, add the following below the
2575.25 * License Header, with the fields enclosed by brackets [] replaced by
2575.26 * your own identifying information:
2576.1 --- a/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/ThemeVolumeCustomizer.java Fri Jul 16 11:47:36 2010 -0400
2576.2 +++ b/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/ThemeVolumeCustomizer.java Fri Jul 16 14:21:50 2010 -0400
2576.3 @@ -1,7 +1,10 @@
2576.4 /*
2576.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2576.6 *
2576.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2576.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2576.9 + *
2576.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2576.11 + * Other names may be trademarks of their respective owners.
2576.12 *
2576.13 * The contents of this file are subject to the terms of either the GNU
2576.14 * General Public License Version 2 only ("GPL") or the Common
2576.15 @@ -13,9 +16,9 @@
2576.16 * specific language governing permissions and limitations under the
2576.17 * License. When distributing the software, include this License Header
2576.18 * Notice in each file and include the License file at
2576.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2576.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2576.21 * particular file as subject to the "Classpath" exception as provided
2576.22 - * by Sun in the GPL Version 2 section of the License file that
2576.23 + * by Oracle in the GPL Version 2 section of the License file that
2576.24 * accompanied this code. If applicable, add the following below the
2576.25 * License Header, with the fields enclosed by brackets [] replaced by
2576.26 * your own identifying information:
2577.1 --- a/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/VolumeContentModel.java Fri Jul 16 11:47:36 2010 -0400
2577.2 +++ b/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/libraries/provider/VolumeContentModel.java Fri Jul 16 14:21:50 2010 -0400
2577.3 @@ -1,7 +1,10 @@
2577.4 /*
2577.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2577.6 *
2577.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2577.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2577.9 + *
2577.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2577.11 + * Other names may be trademarks of their respective owners.
2577.12 *
2577.13 * The contents of this file are subject to the terms of either the GNU
2577.14 * General Public License Version 2 only ("GPL") or the Common
2577.15 @@ -13,9 +16,9 @@
2577.16 * specific language governing permissions and limitations under the
2577.17 * License. When distributing the software, include this License Header
2577.18 * Notice in each file and include the License file at
2577.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2577.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2577.21 * particular file as subject to the "Classpath" exception as provided
2577.22 - * by Sun in the GPL Version 2 section of the License file that
2577.23 + * by Oracle in the GPL Version 2 section of the License file that
2577.24 * accompanied this code. If applicable, add the following below the
2577.25 * License Header, with the fields enclosed by brackets [] replaced by
2577.26 * your own identifying information:
2578.1 --- a/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
2578.2 +++ b/visualweb.webui.jsf.defaulttheme/src/org/netbeans/modules/visualweb/webui/jsf/defaulttheme/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
2578.3 @@ -2,7 +2,10 @@
2578.4 <!--
2578.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2578.6
2578.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2578.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2578.9 +
2578.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2578.11 +Other names may be trademarks of their respective owners.
2578.12
2578.13
2578.14 The contents of this file are subject to the terms of either the GNU
2578.15 @@ -15,9 +18,9 @@
2578.16 specific language governing permissions and limitations under the
2578.17 License. When distributing the software, include this License Header
2578.18 Notice in each file and include the License file at
2578.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2578.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2578.21 particular file as subject to the "Classpath" exception as provided
2578.22 -by Sun in the GPL Version 2 section of the License file that
2578.23 +by Oracle in the GPL Version 2 section of the License file that
2578.24 accompanied this code. If applicable, add the following below the
2578.25 License Header, with the fields enclosed by brackets [] replaced by
2578.26 your own identifying information:
2579.1 --- a/visualweb.webui.themes/build.xml Fri Jul 16 11:47:36 2010 -0400
2579.2 +++ b/visualweb.webui.themes/build.xml Fri Jul 16 14:21:50 2010 -0400
2579.3 @@ -2,7 +2,10 @@
2579.4 <!--
2579.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2579.6
2579.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2579.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2579.9 +
2579.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2579.11 +Other names may be trademarks of their respective owners.
2579.12
2579.13
2579.14 The contents of this file are subject to the terms of either the GNU
2579.15 @@ -15,9 +18,9 @@
2579.16 specific language governing permissions and limitations under the
2579.17 License. When distributing the software, include this License Header
2579.18 Notice in each file and include the License file at
2579.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2579.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2579.21 particular file as subject to the "Classpath" exception as provided
2579.22 -by Sun in the GPL Version 2 section of the License file that
2579.23 +by Oracle in the GPL Version 2 section of the License file that
2579.24 accompanied this code. If applicable, add the following below the
2579.25 License Header, with the fields enclosed by brackets [] replaced by
2579.26 your own identifying information:
2580.1 --- a/visualweb.webui.themes/library/build.xml Fri Jul 16 11:47:36 2010 -0400
2580.2 +++ b/visualweb.webui.themes/library/build.xml Fri Jul 16 14:21:50 2010 -0400
2580.3 @@ -2,7 +2,10 @@
2580.4 <!--
2580.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2580.6
2580.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2580.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2580.9 +
2580.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2580.11 +Other names may be trademarks of their respective owners.
2580.12
2580.13
2580.14 The contents of this file are subject to the terms of either the GNU
2580.15 @@ -15,9 +18,9 @@
2580.16 specific language governing permissions and limitations under the
2580.17 License. When distributing the software, include this License Header
2580.18 Notice in each file and include the License file at
2580.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2580.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2580.21 particular file as subject to the "Classpath" exception as provided
2580.22 -by Sun in the GPL Version 2 section of the License file that
2580.23 +by Oracle in the GPL Version 2 section of the License file that
2580.24 accompanied this code. If applicable, add the following below the
2580.25 License Header, with the fields enclosed by brackets [] replaced by
2580.26 your own identifying information:
2581.1 --- a/visualweb.webui.themes/library/defaulttheme/props/images.properties Fri Jul 16 11:47:36 2010 -0400
2581.2 +++ b/visualweb.webui.themes/library/defaulttheme/props/images.properties Fri Jul 16 14:21:50 2010 -0400
2581.3 @@ -1,6 +1,9 @@
2581.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2581.5 #
2581.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2581.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2581.8 +#
2581.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2581.10 +# Other names may be trademarks of their respective owners.
2581.11 #
2581.12 # The contents of this file are subject to the terms of either the GNU
2581.13 # General Public License Version 2 only ("GPL") or the Common
2581.14 @@ -12,9 +15,9 @@
2581.15 # specific language governing permissions and limitations under the
2581.16 # License. When distributing the software, include this License Header
2581.17 # Notice in each file and include the License file at
2581.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2581.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2581.20 # particular file as subject to the "Classpath" exception as provided
2581.21 -# by Sun in the GPL Version 2 section of the License file that
2581.22 +# by Oracle in the GPL Version 2 section of the License file that
2581.23 # accompanied this code. If applicable, add the following below the
2581.24 # License Header, with the fields enclosed by brackets [] replaced by
2581.25 # your own identifying information:
2582.1 --- a/visualweb.webui.themes/library/defaulttheme/props/javascript.properties Fri Jul 16 11:47:36 2010 -0400
2582.2 +++ b/visualweb.webui.themes/library/defaulttheme/props/javascript.properties Fri Jul 16 14:21:50 2010 -0400
2582.3 @@ -1,6 +1,9 @@
2582.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2582.5 #
2582.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2582.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2582.8 +#
2582.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2582.10 +# Other names may be trademarks of their respective owners.
2582.11 #
2582.12 # The contents of this file are subject to the terms of either the GNU
2582.13 # General Public License Version 2 only ("GPL") or the Common
2582.14 @@ -12,9 +15,9 @@
2582.15 # specific language governing permissions and limitations under the
2582.16 # License. When distributing the software, include this License Header
2582.17 # Notice in each file and include the License file at
2582.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2582.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2582.20 # particular file as subject to the "Classpath" exception as provided
2582.21 -# by Sun in the GPL Version 2 section of the License file that
2582.22 +# by Oracle in the GPL Version 2 section of the License file that
2582.23 # accompanied this code. If applicable, add the following below the
2582.24 # License Header, with the fields enclosed by brackets [] replaced by
2582.25 # your own identifying information:
2583.1 --- a/visualweb.webui.themes/library/defaulttheme/props/stylesheets.properties Fri Jul 16 11:47:36 2010 -0400
2583.2 +++ b/visualweb.webui.themes/library/defaulttheme/props/stylesheets.properties Fri Jul 16 14:21:50 2010 -0400
2583.3 @@ -1,6 +1,9 @@
2583.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2583.5 #
2583.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2583.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2583.8 +#
2583.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2583.10 +# Other names may be trademarks of their respective owners.
2583.11 #
2583.12 # The contents of this file are subject to the terms of either the GNU
2583.13 # General Public License Version 2 only ("GPL") or the Common
2583.14 @@ -12,9 +15,9 @@
2583.15 # specific language governing permissions and limitations under the
2583.16 # License. When distributing the software, include this License Header
2583.17 # Notice in each file and include the License file at
2583.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2583.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2583.20 # particular file as subject to the "Classpath" exception as provided
2583.21 -# by Sun in the GPL Version 2 section of the License file that
2583.22 +# by Oracle in the GPL Version 2 section of the License file that
2583.23 # accompanied this code. If applicable, add the following below the
2583.24 # License Header, with the fields enclosed by brackets [] replaced by
2583.25 # your own identifying information:
2584.1 --- a/visualweb.webui.themes/library/messages/messages.properties Fri Jul 16 11:47:36 2010 -0400
2584.2 +++ b/visualweb.webui.themes/library/messages/messages.properties Fri Jul 16 14:21:50 2010 -0400
2584.3 @@ -1,6 +1,9 @@
2584.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2584.5 #
2584.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2584.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2584.8 +#
2584.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2584.10 +# Other names may be trademarks of their respective owners.
2584.11 #
2584.12 # The contents of this file are subject to the terms of either the GNU
2584.13 # General Public License Version 2 only ("GPL") or the Common
2584.14 @@ -12,9 +15,9 @@
2584.15 # specific language governing permissions and limitations under the
2584.16 # License. When distributing the software, include this License Header
2584.17 # Notice in each file and include the License file at
2584.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2584.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2584.20 # particular file as subject to the "Classpath" exception as provided
2584.21 -# by Sun in the GPL Version 2 section of the License file that
2584.22 +# by Oracle in the GPL Version 2 section of the License file that
2584.23 # accompanied this code. If applicable, add the following below the
2584.24 # License Header, with the fields enclosed by brackets [] replaced by
2584.25 # your own identifying information:
2585.1 --- a/visualweb.webui.themes/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2585.2 +++ b/visualweb.webui.themes/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2585.3 @@ -1,6 +1,9 @@
2585.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2585.5 #
2585.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2585.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2585.8 +#
2585.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2585.10 +# Other names may be trademarks of their respective owners.
2585.11 #
2585.12 # The contents of this file are subject to the terms of either the GNU
2585.13 # General Public License Version 2 only ("GPL") or the Common
2585.14 @@ -12,9 +15,9 @@
2585.15 # specific language governing permissions and limitations under the
2585.16 # License. When distributing the software, include this License Header
2585.17 # Notice in each file and include the License file at
2585.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2585.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2585.20 # particular file as subject to the "Classpath" exception as provided
2585.21 -# by Sun in the GPL Version 2 section of the License file that
2585.22 +# by Oracle in the GPL Version 2 section of the License file that
2585.23 # accompanied this code. If applicable, add the following below the
2585.24 # License Header, with the fields enclosed by brackets [] replaced by
2585.25 # your own identifying information:
2586.1 --- a/visualweb.webui.themes/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2586.2 +++ b/visualweb.webui.themes/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2586.3 @@ -2,7 +2,10 @@
2586.4 <!--
2586.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2586.6
2586.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2586.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2586.9 +
2586.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2586.11 +Other names may be trademarks of their respective owners.
2586.12
2586.13
2586.14 The contents of this file are subject to the terms of either the GNU
2586.15 @@ -15,9 +18,9 @@
2586.16 specific language governing permissions and limitations under the
2586.17 License. When distributing the software, include this License Header
2586.18 Notice in each file and include the License file at
2586.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2586.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2586.21 particular file as subject to the "Classpath" exception as provided
2586.22 -by Sun in the GPL Version 2 section of the License file that
2586.23 +by Oracle in the GPL Version 2 section of the License file that
2586.24 accompanied this code. If applicable, add the following below the
2586.25 License Header, with the fields enclosed by brackets [] replaced by
2586.26 your own identifying information:
2587.1 --- a/visualweb.webui.themes/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2587.2 +++ b/visualweb.webui.themes/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2587.3 @@ -1,6 +1,9 @@
2587.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2587.5 #
2587.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2587.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2587.8 +#
2587.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2587.10 +# Other names may be trademarks of their respective owners.
2587.11 #
2587.12 # The contents of this file are subject to the terms of either the GNU
2587.13 # General Public License Version 2 only ("GPL") or the Common
2587.14 @@ -12,9 +15,9 @@
2587.15 # specific language governing permissions and limitations under the
2587.16 # License. When distributing the software, include this License Header
2587.17 # Notice in each file and include the License file at
2587.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2587.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2587.20 # particular file as subject to the "Classpath" exception as provided
2587.21 -# by Sun in the GPL Version 2 section of the License file that
2587.22 +# by Oracle in the GPL Version 2 section of the License file that
2587.23 # accompanied this code. If applicable, add the following below the
2587.24 # License Header, with the fields enclosed by brackets [] replaced by
2587.25 # your own identifying information:
2587.26 @@ -38,4 +41,4 @@
2587.27 # made subject to such option by the copyright holder.
2587.28
2587.29 javac.compilerargs=-Xlint -Xlint:-serial
2587.30 -javac.source=1.5
2587.31 +javac.source=1.6
2588.1 --- a/visualweb.webui.themes/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2588.2 +++ b/visualweb.webui.themes/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2588.3 @@ -2,7 +2,10 @@
2588.4 <!--
2588.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2588.6
2588.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2588.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2588.9 +
2588.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2588.11 +Other names may be trademarks of their respective owners.
2588.12
2588.13
2588.14 The contents of this file are subject to the terms of either the GNU
2588.15 @@ -15,9 +18,9 @@
2588.16 specific language governing permissions and limitations under the
2588.17 License. When distributing the software, include this License Header
2588.18 Notice in each file and include the License file at
2588.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2588.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2588.21 particular file as subject to the "Classpath" exception as provided
2588.22 -by Sun in the GPL Version 2 section of the License file that
2588.23 +by Oracle in the GPL Version 2 section of the License file that
2588.24 accompanied this code. If applicable, add the following below the
2588.25 License Header, with the fields enclosed by brackets [] replaced by
2588.26 your own identifying information:
2589.1 --- a/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2589.2 +++ b/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2589.3 @@ -1,6 +1,9 @@
2589.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2589.5 #
2589.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2589.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2589.8 +#
2589.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2589.10 +# Other names may be trademarks of their respective owners.
2589.11 #
2589.12 # The contents of this file are subject to the terms of either the GNU
2589.13 # General Public License Version 2 only ("GPL") or the Common
2589.14 @@ -12,9 +15,9 @@
2589.15 # specific language governing permissions and limitations under the
2589.16 # License. When distributing the software, include this License Header
2589.17 # Notice in each file and include the License file at
2589.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2589.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2589.20 # particular file as subject to the "Classpath" exception as provided
2589.21 -# by Sun in the GPL Version 2 section of the License file that
2589.22 +# by Oracle in the GPL Version 2 section of the License file that
2589.23 # accompanied this code. If applicable, add the following below the
2589.24 # License Header, with the fields enclosed by brackets [] replaced by
2589.25 # your own identifying information:
2590.1 --- a/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2590.2 +++ b/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2590.3 @@ -1,6 +1,9 @@
2590.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2590.5 #
2590.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2590.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2590.8 +#
2590.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2590.10 +# Other names may be trademarks of their respective owners.
2590.11 #
2590.12 # The contents of this file are subject to the terms of either the GNU
2590.13 # General Public License Version 2 only ("GPL") or the Common
2590.14 @@ -12,9 +15,9 @@
2590.15 # specific language governing permissions and limitations under the
2590.16 # License. When distributing the software, include this License Header
2590.17 # Notice in each file and include the License file at
2590.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2590.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2590.20 # particular file as subject to the "Classpath" exception as provided
2590.21 -# by Sun in the GPL Version 2 section of the License file that
2590.22 +# by Oracle in the GPL Version 2 section of the License file that
2590.23 # accompanied this code. If applicable, add the following below the
2590.24 # License Header, with the fields enclosed by brackets [] replaced by
2590.25 # your own identifying information:
2591.1 --- a/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
2591.2 +++ b/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
2591.3 @@ -2,7 +2,10 @@
2591.4 <!--
2591.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2591.6
2591.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2591.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2591.9 +
2591.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2591.11 +Other names may be trademarks of their respective owners.
2591.12
2591.13
2591.14 The contents of this file are subject to the terms of either the GNU
2591.15 @@ -15,9 +18,9 @@
2591.16 specific language governing permissions and limitations under the
2591.17 License. When distributing the software, include this License Header
2591.18 Notice in each file and include the License file at
2591.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2591.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2591.21 particular file as subject to the "Classpath" exception as provided
2591.22 -by Sun in the GPL Version 2 section of the License file that
2591.23 +by Oracle in the GPL Version 2 section of the License file that
2591.24 accompanied this code. If applicable, add the following below the
2591.25 License Header, with the fields enclosed by brackets [] replaced by
2591.26 your own identifying information:
2592.1 --- a/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/theme-default-gray.xml Fri Jul 16 11:47:36 2010 -0400
2592.2 +++ b/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/theme-default-gray.xml Fri Jul 16 14:21:50 2010 -0400
2592.3 @@ -2,7 +2,10 @@
2592.4 <!--
2592.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2592.6
2592.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2592.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2592.9 +
2592.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2592.11 +Other names may be trademarks of their respective owners.
2592.12
2592.13
2592.14 The contents of this file are subject to the terms of either the GNU
2592.15 @@ -15,9 +18,9 @@
2592.16 specific language governing permissions and limitations under the
2592.17 License. When distributing the software, include this License Header
2592.18 Notice in each file and include the License file at
2592.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2592.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2592.21 particular file as subject to the "Classpath" exception as provided
2592.22 -by Sun in the GPL Version 2 section of the License file that
2592.23 +by Oracle in the GPL Version 2 section of the License file that
2592.24 accompanied this code. If applicable, add the following below the
2592.25 License Header, with the fields enclosed by brackets [] replaced by
2592.26 your own identifying information:
2592.27 @@ -48,10 +51,10 @@
2592.28 <localizing-bundle>org.netbeans.modules.visualweb.webui.themes.resources.Bundle</localizing-bundle>
2592.29 <volume>
2592.30 <type>classpath</type>
2592.31 - <resource>jar:nbinst:///modules/ext/defaulttheme-gray.jar!/</resource>
2592.32 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui.themes/modules/ext/defaulttheme-gray.jar!/</resource>
2592.33 </volume>
2592.34 <volume>
2592.35 <type>runtime</type>
2592.36 - <resource>jar:nbinst:///modules/ext/defaulttheme-gray.jar!/</resource>
2592.37 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui.themes/modules/ext/defaulttheme-gray.jar!/</resource>
2592.38 </volume>
2592.39 </library>
2593.1 --- a/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/theme-default-green.xml Fri Jul 16 11:47:36 2010 -0400
2593.2 +++ b/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/theme-default-green.xml Fri Jul 16 14:21:50 2010 -0400
2593.3 @@ -2,7 +2,10 @@
2593.4 <!--
2593.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2593.6
2593.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2593.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2593.9 +
2593.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2593.11 +Other names may be trademarks of their respective owners.
2593.12
2593.13
2593.14 The contents of this file are subject to the terms of either the GNU
2593.15 @@ -15,9 +18,9 @@
2593.16 specific language governing permissions and limitations under the
2593.17 License. When distributing the software, include this License Header
2593.18 Notice in each file and include the License file at
2593.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2593.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2593.21 particular file as subject to the "Classpath" exception as provided
2593.22 -by Sun in the GPL Version 2 section of the License file that
2593.23 +by Oracle in the GPL Version 2 section of the License file that
2593.24 accompanied this code. If applicable, add the following below the
2593.25 License Header, with the fields enclosed by brackets [] replaced by
2593.26 your own identifying information:
2593.27 @@ -48,10 +51,10 @@
2593.28 <localizing-bundle>org.netbeans.modules.visualweb.webui.themes.resources.Bundle</localizing-bundle>
2593.29 <volume>
2593.30 <type>classpath</type>
2593.31 - <resource>jar:nbinst:///modules/ext/defaulttheme-green.jar!/</resource>
2593.32 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui.themes/modules/ext/defaulttheme-green.jar!/</resource>
2593.33 </volume>
2593.34 <volume>
2593.35 <type>runtime</type>
2593.36 - <resource>jar:nbinst:///modules/ext/defaulttheme-green.jar!/</resource>
2593.37 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui.themes/modules/ext/defaulttheme-green.jar!/</resource>
2593.38 </volume>
2593.39 </library>
2594.1 --- a/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/theme-default.xml Fri Jul 16 11:47:36 2010 -0400
2594.2 +++ b/visualweb.webui.themes/src/org/netbeans/modules/visualweb/webui/themes/resources/theme-default.xml Fri Jul 16 14:21:50 2010 -0400
2594.3 @@ -2,7 +2,10 @@
2594.4 <!--
2594.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2594.6
2594.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2594.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2594.9 +
2594.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2594.11 +Other names may be trademarks of their respective owners.
2594.12
2594.13
2594.14 The contents of this file are subject to the terms of either the GNU
2594.15 @@ -15,9 +18,9 @@
2594.16 specific language governing permissions and limitations under the
2594.17 License. When distributing the software, include this License Header
2594.18 Notice in each file and include the License file at
2594.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2594.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2594.21 particular file as subject to the "Classpath" exception as provided
2594.22 -by Sun in the GPL Version 2 section of the License file that
2594.23 +by Oracle in the GPL Version 2 section of the License file that
2594.24 accompanied this code. If applicable, add the following below the
2594.25 License Header, with the fields enclosed by brackets [] replaced by
2594.26 your own identifying information:
2594.27 @@ -48,10 +51,10 @@
2594.28 <localizing-bundle>org.netbeans.modules.visualweb.webui.themes.resources.Bundle</localizing-bundle>
2594.29 <volume>
2594.30 <type>classpath</type>
2594.31 - <resource>jar:nbinst:///modules/ext/defaulttheme.jar!/</resource>
2594.32 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui.themes/modules/ext/defaulttheme.jar!/</resource>
2594.33 </volume>
2594.34 <volume>
2594.35 <type>runtime</type>
2594.36 - <resource>jar:nbinst:///modules/ext/defaulttheme.jar!/</resource>
2594.37 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui.themes/modules/ext/defaulttheme.jar!/</resource>
2594.38 </volume>
2594.39 </library>
2595.1 --- a/visualweb.webui/build.xml Fri Jul 16 11:47:36 2010 -0400
2595.2 +++ b/visualweb.webui/build.xml Fri Jul 16 14:21:50 2010 -0400
2595.3 @@ -2,7 +2,10 @@
2595.4 <!--
2595.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2595.6
2595.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2595.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2595.9 +
2595.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2595.11 +Other names may be trademarks of their respective owners.
2595.12
2595.13
2595.14 The contents of this file are subject to the terms of either the GNU
2595.15 @@ -15,9 +18,9 @@
2595.16 specific language governing permissions and limitations under the
2595.17 License. When distributing the software, include this License Header
2595.18 Notice in each file and include the License file at
2595.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2595.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2595.21 particular file as subject to the "Classpath" exception as provided
2595.22 -by Sun in the GPL Version 2 section of the License file that
2595.23 +by Oracle in the GPL Version 2 section of the License file that
2595.24 accompanied this code. If applicable, add the following below the
2595.25 License Header, with the fields enclosed by brackets [] replaced by
2595.26 your own identifying information:
2596.1 --- a/visualweb.webui/library/build.xml Fri Jul 16 11:47:36 2010 -0400
2596.2 +++ b/visualweb.webui/library/build.xml Fri Jul 16 14:21:50 2010 -0400
2596.3 @@ -2,7 +2,10 @@
2596.4 <!--
2596.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2596.6
2596.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2596.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2596.9 +
2596.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2596.11 +Other names may be trademarks of their respective owners.
2596.12
2596.13
2596.14 The contents of this file are subject to the terms of either the GNU
2596.15 @@ -15,9 +18,9 @@
2596.16 specific language governing permissions and limitations under the
2596.17 License. When distributing the software, include this License Header
2596.18 Notice in each file and include the License file at
2596.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2596.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2596.21 particular file as subject to the "Classpath" exception as provided
2596.22 -by Sun in the GPL Version 2 section of the License file that
2596.23 +by Oracle in the GPL Version 2 section of the License file that
2596.24 accompanied this code. If applicable, add the following below the
2596.25 License Header, with the fields enclosed by brackets [] replaced by
2596.26 your own identifying information:
2597.1 --- a/visualweb.webui/library/conf/layout/layout.dtd Fri Jul 16 11:47:36 2010 -0400
2597.2 +++ b/visualweb.webui/library/conf/layout/layout.dtd Fri Jul 16 14:21:50 2010 -0400
2597.3 @@ -2,7 +2,10 @@
2597.4 <!--
2597.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2597.6
2597.7 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
2597.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2597.9 +
2597.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2597.11 +Other names may be trademarks of their respective owners.
2597.12
2597.13
2597.14 The contents of this file are subject to the terms of either the GNU
2597.15 @@ -15,9 +18,9 @@
2597.16 specific language governing permissions and limitations under the
2597.17 License. When distributing the software, include this License Header
2597.18 Notice in each file and include the License file at
2597.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2597.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2597.21 particular file as subject to the "Classpath" exception as provided
2597.22 -by Sun in the GPL Version 2 section of the License file that
2597.23 +by Oracle in the GPL Version 2 section of the License file that
2597.24 accompanied this code. If applicable, add the following below the
2597.25 License Header, with the fields enclosed by brackets [] replaced by
2597.26 your own identifying information:
2598.1 --- a/visualweb.webui/library/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
2598.2 +++ b/visualweb.webui/library/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
2598.3 @@ -1,6 +1,9 @@
2598.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2598.5 #
2598.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2598.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2598.8 +#
2598.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2598.10 +# Other names may be trademarks of their respective owners.
2598.11 #
2598.12 # The contents of this file are subject to the terms of either the GNU
2598.13 # General Public License Version 2 only ("GPL") or the Common
2598.14 @@ -12,9 +15,9 @@
2598.15 # specific language governing permissions and limitations under the
2598.16 # License. When distributing the software, include this License Header
2598.17 # Notice in each file and include the License file at
2598.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2598.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2598.20 # particular file as subject to the "Classpath" exception as provided
2598.21 -# by Sun in the GPL Version 2 section of the License file that
2598.22 +# by Oracle in the GPL Version 2 section of the License file that
2598.23 # accompanied this code. If applicable, add the following below the
2598.24 # License Header, with the fields enclosed by brackets [] replaced by
2598.25 # your own identifying information:
2598.26 @@ -70,11 +73,10 @@
2598.27
2598.28 #file.reference.jsf-api.jar=../../../ravelibs/jsf-api/release/modules/ext/jsf-api.jar
2598.29 #file.reference.jsf-ri.jar=../../../ravelibs/jsf-ri/release/modules/ext/jsf-impl.jar
2598.30 -#file.reference.jstl.jar=../../../ravebuild/netbeans/enterprise3/modules/ext/jstl.jar
2598.31 -#file.reference.servlet-jsp-api.jar=../../../ravebuild/netbeans/enterprise3/modules/ext/servlet2.5-jsp2.1-api.jar
2598.32 +#file.reference.jstl.jar=../../../ravebuild/netbeans/enterprise/modules/ext/jstl.jar
2598.33
2598.34 # Have JSF1.2 API, JSP & Servlet API
2598.35 -file.reference.servlet2.5-jsp2.1-api.jar=../../servletjspapi/external/servlet2.5-jsp2.1-api.jar
2598.36 +file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
2598.37 file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
2598.38
2598.39 file.reference.jsf-metadata.jar=../../../ravelibs/jsf-metadata/library/dist/jsf-metadata.jar
2598.40 @@ -107,7 +109,7 @@
2598.41 ${file.reference.dataprovider.jar}:\
2598.42 ${file.reference.commons-fileupload.jar}:\
2598.43 ${file.reference.jhall-2.0_05.jar}:\
2598.44 - ${file.reference.servlet2.5-jsp2.1-api.jar}:\
2598.45 + ${file.reference.servlet3.0-jsp2.2-api.jar}:\
2598.46 ${file.reference.jsf-api.jar}
2598.47 # Space-separated list of extra javac options
2598.48 javac.compilerargs=
2599.1 --- a/visualweb.webui/library/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
2599.2 +++ b/visualweb.webui/library/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
2599.3 @@ -2,7 +2,10 @@
2599.4 <!--
2599.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2599.6
2599.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2599.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2599.9 +
2599.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2599.11 +Other names may be trademarks of their respective owners.
2599.12
2599.13
2599.14 The contents of this file are subject to the terms of either the GNU
2599.15 @@ -15,9 +18,9 @@
2599.16 specific language governing permissions and limitations under the
2599.17 License. When distributing the software, include this License Header
2599.18 Notice in each file and include the License file at
2599.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2599.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2599.21 particular file as subject to the "Classpath" exception as provided
2599.22 -by Sun in the GPL Version 2 section of the License file that
2599.23 +by Oracle in the GPL Version 2 section of the License file that
2599.24 accompanied this code. If applicable, add the following below the
2599.25 License Header, with the fields enclosed by brackets [] replaced by
2599.26 your own identifying information:
2600.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2600.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2600.3 @@ -1,6 +1,9 @@
2600.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2600.5 #
2600.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2600.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2600.8 +#
2600.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2600.10 +# Other names may be trademarks of their respective owners.
2600.11 #
2600.12 # The contents of this file are subject to the terms of either the GNU
2600.13 # General Public License Version 2 only ("GPL") or the Common
2600.14 @@ -12,9 +15,9 @@
2600.15 # specific language governing permissions and limitations under the
2600.16 # License. When distributing the software, include this License Header
2600.17 # Notice in each file and include the License file at
2600.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2600.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2600.20 # particular file as subject to the "Classpath" exception as provided
2600.21 -# by Sun in the GPL Version 2 section of the License file that
2600.22 +# by Oracle in the GPL Version 2 section of the License file that
2600.23 # accompanied this code. If applicable, add the following below the
2600.24 # License Header, with the fields enclosed by brackets [] replaced by
2600.25 # your own identifying information:
2601.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/AddRemove.java Fri Jul 16 11:47:36 2010 -0400
2601.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/AddRemove.java Fri Jul 16 14:21:50 2010 -0400
2601.3 @@ -1,7 +1,10 @@
2601.4 /*
2601.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2601.6 *
2601.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2601.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2601.9 + *
2601.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2601.11 + * Other names may be trademarks of their respective owners.
2601.12 *
2601.13 * The contents of this file are subject to the terms of either the GNU
2601.14 * General Public License Version 2 only ("GPL") or the Common
2601.15 @@ -13,9 +16,9 @@
2601.16 * specific language governing permissions and limitations under the
2601.17 * License. When distributing the software, include this License Header
2601.18 * Notice in each file and include the License file at
2601.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2601.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2601.21 * particular file as subject to the "Classpath" exception as provided
2601.22 - * by Sun in the GPL Version 2 section of the License file that
2601.23 + * by Oracle in the GPL Version 2 section of the License file that
2601.24 * accompanied this code. If applicable, add the following below the
2601.25 * License Header, with the fields enclosed by brackets [] replaced by
2601.26 * your own identifying information:
2602.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/AddRemoveBase.java Fri Jul 16 11:47:36 2010 -0400
2602.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/AddRemoveBase.java Fri Jul 16 14:21:50 2010 -0400
2602.3 @@ -1,7 +1,10 @@
2602.4 /*
2602.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2602.6 *
2602.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2602.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2602.9 + *
2602.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2602.11 + * Other names may be trademarks of their respective owners.
2602.12 *
2602.13 * The contents of this file are subject to the terms of either the GNU
2602.14 * General Public License Version 2 only ("GPL") or the Common
2602.15 @@ -13,9 +16,9 @@
2602.16 * specific language governing permissions and limitations under the
2602.17 * License. When distributing the software, include this License Header
2602.18 * Notice in each file and include the License file at
2602.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2602.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2602.21 * particular file as subject to the "Classpath" exception as provided
2602.22 - * by Sun in the GPL Version 2 section of the License file that
2602.23 + * by Oracle in the GPL Version 2 section of the License file that
2602.24 * accompanied this code. If applicable, add the following below the
2602.25 * License Header, with the fields enclosed by brackets [] replaced by
2602.26 * your own identifying information:
2603.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Alarm.java Fri Jul 16 11:47:36 2010 -0400
2603.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Alarm.java Fri Jul 16 14:21:50 2010 -0400
2603.3 @@ -1,7 +1,10 @@
2603.4 /*
2603.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2603.6 *
2603.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2603.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2603.9 + *
2603.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2603.11 + * Other names may be trademarks of their respective owners.
2603.12 *
2603.13 * The contents of this file are subject to the terms of either the GNU
2603.14 * General Public License Version 2 only ("GPL") or the Common
2603.15 @@ -13,9 +16,9 @@
2603.16 * specific language governing permissions and limitations under the
2603.17 * License. When distributing the software, include this License Header
2603.18 * Notice in each file and include the License file at
2603.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2603.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2603.21 * particular file as subject to the "Classpath" exception as provided
2603.22 - * by Sun in the GPL Version 2 section of the License file that
2603.23 + * by Oracle in the GPL Version 2 section of the License file that
2603.24 * accompanied this code. If applicable, add the following below the
2603.25 * License Header, with the fields enclosed by brackets [] replaced by
2603.26 * your own identifying information:
2604.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/AlarmBase.java Fri Jul 16 11:47:36 2010 -0400
2604.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/AlarmBase.java Fri Jul 16 14:21:50 2010 -0400
2604.3 @@ -1,7 +1,10 @@
2604.4 /*
2604.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2604.6 *
2604.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2604.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2604.9 + *
2604.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2604.11 + * Other names may be trademarks of their respective owners.
2604.12 *
2604.13 * The contents of this file are subject to the terms of either the GNU
2604.14 * General Public License Version 2 only ("GPL") or the Common
2604.15 @@ -13,9 +16,9 @@
2604.16 * specific language governing permissions and limitations under the
2604.17 * License. When distributing the software, include this License Header
2604.18 * Notice in each file and include the License file at
2604.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2604.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2604.21 * particular file as subject to the "Classpath" exception as provided
2604.22 - * by Sun in the GPL Version 2 section of the License file that
2604.23 + * by Oracle in the GPL Version 2 section of the License file that
2604.24 * accompanied this code. If applicable, add the following below the
2604.25 * License Header, with the fields enclosed by brackets [] replaced by
2604.26 * your own identifying information:
2605.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Alert.java Fri Jul 16 11:47:36 2010 -0400
2605.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Alert.java Fri Jul 16 14:21:50 2010 -0400
2605.3 @@ -1,7 +1,10 @@
2605.4 /*
2605.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2605.6 *
2605.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2605.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2605.9 + *
2605.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2605.11 + * Other names may be trademarks of their respective owners.
2605.12 *
2605.13 * The contents of this file are subject to the terms of either the GNU
2605.14 * General Public License Version 2 only ("GPL") or the Common
2605.15 @@ -13,9 +16,9 @@
2605.16 * specific language governing permissions and limitations under the
2605.17 * License. When distributing the software, include this License Header
2605.18 * Notice in each file and include the License file at
2605.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2605.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2605.21 * particular file as subject to the "Classpath" exception as provided
2605.22 - * by Sun in the GPL Version 2 section of the License file that
2605.23 + * by Oracle in the GPL Version 2 section of the License file that
2605.24 * accompanied this code. If applicable, add the following below the
2605.25 * License Header, with the fields enclosed by brackets [] replaced by
2605.26 * your own identifying information:
2606.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/AlertBase.java Fri Jul 16 11:47:36 2010 -0400
2606.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/AlertBase.java Fri Jul 16 14:21:50 2010 -0400
2606.3 @@ -1,7 +1,10 @@
2606.4 /*
2606.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2606.6 *
2606.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2606.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2606.9 + *
2606.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2606.11 + * Other names may be trademarks of their respective owners.
2606.12 *
2606.13 * The contents of this file are subject to the terms of either the GNU
2606.14 * General Public License Version 2 only ("GPL") or the Common
2606.15 @@ -13,9 +16,9 @@
2606.16 * specific language governing permissions and limitations under the
2606.17 * License. When distributing the software, include this License Header
2606.18 * Notice in each file and include the License file at
2606.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2606.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2606.21 * particular file as subject to the "Classpath" exception as provided
2606.22 - * by Sun in the GPL Version 2 section of the License file that
2606.23 + * by Oracle in the GPL Version 2 section of the License file that
2606.24 * accompanied this code. If applicable, add the following below the
2606.25 * License Header, with the fields enclosed by brackets [] replaced by
2606.26 * your own identifying information:
2607.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Anchor.java Fri Jul 16 11:47:36 2010 -0400
2607.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Anchor.java Fri Jul 16 14:21:50 2010 -0400
2607.3 @@ -1,7 +1,10 @@
2607.4 /*
2607.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2607.6 *
2607.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2607.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2607.9 + *
2607.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2607.11 + * Other names may be trademarks of their respective owners.
2607.12 *
2607.13 * The contents of this file are subject to the terms of either the GNU
2607.14 * General Public License Version 2 only ("GPL") or the Common
2607.15 @@ -13,9 +16,9 @@
2607.16 * specific language governing permissions and limitations under the
2607.17 * License. When distributing the software, include this License Header
2607.18 * Notice in each file and include the License file at
2607.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2607.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2607.21 * particular file as subject to the "Classpath" exception as provided
2607.22 - * by Sun in the GPL Version 2 section of the License file that
2607.23 + * by Oracle in the GPL Version 2 section of the License file that
2607.24 * accompanied this code. If applicable, add the following below the
2607.25 * License Header, with the fields enclosed by brackets [] replaced by
2607.26 * your own identifying information:
2608.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/AnchorBase.java Fri Jul 16 11:47:36 2010 -0400
2608.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/AnchorBase.java Fri Jul 16 14:21:50 2010 -0400
2608.3 @@ -1,7 +1,10 @@
2608.4 /*
2608.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2608.6 *
2608.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2608.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2608.9 + *
2608.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2608.11 + * Other names may be trademarks of their respective owners.
2608.12 *
2608.13 * The contents of this file are subject to the terms of either the GNU
2608.14 * General Public License Version 2 only ("GPL") or the Common
2608.15 @@ -13,9 +16,9 @@
2608.16 * specific language governing permissions and limitations under the
2608.17 * License. When distributing the software, include this License Header
2608.18 * Notice in each file and include the License file at
2608.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2608.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2608.21 * particular file as subject to the "Classpath" exception as provided
2608.22 - * by Sun in the GPL Version 2 section of the License file that
2608.23 + * by Oracle in the GPL Version 2 section of the License file that
2608.24 * accompanied this code. If applicable, add the following below the
2608.25 * License Header, with the fields enclosed by brackets [] replaced by
2608.26 * your own identifying information:
2609.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Body.java Fri Jul 16 11:47:36 2010 -0400
2609.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Body.java Fri Jul 16 14:21:50 2010 -0400
2609.3 @@ -1,7 +1,10 @@
2609.4 /*
2609.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2609.6 *
2609.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2609.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2609.9 + *
2609.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2609.11 + * Other names may be trademarks of their respective owners.
2609.12 *
2609.13 * The contents of this file are subject to the terms of either the GNU
2609.14 * General Public License Version 2 only ("GPL") or the Common
2609.15 @@ -13,9 +16,9 @@
2609.16 * specific language governing permissions and limitations under the
2609.17 * License. When distributing the software, include this License Header
2609.18 * Notice in each file and include the License file at
2609.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2609.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2609.21 * particular file as subject to the "Classpath" exception as provided
2609.22 - * by Sun in the GPL Version 2 section of the License file that
2609.23 + * by Oracle in the GPL Version 2 section of the License file that
2609.24 * accompanied this code. If applicable, add the following below the
2609.25 * License Header, with the fields enclosed by brackets [] replaced by
2609.26 * your own identifying information:
2610.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/BodyBase.java Fri Jul 16 11:47:36 2010 -0400
2610.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/BodyBase.java Fri Jul 16 14:21:50 2010 -0400
2610.3 @@ -1,7 +1,10 @@
2610.4 /*
2610.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2610.6 *
2610.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2610.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2610.9 + *
2610.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2610.11 + * Other names may be trademarks of their respective owners.
2610.12 *
2610.13 * The contents of this file are subject to the terms of either the GNU
2610.14 * General Public License Version 2 only ("GPL") or the Common
2610.15 @@ -13,9 +16,9 @@
2610.16 * specific language governing permissions and limitations under the
2610.17 * License. When distributing the software, include this License Header
2610.18 * Notice in each file and include the License file at
2610.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2610.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2610.21 * particular file as subject to the "Classpath" exception as provided
2610.22 - * by Sun in the GPL Version 2 section of the License file that
2610.23 + * by Oracle in the GPL Version 2 section of the License file that
2610.24 * accompanied this code. If applicable, add the following below the
2610.25 * License Header, with the fields enclosed by brackets [] replaced by
2610.26 * your own identifying information:
2611.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Breadcrumbs.java Fri Jul 16 11:47:36 2010 -0400
2611.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Breadcrumbs.java Fri Jul 16 14:21:50 2010 -0400
2611.3 @@ -1,7 +1,10 @@
2611.4 /*
2611.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2611.6 *
2611.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2611.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2611.9 + *
2611.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2611.11 + * Other names may be trademarks of their respective owners.
2611.12 *
2611.13 * The contents of this file are subject to the terms of either the GNU
2611.14 * General Public License Version 2 only ("GPL") or the Common
2611.15 @@ -13,9 +16,9 @@
2611.16 * specific language governing permissions and limitations under the
2611.17 * License. When distributing the software, include this License Header
2611.18 * Notice in each file and include the License file at
2611.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2611.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2611.21 * particular file as subject to the "Classpath" exception as provided
2611.22 - * by Sun in the GPL Version 2 section of the License file that
2611.23 + * by Oracle in the GPL Version 2 section of the License file that
2611.24 * accompanied this code. If applicable, add the following below the
2611.25 * License Header, with the fields enclosed by brackets [] replaced by
2611.26 * your own identifying information:
2612.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/BreadcrumbsBase.java Fri Jul 16 11:47:36 2010 -0400
2612.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/BreadcrumbsBase.java Fri Jul 16 14:21:50 2010 -0400
2612.3 @@ -1,7 +1,10 @@
2612.4 /*
2612.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2612.6 *
2612.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2612.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2612.9 + *
2612.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2612.11 + * Other names may be trademarks of their respective owners.
2612.12 *
2612.13 * The contents of this file are subject to the terms of either the GNU
2612.14 * General Public License Version 2 only ("GPL") or the Common
2612.15 @@ -13,9 +16,9 @@
2612.16 * specific language governing permissions and limitations under the
2612.17 * License. When distributing the software, include this License Header
2612.18 * Notice in each file and include the License file at
2612.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2612.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2612.21 * particular file as subject to the "Classpath" exception as provided
2612.22 - * by Sun in the GPL Version 2 section of the License file that
2612.23 + * by Oracle in the GPL Version 2 section of the License file that
2612.24 * accompanied this code. If applicable, add the following below the
2612.25 * License Header, with the fields enclosed by brackets [] replaced by
2612.26 * your own identifying information:
2613.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2613.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2613.3 @@ -1,7 +1,10 @@
2613.4 # $Id$
2613.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2613.6 #
2613.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2613.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2613.9 +#
2613.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2613.11 +# Other names may be trademarks of their respective owners.
2613.12 #
2613.13 # The contents of this file are subject to the terms of either the GNU
2613.14 # General Public License Version 2 only ("GPL") or the Common
2613.15 @@ -13,9 +16,9 @@
2613.16 # specific language governing permissions and limitations under the
2613.17 # License. When distributing the software, include this License Header
2613.18 # Notice in each file and include the License file at
2613.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2613.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2613.21 # particular file as subject to the "Classpath" exception as provided
2613.22 -# by Sun in the GPL Version 2 section of the License file that
2613.23 +# by Oracle in the GPL Version 2 section of the License file that
2613.24 # accompanied this code. If applicable, add the following below the
2613.25 # License Header, with the fields enclosed by brackets [] replaced by
2613.26 # your own identifying information:
2614.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Button.java Fri Jul 16 11:47:36 2010 -0400
2614.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Button.java Fri Jul 16 14:21:50 2010 -0400
2614.3 @@ -1,7 +1,10 @@
2614.4 /*
2614.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2614.6 *
2614.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2614.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2614.9 + *
2614.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2614.11 + * Other names may be trademarks of their respective owners.
2614.12 *
2614.13 * The contents of this file are subject to the terms of either the GNU
2614.14 * General Public License Version 2 only ("GPL") or the Common
2614.15 @@ -13,9 +16,9 @@
2614.16 * specific language governing permissions and limitations under the
2614.17 * License. When distributing the software, include this License Header
2614.18 * Notice in each file and include the License file at
2614.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2614.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2614.21 * particular file as subject to the "Classpath" exception as provided
2614.22 - * by Sun in the GPL Version 2 section of the License file that
2614.23 + * by Oracle in the GPL Version 2 section of the License file that
2614.24 * accompanied this code. If applicable, add the following below the
2614.25 * License Header, with the fields enclosed by brackets [] replaced by
2614.26 * your own identifying information:
2615.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ButtonBase.java Fri Jul 16 11:47:36 2010 -0400
2615.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ButtonBase.java Fri Jul 16 14:21:50 2010 -0400
2615.3 @@ -1,7 +1,10 @@
2615.4 /*
2615.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2615.6 *
2615.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2615.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2615.9 + *
2615.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2615.11 + * Other names may be trademarks of their respective owners.
2615.12 *
2615.13 * The contents of this file are subject to the terms of either the GNU
2615.14 * General Public License Version 2 only ("GPL") or the Common
2615.15 @@ -13,9 +16,9 @@
2615.16 * specific language governing permissions and limitations under the
2615.17 * License. When distributing the software, include this License Header
2615.18 * Notice in each file and include the License file at
2615.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2615.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2615.21 * particular file as subject to the "Classpath" exception as provided
2615.22 - * by Sun in the GPL Version 2 section of the License file that
2615.23 + * by Oracle in the GPL Version 2 section of the License file that
2615.24 * accompanied this code. If applicable, add the following below the
2615.25 * License Header, with the fields enclosed by brackets [] replaced by
2615.26 * your own identifying information:
2616.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Calendar.java Fri Jul 16 11:47:36 2010 -0400
2616.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Calendar.java Fri Jul 16 14:21:50 2010 -0400
2616.3 @@ -1,7 +1,10 @@
2616.4 /*
2616.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2616.6 *
2616.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2616.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2616.9 + *
2616.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2616.11 + * Other names may be trademarks of their respective owners.
2616.12 *
2616.13 * The contents of this file are subject to the terms of either the GNU
2616.14 * General Public License Version 2 only ("GPL") or the Common
2616.15 @@ -13,9 +16,9 @@
2616.16 * specific language governing permissions and limitations under the
2616.17 * License. When distributing the software, include this License Header
2616.18 * Notice in each file and include the License file at
2616.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2616.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2616.21 * particular file as subject to the "Classpath" exception as provided
2616.22 - * by Sun in the GPL Version 2 section of the License file that
2616.23 + * by Oracle in the GPL Version 2 section of the License file that
2616.24 * accompanied this code. If applicable, add the following below the
2616.25 * License Header, with the fields enclosed by brackets [] replaced by
2616.26 * your own identifying information:
2617.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/CalendarBase.java Fri Jul 16 11:47:36 2010 -0400
2617.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/CalendarBase.java Fri Jul 16 14:21:50 2010 -0400
2617.3 @@ -1,7 +1,10 @@
2617.4 /*
2617.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2617.6 *
2617.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2617.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2617.9 + *
2617.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2617.11 + * Other names may be trademarks of their respective owners.
2617.12 *
2617.13 * The contents of this file are subject to the terms of either the GNU
2617.14 * General Public License Version 2 only ("GPL") or the Common
2617.15 @@ -13,9 +16,9 @@
2617.16 * specific language governing permissions and limitations under the
2617.17 * License. When distributing the software, include this License Header
2617.18 * Notice in each file and include the License file at
2617.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2617.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2617.21 * particular file as subject to the "Classpath" exception as provided
2617.22 - * by Sun in the GPL Version 2 section of the License file that
2617.23 + * by Oracle in the GPL Version 2 section of the License file that
2617.24 * accompanied this code. If applicable, add the following below the
2617.25 * License Header, with the fields enclosed by brackets [] replaced by
2617.26 * your own identifying information:
2618.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/CalendarMonth.java Fri Jul 16 11:47:36 2010 -0400
2618.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/CalendarMonth.java Fri Jul 16 14:21:50 2010 -0400
2618.3 @@ -1,7 +1,10 @@
2618.4 /*
2618.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2618.6 *
2618.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2618.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2618.9 + *
2618.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2618.11 + * Other names may be trademarks of their respective owners.
2618.12 *
2618.13 * The contents of this file are subject to the terms of either the GNU
2618.14 * General Public License Version 2 only ("GPL") or the Common
2618.15 @@ -13,9 +16,9 @@
2618.16 * specific language governing permissions and limitations under the
2618.17 * License. When distributing the software, include this License Header
2618.18 * Notice in each file and include the License file at
2618.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2618.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2618.21 * particular file as subject to the "Classpath" exception as provided
2618.22 - * by Sun in the GPL Version 2 section of the License file that
2618.23 + * by Oracle in the GPL Version 2 section of the License file that
2618.24 * accompanied this code. If applicable, add the following below the
2618.25 * License Header, with the fields enclosed by brackets [] replaced by
2618.26 * your own identifying information:
2619.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/CalendarMonthBase.java Fri Jul 16 11:47:36 2010 -0400
2619.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/CalendarMonthBase.java Fri Jul 16 14:21:50 2010 -0400
2619.3 @@ -1,7 +1,10 @@
2619.4 /*
2619.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2619.6 *
2619.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2619.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2619.9 + *
2619.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2619.11 + * Other names may be trademarks of their respective owners.
2619.12 *
2619.13 * The contents of this file are subject to the terms of either the GNU
2619.14 * General Public License Version 2 only ("GPL") or the Common
2619.15 @@ -13,9 +16,9 @@
2619.16 * specific language governing permissions and limitations under the
2619.17 * License. When distributing the software, include this License Header
2619.18 * Notice in each file and include the License file at
2619.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2619.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2619.21 * particular file as subject to the "Classpath" exception as provided
2619.22 - * by Sun in the GPL Version 2 section of the License file that
2619.23 + * by Oracle in the GPL Version 2 section of the License file that
2619.24 * accompanied this code. If applicable, add the following below the
2619.25 * License Header, with the fields enclosed by brackets [] replaced by
2619.26 * your own identifying information:
2620.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Checkbox.java Fri Jul 16 11:47:36 2010 -0400
2620.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Checkbox.java Fri Jul 16 14:21:50 2010 -0400
2620.3 @@ -1,7 +1,10 @@
2620.4 /*
2620.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2620.6 *
2620.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2620.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2620.9 + *
2620.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2620.11 + * Other names may be trademarks of their respective owners.
2620.12 *
2620.13 * The contents of this file are subject to the terms of either the GNU
2620.14 * General Public License Version 2 only ("GPL") or the Common
2620.15 @@ -13,9 +16,9 @@
2620.16 * specific language governing permissions and limitations under the
2620.17 * License. When distributing the software, include this License Header
2620.18 * Notice in each file and include the License file at
2620.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2620.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2620.21 * particular file as subject to the "Classpath" exception as provided
2620.22 - * by Sun in the GPL Version 2 section of the License file that
2620.23 + * by Oracle in the GPL Version 2 section of the License file that
2620.24 * accompanied this code. If applicable, add the following below the
2620.25 * License Header, with the fields enclosed by brackets [] replaced by
2620.26 * your own identifying information:
2621.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/CheckboxBase.java Fri Jul 16 11:47:36 2010 -0400
2621.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/CheckboxBase.java Fri Jul 16 14:21:50 2010 -0400
2621.3 @@ -1,7 +1,10 @@
2621.4 /*
2621.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2621.6 *
2621.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2621.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2621.9 + *
2621.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2621.11 + * Other names may be trademarks of their respective owners.
2621.12 *
2621.13 * The contents of this file are subject to the terms of either the GNU
2621.14 * General Public License Version 2 only ("GPL") or the Common
2621.15 @@ -13,9 +16,9 @@
2621.16 * specific language governing permissions and limitations under the
2621.17 * License. When distributing the software, include this License Header
2621.18 * Notice in each file and include the License file at
2621.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2621.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2621.21 * particular file as subject to the "Classpath" exception as provided
2621.22 - * by Sun in the GPL Version 2 section of the License file that
2621.23 + * by Oracle in the GPL Version 2 section of the License file that
2621.24 * accompanied this code. If applicable, add the following below the
2621.25 * License Header, with the fields enclosed by brackets [] replaced by
2621.26 * your own identifying information:
2622.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/CheckboxGroup.java Fri Jul 16 11:47:36 2010 -0400
2622.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/CheckboxGroup.java Fri Jul 16 14:21:50 2010 -0400
2622.3 @@ -1,7 +1,10 @@
2622.4 /*
2622.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2622.6 *
2622.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2622.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2622.9 + *
2622.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2622.11 + * Other names may be trademarks of their respective owners.
2622.12 *
2622.13 * The contents of this file are subject to the terms of either the GNU
2622.14 * General Public License Version 2 only ("GPL") or the Common
2622.15 @@ -13,9 +16,9 @@
2622.16 * specific language governing permissions and limitations under the
2622.17 * License. When distributing the software, include this License Header
2622.18 * Notice in each file and include the License file at
2622.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2622.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2622.21 * particular file as subject to the "Classpath" exception as provided
2622.22 - * by Sun in the GPL Version 2 section of the License file that
2622.23 + * by Oracle in the GPL Version 2 section of the License file that
2622.24 * accompanied this code. If applicable, add the following below the
2622.25 * License Header, with the fields enclosed by brackets [] replaced by
2622.26 * your own identifying information:
2623.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/CheckboxGroupBase.java Fri Jul 16 11:47:36 2010 -0400
2623.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/CheckboxGroupBase.java Fri Jul 16 14:21:50 2010 -0400
2623.3 @@ -1,7 +1,10 @@
2623.4 /*
2623.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2623.6 *
2623.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2623.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2623.9 + *
2623.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2623.11 + * Other names may be trademarks of their respective owners.
2623.12 *
2623.13 * The contents of this file are subject to the terms of either the GNU
2623.14 * General Public License Version 2 only ("GPL") or the Common
2623.15 @@ -13,9 +16,9 @@
2623.16 * specific language governing permissions and limitations under the
2623.17 * License. When distributing the software, include this License Header
2623.18 * Notice in each file and include the License file at
2623.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2623.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2623.21 * particular file as subject to the "Classpath" exception as provided
2623.22 - * by Sun in the GPL Version 2 section of the License file that
2623.23 + * by Oracle in the GPL Version 2 section of the License file that
2623.24 * accompanied this code. If applicable, add the following below the
2623.25 * License Header, with the fields enclosed by brackets [] replaced by
2623.26 * your own identifying information:
2624.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ChildManager.java Fri Jul 16 11:47:36 2010 -0400
2624.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ChildManager.java Fri Jul 16 14:21:50 2010 -0400
2624.3 @@ -1,7 +1,10 @@
2624.4 /*
2624.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2624.6 *
2624.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2624.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2624.9 + *
2624.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2624.11 + * Other names may be trademarks of their respective owners.
2624.12 *
2624.13 * The contents of this file are subject to the terms of either the GNU
2624.14 * General Public License Version 2 only ("GPL") or the Common
2624.15 @@ -13,9 +16,9 @@
2624.16 * specific language governing permissions and limitations under the
2624.17 * License. When distributing the software, include this License Header
2624.18 * Notice in each file and include the License file at
2624.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2624.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2624.21 * particular file as subject to the "Classpath" exception as provided
2624.22 - * by Sun in the GPL Version 2 section of the License file that
2624.23 + * by Oracle in the GPL Version 2 section of the License file that
2624.24 * accompanied this code. If applicable, add the following below the
2624.25 * License Header, with the fields enclosed by brackets [] replaced by
2624.26 * your own identifying information:
2625.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ComplexComponent.java Fri Jul 16 11:47:36 2010 -0400
2625.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ComplexComponent.java Fri Jul 16 14:21:50 2010 -0400
2625.3 @@ -1,7 +1,10 @@
2625.4 /*
2625.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2625.6 *
2625.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2625.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2625.9 + *
2625.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2625.11 + * Other names may be trademarks of their respective owners.
2625.12 *
2625.13 * The contents of this file are subject to the terms of either the GNU
2625.14 * General Public License Version 2 only ("GPL") or the Common
2625.15 @@ -13,9 +16,9 @@
2625.16 * specific language governing permissions and limitations under the
2625.17 * License. When distributing the software, include this License Header
2625.18 * Notice in each file and include the License file at
2625.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2625.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2625.21 * particular file as subject to the "Classpath" exception as provided
2625.22 - * by Sun in the GPL Version 2 section of the License file that
2625.23 + * by Oracle in the GPL Version 2 section of the License file that
2625.24 * accompanied this code. If applicable, add the following below the
2625.25 * License Header, with the fields enclosed by brackets [] replaced by
2625.26 * your own identifying information:
2626.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/DateManager.java Fri Jul 16 11:47:36 2010 -0400
2626.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/DateManager.java Fri Jul 16 14:21:50 2010 -0400
2626.3 @@ -1,7 +1,10 @@
2626.4 /*
2626.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2626.6 *
2626.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2626.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2626.9 + *
2626.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2626.11 + * Other names may be trademarks of their respective owners.
2626.12 *
2626.13 * The contents of this file are subject to the terms of either the GNU
2626.14 * General Public License Version 2 only ("GPL") or the Common
2626.15 @@ -13,9 +16,9 @@
2626.16 * specific language governing permissions and limitations under the
2626.17 * License. When distributing the software, include this License Header
2626.18 * Notice in each file and include the License file at
2626.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2626.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2626.21 * particular file as subject to the "Classpath" exception as provided
2626.22 - * by Sun in the GPL Version 2 section of the License file that
2626.23 + * by Oracle in the GPL Version 2 section of the License file that
2626.24 * accompanied this code. If applicable, add the following below the
2626.25 * License Header, with the fields enclosed by brackets [] replaced by
2626.26 * your own identifying information:
2627.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/DropDown.java Fri Jul 16 11:47:36 2010 -0400
2627.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/DropDown.java Fri Jul 16 14:21:50 2010 -0400
2627.3 @@ -1,7 +1,10 @@
2627.4 /*
2627.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2627.6 *
2627.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2627.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2627.9 + *
2627.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2627.11 + * Other names may be trademarks of their respective owners.
2627.12 *
2627.13 * The contents of this file are subject to the terms of either the GNU
2627.14 * General Public License Version 2 only ("GPL") or the Common
2627.15 @@ -13,9 +16,9 @@
2627.16 * specific language governing permissions and limitations under the
2627.17 * License. When distributing the software, include this License Header
2627.18 * Notice in each file and include the License file at
2627.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2627.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2627.21 * particular file as subject to the "Classpath" exception as provided
2627.22 - * by Sun in the GPL Version 2 section of the License file that
2627.23 + * by Oracle in the GPL Version 2 section of the License file that
2627.24 * accompanied this code. If applicable, add the following below the
2627.25 * License Header, with the fields enclosed by brackets [] replaced by
2627.26 * your own identifying information:
2628.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/DropDownBase.java Fri Jul 16 11:47:36 2010 -0400
2628.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/DropDownBase.java Fri Jul 16 14:21:50 2010 -0400
2628.3 @@ -1,7 +1,10 @@
2628.4 /*
2628.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2628.6 *
2628.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2628.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2628.9 + *
2628.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2628.11 + * Other names may be trademarks of their respective owners.
2628.12 *
2628.13 * The contents of this file are subject to the terms of either the GNU
2628.14 * General Public License Version 2 only ("GPL") or the Common
2628.15 @@ -13,9 +16,9 @@
2628.16 * specific language governing permissions and limitations under the
2628.17 * License. When distributing the software, include this License Header
2628.18 * Notice in each file and include the License file at
2628.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2628.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2628.21 * particular file as subject to the "Classpath" exception as provided
2628.22 - * by Sun in the GPL Version 2 section of the License file that
2628.23 + * by Oracle in the GPL Version 2 section of the License file that
2628.24 * accompanied this code. If applicable, add the following below the
2628.25 * License Header, with the fields enclosed by brackets [] replaced by
2628.26 * your own identifying information:
2629.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/EditableList.java Fri Jul 16 11:47:36 2010 -0400
2629.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/EditableList.java Fri Jul 16 14:21:50 2010 -0400
2629.3 @@ -1,7 +1,10 @@
2629.4 /*
2629.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2629.6 *
2629.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2629.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2629.9 + *
2629.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2629.11 + * Other names may be trademarks of their respective owners.
2629.12 *
2629.13 * The contents of this file are subject to the terms of either the GNU
2629.14 * General Public License Version 2 only ("GPL") or the Common
2629.15 @@ -13,9 +16,9 @@
2629.16 * specific language governing permissions and limitations under the
2629.17 * License. When distributing the software, include this License Header
2629.18 * Notice in each file and include the License file at
2629.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2629.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2629.21 * particular file as subject to the "Classpath" exception as provided
2629.22 - * by Sun in the GPL Version 2 section of the License file that
2629.23 + * by Oracle in the GPL Version 2 section of the License file that
2629.24 * accompanied this code. If applicable, add the following below the
2629.25 * License Header, with the fields enclosed by brackets [] replaced by
2629.26 * your own identifying information:
2630.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/EditableListBase.java Fri Jul 16 11:47:36 2010 -0400
2630.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/EditableListBase.java Fri Jul 16 14:21:50 2010 -0400
2630.3 @@ -1,7 +1,10 @@
2630.4 /*
2630.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2630.6 *
2630.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2630.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2630.9 + *
2630.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2630.11 + * Other names may be trademarks of their respective owners.
2630.12 *
2630.13 * The contents of this file are subject to the terms of either the GNU
2630.14 * General Public License Version 2 only ("GPL") or the Common
2630.15 @@ -13,9 +16,9 @@
2630.16 * specific language governing permissions and limitations under the
2630.17 * License. When distributing the software, include this License Header
2630.18 * Notice in each file and include the License file at
2630.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2630.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2630.21 * particular file as subject to the "Classpath" exception as provided
2630.22 - * by Sun in the GPL Version 2 section of the License file that
2630.23 + * by Oracle in the GPL Version 2 section of the License file that
2630.24 * accompanied this code. If applicable, add the following below the
2630.25 * License Header, with the fields enclosed by brackets [] replaced by
2630.26 * your own identifying information:
2631.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Field.java Fri Jul 16 11:47:36 2010 -0400
2631.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Field.java Fri Jul 16 14:21:50 2010 -0400
2631.3 @@ -1,7 +1,10 @@
2631.4 /*
2631.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2631.6 *
2631.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2631.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2631.9 + *
2631.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2631.11 + * Other names may be trademarks of their respective owners.
2631.12 *
2631.13 * The contents of this file are subject to the terms of either the GNU
2631.14 * General Public License Version 2 only ("GPL") or the Common
2631.15 @@ -13,9 +16,9 @@
2631.16 * specific language governing permissions and limitations under the
2631.17 * License. When distributing the software, include this License Header
2631.18 * Notice in each file and include the License file at
2631.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2631.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2631.21 * particular file as subject to the "Classpath" exception as provided
2631.22 - * by Sun in the GPL Version 2 section of the License file that
2631.23 + * by Oracle in the GPL Version 2 section of the License file that
2631.24 * accompanied this code. If applicable, add the following below the
2631.25 * License Header, with the fields enclosed by brackets [] replaced by
2631.26 * your own identifying information:
2632.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/FieldBase.java Fri Jul 16 11:47:36 2010 -0400
2632.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/FieldBase.java Fri Jul 16 14:21:50 2010 -0400
2632.3 @@ -1,7 +1,10 @@
2632.4 /*
2632.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2632.6 *
2632.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2632.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2632.9 + *
2632.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2632.11 + * Other names may be trademarks of their respective owners.
2632.12 *
2632.13 * The contents of this file are subject to the terms of either the GNU
2632.14 * General Public License Version 2 only ("GPL") or the Common
2632.15 @@ -13,9 +16,9 @@
2632.16 * specific language governing permissions and limitations under the
2632.17 * License. When distributing the software, include this License Header
2632.18 * Notice in each file and include the License file at
2632.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2632.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2632.21 * particular file as subject to the "Classpath" exception as provided
2632.22 - * by Sun in the GPL Version 2 section of the License file that
2632.23 + * by Oracle in the GPL Version 2 section of the License file that
2632.24 * accompanied this code. If applicable, add the following below the
2632.25 * License Header, with the fields enclosed by brackets [] replaced by
2632.26 * your own identifying information:
2633.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Form.java Fri Jul 16 11:47:36 2010 -0400
2633.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Form.java Fri Jul 16 14:21:50 2010 -0400
2633.3 @@ -1,7 +1,10 @@
2633.4 /*
2633.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2633.6 *
2633.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2633.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2633.9 + *
2633.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2633.11 + * Other names may be trademarks of their respective owners.
2633.12 *
2633.13 * The contents of this file are subject to the terms of either the GNU
2633.14 * General Public License Version 2 only ("GPL") or the Common
2633.15 @@ -13,9 +16,9 @@
2633.16 * specific language governing permissions and limitations under the
2633.17 * License. When distributing the software, include this License Header
2633.18 * Notice in each file and include the License file at
2633.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2633.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2633.21 * particular file as subject to the "Classpath" exception as provided
2633.22 - * by Sun in the GPL Version 2 section of the License file that
2633.23 + * by Oracle in the GPL Version 2 section of the License file that
2633.24 * accompanied this code. If applicable, add the following below the
2633.25 * License Header, with the fields enclosed by brackets [] replaced by
2633.26 * your own identifying information:
2634.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/FormBase.java Fri Jul 16 11:47:36 2010 -0400
2634.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/FormBase.java Fri Jul 16 14:21:50 2010 -0400
2634.3 @@ -1,7 +1,10 @@
2634.4 /*
2634.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2634.6 *
2634.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2634.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2634.9 + *
2634.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2634.11 + * Other names may be trademarks of their respective owners.
2634.12 *
2634.13 * The contents of this file are subject to the terms of either the GNU
2634.14 * General Public License Version 2 only ("GPL") or the Common
2634.15 @@ -13,9 +16,9 @@
2634.16 * specific language governing permissions and limitations under the
2634.17 * License. When distributing the software, include this License Header
2634.18 * Notice in each file and include the License file at
2634.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2634.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2634.21 * particular file as subject to the "Classpath" exception as provided
2634.22 - * by Sun in the GPL Version 2 section of the License file that
2634.23 + * by Oracle in the GPL Version 2 section of the License file that
2634.24 * accompanied this code. If applicable, add the following below the
2634.25 * License Header, with the fields enclosed by brackets [] replaced by
2634.26 * your own identifying information:
2635.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Frame.java Fri Jul 16 11:47:36 2010 -0400
2635.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Frame.java Fri Jul 16 14:21:50 2010 -0400
2635.3 @@ -1,7 +1,10 @@
2635.4 /*
2635.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2635.6 *
2635.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2635.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2635.9 + *
2635.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2635.11 + * Other names may be trademarks of their respective owners.
2635.12 *
2635.13 * The contents of this file are subject to the terms of either the GNU
2635.14 * General Public License Version 2 only ("GPL") or the Common
2635.15 @@ -13,9 +16,9 @@
2635.16 * specific language governing permissions and limitations under the
2635.17 * License. When distributing the software, include this License Header
2635.18 * Notice in each file and include the License file at
2635.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2635.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2635.21 * particular file as subject to the "Classpath" exception as provided
2635.22 - * by Sun in the GPL Version 2 section of the License file that
2635.23 + * by Oracle in the GPL Version 2 section of the License file that
2635.24 * accompanied this code. If applicable, add the following below the
2635.25 * License Header, with the fields enclosed by brackets [] replaced by
2635.26 * your own identifying information:
2636.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/FrameBase.java Fri Jul 16 11:47:36 2010 -0400
2636.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/FrameBase.java Fri Jul 16 14:21:50 2010 -0400
2636.3 @@ -1,7 +1,10 @@
2636.4 /*
2636.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2636.6 *
2636.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2636.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2636.9 + *
2636.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2636.11 + * Other names may be trademarks of their respective owners.
2636.12 *
2636.13 * The contents of this file are subject to the terms of either the GNU
2636.14 * General Public License Version 2 only ("GPL") or the Common
2636.15 @@ -13,9 +16,9 @@
2636.16 * specific language governing permissions and limitations under the
2636.17 * License. When distributing the software, include this License Header
2636.18 * Notice in each file and include the License file at
2636.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2636.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2636.21 * particular file as subject to the "Classpath" exception as provided
2636.22 - * by Sun in the GPL Version 2 section of the License file that
2636.23 + * by Oracle in the GPL Version 2 section of the License file that
2636.24 * accompanied this code. If applicable, add the following below the
2636.25 * License Header, with the fields enclosed by brackets [] replaced by
2636.26 * your own identifying information:
2637.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/FrameSet.java Fri Jul 16 11:47:36 2010 -0400
2637.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/FrameSet.java Fri Jul 16 14:21:50 2010 -0400
2637.3 @@ -1,7 +1,10 @@
2637.4 /*
2637.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2637.6 *
2637.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2637.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2637.9 + *
2637.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2637.11 + * Other names may be trademarks of their respective owners.
2637.12 *
2637.13 * The contents of this file are subject to the terms of either the GNU
2637.14 * General Public License Version 2 only ("GPL") or the Common
2637.15 @@ -13,9 +16,9 @@
2637.16 * specific language governing permissions and limitations under the
2637.17 * License. When distributing the software, include this License Header
2637.18 * Notice in each file and include the License file at
2637.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2637.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2637.21 * particular file as subject to the "Classpath" exception as provided
2637.22 - * by Sun in the GPL Version 2 section of the License file that
2637.23 + * by Oracle in the GPL Version 2 section of the License file that
2637.24 * accompanied this code. If applicable, add the following below the
2637.25 * License Header, with the fields enclosed by brackets [] replaced by
2637.26 * your own identifying information:
2638.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/FrameSetBase.java Fri Jul 16 11:47:36 2010 -0400
2638.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/FrameSetBase.java Fri Jul 16 14:21:50 2010 -0400
2638.3 @@ -1,7 +1,10 @@
2638.4 /*
2638.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2638.6 *
2638.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2638.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2638.9 + *
2638.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2638.11 + * Other names may be trademarks of their respective owners.
2638.12 *
2638.13 * The contents of this file are subject to the terms of either the GNU
2638.14 * General Public License Version 2 only ("GPL") or the Common
2638.15 @@ -13,9 +16,9 @@
2638.16 * specific language governing permissions and limitations under the
2638.17 * License. When distributing the software, include this License Header
2638.18 * Notice in each file and include the License file at
2638.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2638.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2638.21 * particular file as subject to the "Classpath" exception as provided
2638.22 - * by Sun in the GPL Version 2 section of the License file that
2638.23 + * by Oracle in the GPL Version 2 section of the License file that
2638.24 * accompanied this code. If applicable, add the following below the
2638.25 * License Header, with the fields enclosed by brackets [] replaced by
2638.26 * your own identifying information:
2639.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Head.java Fri Jul 16 11:47:36 2010 -0400
2639.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Head.java Fri Jul 16 14:21:50 2010 -0400
2639.3 @@ -1,7 +1,10 @@
2639.4 /*
2639.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2639.6 *
2639.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2639.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2639.9 + *
2639.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2639.11 + * Other names may be trademarks of their respective owners.
2639.12 *
2639.13 * The contents of this file are subject to the terms of either the GNU
2639.14 * General Public License Version 2 only ("GPL") or the Common
2639.15 @@ -13,9 +16,9 @@
2639.16 * specific language governing permissions and limitations under the
2639.17 * License. When distributing the software, include this License Header
2639.18 * Notice in each file and include the License file at
2639.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2639.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2639.21 * particular file as subject to the "Classpath" exception as provided
2639.22 - * by Sun in the GPL Version 2 section of the License file that
2639.23 + * by Oracle in the GPL Version 2 section of the License file that
2639.24 * accompanied this code. If applicable, add the following below the
2639.25 * License Header, with the fields enclosed by brackets [] replaced by
2639.26 * your own identifying information:
2640.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/HeadBase.java Fri Jul 16 11:47:36 2010 -0400
2640.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/HeadBase.java Fri Jul 16 14:21:50 2010 -0400
2640.3 @@ -1,7 +1,10 @@
2640.4 /*
2640.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2640.6 *
2640.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2640.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2640.9 + *
2640.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2640.11 + * Other names may be trademarks of their respective owners.
2640.12 *
2640.13 * The contents of this file are subject to the terms of either the GNU
2640.14 * General Public License Version 2 only ("GPL") or the Common
2640.15 @@ -13,9 +16,9 @@
2640.16 * specific language governing permissions and limitations under the
2640.17 * License. When distributing the software, include this License Header
2640.18 * Notice in each file and include the License file at
2640.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2640.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2640.21 * particular file as subject to the "Classpath" exception as provided
2640.22 - * by Sun in the GPL Version 2 section of the License file that
2640.23 + * by Oracle in the GPL Version 2 section of the License file that
2640.24 * accompanied this code. If applicable, add the following below the
2640.25 * License Header, with the fields enclosed by brackets [] replaced by
2640.26 * your own identifying information:
2641.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/HelpInline.java Fri Jul 16 11:47:36 2010 -0400
2641.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/HelpInline.java Fri Jul 16 14:21:50 2010 -0400
2641.3 @@ -1,7 +1,10 @@
2641.4 /*
2641.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2641.6 *
2641.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2641.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2641.9 + *
2641.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2641.11 + * Other names may be trademarks of their respective owners.
2641.12 *
2641.13 * The contents of this file are subject to the terms of either the GNU
2641.14 * General Public License Version 2 only ("GPL") or the Common
2641.15 @@ -13,9 +16,9 @@
2641.16 * specific language governing permissions and limitations under the
2641.17 * License. When distributing the software, include this License Header
2641.18 * Notice in each file and include the License file at
2641.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2641.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2641.21 * particular file as subject to the "Classpath" exception as provided
2641.22 - * by Sun in the GPL Version 2 section of the License file that
2641.23 + * by Oracle in the GPL Version 2 section of the License file that
2641.24 * accompanied this code. If applicable, add the following below the
2641.25 * License Header, with the fields enclosed by brackets [] replaced by
2641.26 * your own identifying information:
2642.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/HelpInlineBase.java Fri Jul 16 11:47:36 2010 -0400
2642.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/HelpInlineBase.java Fri Jul 16 14:21:50 2010 -0400
2642.3 @@ -1,7 +1,10 @@
2642.4 /*
2642.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2642.6 *
2642.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2642.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2642.9 + *
2642.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2642.11 + * Other names may be trademarks of their respective owners.
2642.12 *
2642.13 * The contents of this file are subject to the terms of either the GNU
2642.14 * General Public License Version 2 only ("GPL") or the Common
2642.15 @@ -13,9 +16,9 @@
2642.16 * specific language governing permissions and limitations under the
2642.17 * License. When distributing the software, include this License Header
2642.18 * Notice in each file and include the License file at
2642.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2642.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2642.21 * particular file as subject to the "Classpath" exception as provided
2642.22 - * by Sun in the GPL Version 2 section of the License file that
2642.23 + * by Oracle in the GPL Version 2 section of the License file that
2642.24 * accompanied this code. If applicable, add the following below the
2642.25 * License Header, with the fields enclosed by brackets [] replaced by
2642.26 * your own identifying information:
2643.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/HiddenField.java Fri Jul 16 11:47:36 2010 -0400
2643.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/HiddenField.java Fri Jul 16 14:21:50 2010 -0400
2643.3 @@ -1,7 +1,10 @@
2643.4 /*
2643.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2643.6 *
2643.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2643.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2643.9 + *
2643.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2643.11 + * Other names may be trademarks of their respective owners.
2643.12 *
2643.13 * The contents of this file are subject to the terms of either the GNU
2643.14 * General Public License Version 2 only ("GPL") or the Common
2643.15 @@ -13,9 +16,9 @@
2643.16 * specific language governing permissions and limitations under the
2643.17 * License. When distributing the software, include this License Header
2643.18 * Notice in each file and include the License file at
2643.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2643.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2643.21 * particular file as subject to the "Classpath" exception as provided
2643.22 - * by Sun in the GPL Version 2 section of the License file that
2643.23 + * by Oracle in the GPL Version 2 section of the License file that
2643.24 * accompanied this code. If applicable, add the following below the
2643.25 * License Header, with the fields enclosed by brackets [] replaced by
2643.26 * your own identifying information:
2644.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/HiddenFieldBase.java Fri Jul 16 11:47:36 2010 -0400
2644.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/HiddenFieldBase.java Fri Jul 16 14:21:50 2010 -0400
2644.3 @@ -1,7 +1,10 @@
2644.4 /*
2644.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2644.6 *
2644.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2644.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2644.9 + *
2644.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2644.11 + * Other names may be trademarks of their respective owners.
2644.12 *
2644.13 * The contents of this file are subject to the terms of either the GNU
2644.14 * General Public License Version 2 only ("GPL") or the Common
2644.15 @@ -13,9 +16,9 @@
2644.16 * specific language governing permissions and limitations under the
2644.17 * License. When distributing the software, include this License Header
2644.18 * Notice in each file and include the License file at
2644.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2644.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2644.21 * particular file as subject to the "Classpath" exception as provided
2644.22 - * by Sun in the GPL Version 2 section of the License file that
2644.23 + * by Oracle in the GPL Version 2 section of the License file that
2644.24 * accompanied this code. If applicable, add the following below the
2644.25 * License Header, with the fields enclosed by brackets [] replaced by
2644.26 * your own identifying information:
2645.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Html.java Fri Jul 16 11:47:36 2010 -0400
2645.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Html.java Fri Jul 16 14:21:50 2010 -0400
2645.3 @@ -1,7 +1,10 @@
2645.4 /*
2645.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2645.6 *
2645.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2645.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2645.9 + *
2645.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2645.11 + * Other names may be trademarks of their respective owners.
2645.12 *
2645.13 * The contents of this file are subject to the terms of either the GNU
2645.14 * General Public License Version 2 only ("GPL") or the Common
2645.15 @@ -13,9 +16,9 @@
2645.16 * specific language governing permissions and limitations under the
2645.17 * License. When distributing the software, include this License Header
2645.18 * Notice in each file and include the License file at
2645.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2645.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2645.21 * particular file as subject to the "Classpath" exception as provided
2645.22 - * by Sun in the GPL Version 2 section of the License file that
2645.23 + * by Oracle in the GPL Version 2 section of the License file that
2645.24 * accompanied this code. If applicable, add the following below the
2645.25 * License Header, with the fields enclosed by brackets [] replaced by
2645.26 * your own identifying information:
2646.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/HtmlBase.java Fri Jul 16 11:47:36 2010 -0400
2646.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/HtmlBase.java Fri Jul 16 14:21:50 2010 -0400
2646.3 @@ -1,7 +1,10 @@
2646.4 /*
2646.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2646.6 *
2646.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2646.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2646.9 + *
2646.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2646.11 + * Other names may be trademarks of their respective owners.
2646.12 *
2646.13 * The contents of this file are subject to the terms of either the GNU
2646.14 * General Public License Version 2 only ("GPL") or the Common
2646.15 @@ -13,9 +16,9 @@
2646.16 * specific language governing permissions and limitations under the
2646.17 * License. When distributing the software, include this License Header
2646.18 * Notice in each file and include the License file at
2646.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2646.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2646.21 * particular file as subject to the "Classpath" exception as provided
2646.22 - * by Sun in the GPL Version 2 section of the License file that
2646.23 + * by Oracle in the GPL Version 2 section of the License file that
2646.24 * accompanied this code. If applicable, add the following below the
2646.25 * License Header, with the fields enclosed by brackets [] replaced by
2646.26 * your own identifying information:
2647.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Hyperlink.java Fri Jul 16 11:47:36 2010 -0400
2647.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Hyperlink.java Fri Jul 16 14:21:50 2010 -0400
2647.3 @@ -1,7 +1,10 @@
2647.4 /*
2647.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2647.6 *
2647.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2647.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2647.9 + *
2647.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2647.11 + * Other names may be trademarks of their respective owners.
2647.12 *
2647.13 * The contents of this file are subject to the terms of either the GNU
2647.14 * General Public License Version 2 only ("GPL") or the Common
2647.15 @@ -13,9 +16,9 @@
2647.16 * specific language governing permissions and limitations under the
2647.17 * License. When distributing the software, include this License Header
2647.18 * Notice in each file and include the License file at
2647.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2647.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2647.21 * particular file as subject to the "Classpath" exception as provided
2647.22 - * by Sun in the GPL Version 2 section of the License file that
2647.23 + * by Oracle in the GPL Version 2 section of the License file that
2647.24 * accompanied this code. If applicable, add the following below the
2647.25 * License Header, with the fields enclosed by brackets [] replaced by
2647.26 * your own identifying information:
2648.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/HyperlinkBase.java Fri Jul 16 11:47:36 2010 -0400
2648.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/HyperlinkBase.java Fri Jul 16 14:21:50 2010 -0400
2648.3 @@ -1,7 +1,10 @@
2648.4 /*
2648.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2648.6 *
2648.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2648.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2648.9 + *
2648.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2648.11 + * Other names may be trademarks of their respective owners.
2648.12 *
2648.13 * The contents of this file are subject to the terms of either the GNU
2648.14 * General Public License Version 2 only ("GPL") or the Common
2648.15 @@ -13,9 +16,9 @@
2648.16 * specific language governing permissions and limitations under the
2648.17 * License. When distributing the software, include this License Header
2648.18 * Notice in each file and include the License file at
2648.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2648.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2648.21 * particular file as subject to the "Classpath" exception as provided
2648.22 - * by Sun in the GPL Version 2 section of the License file that
2648.23 + * by Oracle in the GPL Version 2 section of the License file that
2648.24 * accompanied this code. If applicable, add the following below the
2648.25 * License Header, with the fields enclosed by brackets [] replaced by
2648.26 * your own identifying information:
2649.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/IFrame.java Fri Jul 16 11:47:36 2010 -0400
2649.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/IFrame.java Fri Jul 16 14:21:50 2010 -0400
2649.3 @@ -1,7 +1,10 @@
2649.4 /*
2649.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2649.6 *
2649.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2649.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2649.9 + *
2649.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2649.11 + * Other names may be trademarks of their respective owners.
2649.12 *
2649.13 * The contents of this file are subject to the terms of either the GNU
2649.14 * General Public License Version 2 only ("GPL") or the Common
2649.15 @@ -13,9 +16,9 @@
2649.16 * specific language governing permissions and limitations under the
2649.17 * License. When distributing the software, include this License Header
2649.18 * Notice in each file and include the License file at
2649.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2649.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2649.21 * particular file as subject to the "Classpath" exception as provided
2649.22 - * by Sun in the GPL Version 2 section of the License file that
2649.23 + * by Oracle in the GPL Version 2 section of the License file that
2649.24 * accompanied this code. If applicable, add the following below the
2649.25 * License Header, with the fields enclosed by brackets [] replaced by
2649.26 * your own identifying information:
2650.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/IFrameBase.java Fri Jul 16 11:47:36 2010 -0400
2650.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/IFrameBase.java Fri Jul 16 14:21:50 2010 -0400
2650.3 @@ -1,7 +1,10 @@
2650.4 /*
2650.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2650.6 *
2650.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2650.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2650.9 + *
2650.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2650.11 + * Other names may be trademarks of their respective owners.
2650.12 *
2650.13 * The contents of this file are subject to the terms of either the GNU
2650.14 * General Public License Version 2 only ("GPL") or the Common
2650.15 @@ -13,9 +16,9 @@
2650.16 * specific language governing permissions and limitations under the
2650.17 * License. When distributing the software, include this License Header
2650.18 * Notice in each file and include the License file at
2650.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2650.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2650.21 * particular file as subject to the "Classpath" exception as provided
2650.22 - * by Sun in the GPL Version 2 section of the License file that
2650.23 + * by Oracle in the GPL Version 2 section of the License file that
2650.24 * accompanied this code. If applicable, add the following below the
2650.25 * License Header, with the fields enclosed by brackets [] replaced by
2650.26 * your own identifying information:
2651.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Icon.java Fri Jul 16 11:47:36 2010 -0400
2651.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Icon.java Fri Jul 16 14:21:50 2010 -0400
2651.3 @@ -1,7 +1,10 @@
2651.4 /*
2651.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2651.6 *
2651.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2651.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2651.9 + *
2651.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2651.11 + * Other names may be trademarks of their respective owners.
2651.12 *
2651.13 * The contents of this file are subject to the terms of either the GNU
2651.14 * General Public License Version 2 only ("GPL") or the Common
2651.15 @@ -13,9 +16,9 @@
2651.16 * specific language governing permissions and limitations under the
2651.17 * License. When distributing the software, include this License Header
2651.18 * Notice in each file and include the License file at
2651.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2651.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2651.21 * particular file as subject to the "Classpath" exception as provided
2651.22 - * by Sun in the GPL Version 2 section of the License file that
2651.23 + * by Oracle in the GPL Version 2 section of the License file that
2651.24 * accompanied this code. If applicable, add the following below the
2651.25 * License Header, with the fields enclosed by brackets [] replaced by
2651.26 * your own identifying information:
2652.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/IconBase.java Fri Jul 16 11:47:36 2010 -0400
2652.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/IconBase.java Fri Jul 16 14:21:50 2010 -0400
2652.3 @@ -1,7 +1,10 @@
2652.4 /*
2652.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2652.6 *
2652.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2652.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2652.9 + *
2652.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2652.11 + * Other names may be trademarks of their respective owners.
2652.12 *
2652.13 * The contents of this file are subject to the terms of either the GNU
2652.14 * General Public License Version 2 only ("GPL") or the Common
2652.15 @@ -13,9 +16,9 @@
2652.16 * specific language governing permissions and limitations under the
2652.17 * License. When distributing the software, include this License Header
2652.18 * Notice in each file and include the License file at
2652.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2652.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2652.21 * particular file as subject to the "Classpath" exception as provided
2652.22 - * by Sun in the GPL Version 2 section of the License file that
2652.23 + * by Oracle in the GPL Version 2 section of the License file that
2652.24 * accompanied this code. If applicable, add the following below the
2652.25 * License Header, with the fields enclosed by brackets [] replaced by
2652.26 * your own identifying information:
2653.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/IconHyperlink.java Fri Jul 16 11:47:36 2010 -0400
2653.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/IconHyperlink.java Fri Jul 16 14:21:50 2010 -0400
2653.3 @@ -1,7 +1,10 @@
2653.4 /*
2653.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2653.6 *
2653.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2653.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2653.9 + *
2653.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2653.11 + * Other names may be trademarks of their respective owners.
2653.12 *
2653.13 * The contents of this file are subject to the terms of either the GNU
2653.14 * General Public License Version 2 only ("GPL") or the Common
2653.15 @@ -13,9 +16,9 @@
2653.16 * specific language governing permissions and limitations under the
2653.17 * License. When distributing the software, include this License Header
2653.18 * Notice in each file and include the License file at
2653.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2653.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2653.21 * particular file as subject to the "Classpath" exception as provided
2653.22 - * by Sun in the GPL Version 2 section of the License file that
2653.23 + * by Oracle in the GPL Version 2 section of the License file that
2653.24 * accompanied this code. If applicable, add the following below the
2653.25 * License Header, with the fields enclosed by brackets [] replaced by
2653.26 * your own identifying information:
2654.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/IconHyperlinkBase.java Fri Jul 16 11:47:36 2010 -0400
2654.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/IconHyperlinkBase.java Fri Jul 16 14:21:50 2010 -0400
2654.3 @@ -1,7 +1,10 @@
2654.4 /*
2654.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2654.6 *
2654.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2654.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2654.9 + *
2654.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2654.11 + * Other names may be trademarks of their respective owners.
2654.12 *
2654.13 * The contents of this file are subject to the terms of either the GNU
2654.14 * General Public License Version 2 only ("GPL") or the Common
2654.15 @@ -13,9 +16,9 @@
2654.16 * specific language governing permissions and limitations under the
2654.17 * License. When distributing the software, include this License Header
2654.18 * Notice in each file and include the License file at
2654.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2654.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2654.21 * particular file as subject to the "Classpath" exception as provided
2654.22 - * by Sun in the GPL Version 2 section of the License file that
2654.23 + * by Oracle in the GPL Version 2 section of the License file that
2654.24 * accompanied this code. If applicable, add the following below the
2654.25 * License Header, with the fields enclosed by brackets [] replaced by
2654.26 * your own identifying information:
2655.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ImageComponent.java Fri Jul 16 11:47:36 2010 -0400
2655.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ImageComponent.java Fri Jul 16 14:21:50 2010 -0400
2655.3 @@ -1,7 +1,10 @@
2655.4 /*
2655.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2655.6 *
2655.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2655.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2655.9 + *
2655.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2655.11 + * Other names may be trademarks of their respective owners.
2655.12 *
2655.13 * The contents of this file are subject to the terms of either the GNU
2655.14 * General Public License Version 2 only ("GPL") or the Common
2655.15 @@ -13,9 +16,9 @@
2655.16 * specific language governing permissions and limitations under the
2655.17 * License. When distributing the software, include this License Header
2655.18 * Notice in each file and include the License file at
2655.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2655.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2655.21 * particular file as subject to the "Classpath" exception as provided
2655.22 - * by Sun in the GPL Version 2 section of the License file that
2655.23 + * by Oracle in the GPL Version 2 section of the License file that
2655.24 * accompanied this code. If applicable, add the following below the
2655.25 * License Header, with the fields enclosed by brackets [] replaced by
2655.26 * your own identifying information:
2656.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ImageComponentBase.java Fri Jul 16 11:47:36 2010 -0400
2656.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ImageComponentBase.java Fri Jul 16 14:21:50 2010 -0400
2656.3 @@ -1,7 +1,10 @@
2656.4 /*
2656.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2656.6 *
2656.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2656.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2656.9 + *
2656.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2656.11 + * Other names may be trademarks of their respective owners.
2656.12 *
2656.13 * The contents of this file are subject to the terms of either the GNU
2656.14 * General Public License Version 2 only ("GPL") or the Common
2656.15 @@ -13,9 +16,9 @@
2656.16 * specific language governing permissions and limitations under the
2656.17 * License. When distributing the software, include this License Header
2656.18 * Notice in each file and include the License file at
2656.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2656.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2656.21 * particular file as subject to the "Classpath" exception as provided
2656.22 - * by Sun in the GPL Version 2 section of the License file that
2656.23 + * by Oracle in the GPL Version 2 section of the License file that
2656.24 * accompanied this code. If applicable, add the following below the
2656.25 * License Header, with the fields enclosed by brackets [] replaced by
2656.26 * your own identifying information:
2657.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ImageHyperlink.java Fri Jul 16 11:47:36 2010 -0400
2657.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ImageHyperlink.java Fri Jul 16 14:21:50 2010 -0400
2657.3 @@ -1,7 +1,10 @@
2657.4 /*
2657.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2657.6 *
2657.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2657.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2657.9 + *
2657.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2657.11 + * Other names may be trademarks of their respective owners.
2657.12 *
2657.13 * The contents of this file are subject to the terms of either the GNU
2657.14 * General Public License Version 2 only ("GPL") or the Common
2657.15 @@ -13,9 +16,9 @@
2657.16 * specific language governing permissions and limitations under the
2657.17 * License. When distributing the software, include this License Header
2657.18 * Notice in each file and include the License file at
2657.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2657.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2657.21 * particular file as subject to the "Classpath" exception as provided
2657.22 - * by Sun in the GPL Version 2 section of the License file that
2657.23 + * by Oracle in the GPL Version 2 section of the License file that
2657.24 * accompanied this code. If applicable, add the following below the
2657.25 * License Header, with the fields enclosed by brackets [] replaced by
2657.26 * your own identifying information:
2658.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ImageHyperlinkBase.java Fri Jul 16 11:47:36 2010 -0400
2658.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ImageHyperlinkBase.java Fri Jul 16 14:21:50 2010 -0400
2658.3 @@ -1,7 +1,10 @@
2658.4 /*
2658.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2658.6 *
2658.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2658.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2658.9 + *
2658.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2658.11 + * Other names may be trademarks of their respective owners.
2658.12 *
2658.13 * The contents of this file are subject to the terms of either the GNU
2658.14 * General Public License Version 2 only ("GPL") or the Common
2658.15 @@ -13,9 +16,9 @@
2658.16 * specific language governing permissions and limitations under the
2658.17 * License. When distributing the software, include this License Header
2658.18 * Notice in each file and include the License file at
2658.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2658.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2658.21 * particular file as subject to the "Classpath" exception as provided
2658.22 - * by Sun in the GPL Version 2 section of the License file that
2658.23 + * by Oracle in the GPL Version 2 section of the License file that
2658.24 * accompanied this code. If applicable, add the following below the
2658.25 * License Header, with the fields enclosed by brackets [] replaced by
2658.26 * your own identifying information:
2659.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Label.java Fri Jul 16 11:47:36 2010 -0400
2659.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Label.java Fri Jul 16 14:21:50 2010 -0400
2659.3 @@ -1,7 +1,10 @@
2659.4 /*
2659.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2659.6 *
2659.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2659.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2659.9 + *
2659.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2659.11 + * Other names may be trademarks of their respective owners.
2659.12 *
2659.13 * The contents of this file are subject to the terms of either the GNU
2659.14 * General Public License Version 2 only ("GPL") or the Common
2659.15 @@ -13,9 +16,9 @@
2659.16 * specific language governing permissions and limitations under the
2659.17 * License. When distributing the software, include this License Header
2659.18 * Notice in each file and include the License file at
2659.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2659.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2659.21 * particular file as subject to the "Classpath" exception as provided
2659.22 - * by Sun in the GPL Version 2 section of the License file that
2659.23 + * by Oracle in the GPL Version 2 section of the License file that
2659.24 * accompanied this code. If applicable, add the following below the
2659.25 * License Header, with the fields enclosed by brackets [] replaced by
2659.26 * your own identifying information:
2660.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/LabelBase.java Fri Jul 16 11:47:36 2010 -0400
2660.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/LabelBase.java Fri Jul 16 14:21:50 2010 -0400
2660.3 @@ -1,7 +1,10 @@
2660.4 /*
2660.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2660.6 *
2660.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2660.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2660.9 + *
2660.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2660.11 + * Other names may be trademarks of their respective owners.
2660.12 *
2660.13 * The contents of this file are subject to the terms of either the GNU
2660.14 * General Public License Version 2 only ("GPL") or the Common
2660.15 @@ -13,9 +16,9 @@
2660.16 * specific language governing permissions and limitations under the
2660.17 * License. When distributing the software, include this License Header
2660.18 * Notice in each file and include the License file at
2660.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2660.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2660.21 * particular file as subject to the "Classpath" exception as provided
2660.22 - * by Sun in the GPL Version 2 section of the License file that
2660.23 + * by Oracle in the GPL Version 2 section of the License file that
2660.24 * accompanied this code. If applicable, add the following below the
2660.25 * License Header, with the fields enclosed by brackets [] replaced by
2660.26 * your own identifying information:
2661.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Legend.java Fri Jul 16 11:47:36 2010 -0400
2661.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Legend.java Fri Jul 16 14:21:50 2010 -0400
2661.3 @@ -1,7 +1,10 @@
2661.4 /*
2661.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2661.6 *
2661.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2661.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2661.9 + *
2661.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2661.11 + * Other names may be trademarks of their respective owners.
2661.12 *
2661.13 * The contents of this file are subject to the terms of either the GNU
2661.14 * General Public License Version 2 only ("GPL") or the Common
2661.15 @@ -13,9 +16,9 @@
2661.16 * specific language governing permissions and limitations under the
2661.17 * License. When distributing the software, include this License Header
2661.18 * Notice in each file and include the License file at
2661.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2661.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2661.21 * particular file as subject to the "Classpath" exception as provided
2661.22 - * by Sun in the GPL Version 2 section of the License file that
2661.23 + * by Oracle in the GPL Version 2 section of the License file that
2661.24 * accompanied this code. If applicable, add the following below the
2661.25 * License Header, with the fields enclosed by brackets [] replaced by
2661.26 * your own identifying information:
2662.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/LegendBase.java Fri Jul 16 11:47:36 2010 -0400
2662.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/LegendBase.java Fri Jul 16 14:21:50 2010 -0400
2662.3 @@ -1,7 +1,10 @@
2662.4 /*
2662.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2662.6 *
2662.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2662.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2662.9 + *
2662.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2662.11 + * Other names may be trademarks of their respective owners.
2662.12 *
2662.13 * The contents of this file are subject to the terms of either the GNU
2662.14 * General Public License Version 2 only ("GPL") or the Common
2662.15 @@ -13,9 +16,9 @@
2662.16 * specific language governing permissions and limitations under the
2662.17 * License. When distributing the software, include this License Header
2662.18 * Notice in each file and include the License file at
2662.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2662.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2662.21 * particular file as subject to the "Classpath" exception as provided
2662.22 - * by Sun in the GPL Version 2 section of the License file that
2662.23 + * by Oracle in the GPL Version 2 section of the License file that
2662.24 * accompanied this code. If applicable, add the following below the
2662.25 * License Header, with the fields enclosed by brackets [] replaced by
2662.26 * your own identifying information:
2663.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Link.java Fri Jul 16 11:47:36 2010 -0400
2663.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Link.java Fri Jul 16 14:21:50 2010 -0400
2663.3 @@ -1,7 +1,10 @@
2663.4 /*
2663.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2663.6 *
2663.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2663.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2663.9 + *
2663.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2663.11 + * Other names may be trademarks of their respective owners.
2663.12 *
2663.13 * The contents of this file are subject to the terms of either the GNU
2663.14 * General Public License Version 2 only ("GPL") or the Common
2663.15 @@ -13,9 +16,9 @@
2663.16 * specific language governing permissions and limitations under the
2663.17 * License. When distributing the software, include this License Header
2663.18 * Notice in each file and include the License file at
2663.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2663.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2663.21 * particular file as subject to the "Classpath" exception as provided
2663.22 - * by Sun in the GPL Version 2 section of the License file that
2663.23 + * by Oracle in the GPL Version 2 section of the License file that
2663.24 * accompanied this code. If applicable, add the following below the
2663.25 * License Header, with the fields enclosed by brackets [] replaced by
2663.26 * your own identifying information:
2664.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/LinkBase.java Fri Jul 16 11:47:36 2010 -0400
2664.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/LinkBase.java Fri Jul 16 14:21:50 2010 -0400
2664.3 @@ -1,7 +1,10 @@
2664.4 /*
2664.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2664.6 *
2664.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2664.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2664.9 + *
2664.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2664.11 + * Other names may be trademarks of their respective owners.
2664.12 *
2664.13 * The contents of this file are subject to the terms of either the GNU
2664.14 * General Public License Version 2 only ("GPL") or the Common
2664.15 @@ -13,9 +16,9 @@
2664.16 * specific language governing permissions and limitations under the
2664.17 * License. When distributing the software, include this License Header
2664.18 * Notice in each file and include the License file at
2664.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2664.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2664.21 * particular file as subject to the "Classpath" exception as provided
2664.22 - * by Sun in the GPL Version 2 section of the License file that
2664.23 + * by Oracle in the GPL Version 2 section of the License file that
2664.24 * accompanied this code. If applicable, add the following below the
2664.25 * License Header, with the fields enclosed by brackets [] replaced by
2664.26 * your own identifying information:
2665.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ListManager.java Fri Jul 16 11:47:36 2010 -0400
2665.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ListManager.java Fri Jul 16 14:21:50 2010 -0400
2665.3 @@ -1,7 +1,10 @@
2665.4 /*
2665.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2665.6 *
2665.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2665.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2665.9 + *
2665.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2665.11 + * Other names may be trademarks of their respective owners.
2665.12 *
2665.13 * The contents of this file are subject to the terms of either the GNU
2665.14 * General Public License Version 2 only ("GPL") or the Common
2665.15 @@ -13,9 +16,9 @@
2665.16 * specific language governing permissions and limitations under the
2665.17 * License. When distributing the software, include this License Header
2665.18 * Notice in each file and include the License file at
2665.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2665.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2665.21 * particular file as subject to the "Classpath" exception as provided
2665.22 - * by Sun in the GPL Version 2 section of the License file that
2665.23 + * by Oracle in the GPL Version 2 section of the License file that
2665.24 * accompanied this code. If applicable, add the following below the
2665.25 * License Header, with the fields enclosed by brackets [] replaced by
2665.26 * your own identifying information:
2666.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ListSelector.java Fri Jul 16 11:47:36 2010 -0400
2666.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ListSelector.java Fri Jul 16 14:21:50 2010 -0400
2666.3 @@ -1,7 +1,10 @@
2666.4 /*
2666.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2666.6 *
2666.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2666.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2666.9 + *
2666.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2666.11 + * Other names may be trademarks of their respective owners.
2666.12 *
2666.13 * The contents of this file are subject to the terms of either the GNU
2666.14 * General Public License Version 2 only ("GPL") or the Common
2666.15 @@ -13,9 +16,9 @@
2666.16 * specific language governing permissions and limitations under the
2666.17 * License. When distributing the software, include this License Header
2666.18 * Notice in each file and include the License file at
2666.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2666.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2666.21 * particular file as subject to the "Classpath" exception as provided
2666.22 - * by Sun in the GPL Version 2 section of the License file that
2666.23 + * by Oracle in the GPL Version 2 section of the License file that
2666.24 * accompanied this code. If applicable, add the following below the
2666.25 * License Header, with the fields enclosed by brackets [] replaced by
2666.26 * your own identifying information:
2667.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ListSelectorBase.java Fri Jul 16 11:47:36 2010 -0400
2667.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ListSelectorBase.java Fri Jul 16 14:21:50 2010 -0400
2667.3 @@ -1,7 +1,10 @@
2667.4 /*
2667.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2667.6 *
2667.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2667.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2667.9 + *
2667.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2667.11 + * Other names may be trademarks of their respective owners.
2667.12 *
2667.13 * The contents of this file are subject to the terms of either the GNU
2667.14 * General Public License Version 2 only ("GPL") or the Common
2667.15 @@ -13,9 +16,9 @@
2667.16 * specific language governing permissions and limitations under the
2667.17 * License. When distributing the software, include this License Header
2667.18 * Notice in each file and include the License file at
2667.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2667.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2667.21 * particular file as subject to the "Classpath" exception as provided
2667.22 - * by Sun in the GPL Version 2 section of the License file that
2667.23 + * by Oracle in the GPL Version 2 section of the License file that
2667.24 * accompanied this code. If applicable, add the following below the
2667.25 * License Header, with the fields enclosed by brackets [] replaced by
2667.26 * your own identifying information:
2668.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Listbox.java Fri Jul 16 11:47:36 2010 -0400
2668.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Listbox.java Fri Jul 16 14:21:50 2010 -0400
2668.3 @@ -1,7 +1,10 @@
2668.4 /*
2668.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2668.6 *
2668.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2668.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2668.9 + *
2668.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2668.11 + * Other names may be trademarks of their respective owners.
2668.12 *
2668.13 * The contents of this file are subject to the terms of either the GNU
2668.14 * General Public License Version 2 only ("GPL") or the Common
2668.15 @@ -13,9 +16,9 @@
2668.16 * specific language governing permissions and limitations under the
2668.17 * License. When distributing the software, include this License Header
2668.18 * Notice in each file and include the License file at
2668.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2668.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2668.21 * particular file as subject to the "Classpath" exception as provided
2668.22 - * by Sun in the GPL Version 2 section of the License file that
2668.23 + * by Oracle in the GPL Version 2 section of the License file that
2668.24 * accompanied this code. If applicable, add the following below the
2668.25 * License Header, with the fields enclosed by brackets [] replaced by
2668.26 * your own identifying information:
2669.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ListboxBase.java Fri Jul 16 11:47:36 2010 -0400
2669.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ListboxBase.java Fri Jul 16 14:21:50 2010 -0400
2669.3 @@ -1,7 +1,10 @@
2669.4 /*
2669.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2669.6 *
2669.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2669.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2669.9 + *
2669.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2669.11 + * Other names may be trademarks of their respective owners.
2669.12 *
2669.13 * The contents of this file are subject to the terms of either the GNU
2669.14 * General Public License Version 2 only ("GPL") or the Common
2669.15 @@ -13,9 +16,9 @@
2669.16 * specific language governing permissions and limitations under the
2669.17 * License. When distributing the software, include this License Header
2669.18 * Notice in each file and include the License file at
2669.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2669.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2669.21 * particular file as subject to the "Classpath" exception as provided
2669.22 - * by Sun in the GPL Version 2 section of the License file that
2669.23 + * by Oracle in the GPL Version 2 section of the License file that
2669.24 * accompanied this code. If applicable, add the following below the
2669.25 * License Header, with the fields enclosed by brackets [] replaced by
2669.26 * your own identifying information:
2670.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Markup.java Fri Jul 16 11:47:36 2010 -0400
2670.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Markup.java Fri Jul 16 14:21:50 2010 -0400
2670.3 @@ -1,7 +1,10 @@
2670.4 /*
2670.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2670.6 *
2670.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2670.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2670.9 + *
2670.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2670.11 + * Other names may be trademarks of their respective owners.
2670.12 *
2670.13 * The contents of this file are subject to the terms of either the GNU
2670.14 * General Public License Version 2 only ("GPL") or the Common
2670.15 @@ -13,9 +16,9 @@
2670.16 * specific language governing permissions and limitations under the
2670.17 * License. When distributing the software, include this License Header
2670.18 * Notice in each file and include the License file at
2670.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2670.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2670.21 * particular file as subject to the "Classpath" exception as provided
2670.22 - * by Sun in the GPL Version 2 section of the License file that
2670.23 + * by Oracle in the GPL Version 2 section of the License file that
2670.24 * accompanied this code. If applicable, add the following below the
2670.25 * License Header, with the fields enclosed by brackets [] replaced by
2670.26 * your own identifying information:
2671.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/MarkupBase.java Fri Jul 16 11:47:36 2010 -0400
2671.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/MarkupBase.java Fri Jul 16 14:21:50 2010 -0400
2671.3 @@ -1,7 +1,10 @@
2671.4 /*
2671.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2671.6 *
2671.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2671.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2671.9 + *
2671.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2671.11 + * Other names may be trademarks of their respective owners.
2671.12 *
2671.13 * The contents of this file are subject to the terms of either the GNU
2671.14 * General Public License Version 2 only ("GPL") or the Common
2671.15 @@ -13,9 +16,9 @@
2671.16 * specific language governing permissions and limitations under the
2671.17 * License. When distributing the software, include this License Header
2671.18 * Notice in each file and include the License file at
2671.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2671.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2671.21 * particular file as subject to the "Classpath" exception as provided
2671.22 - * by Sun in the GPL Version 2 section of the License file that
2671.23 + * by Oracle in the GPL Version 2 section of the License file that
2671.24 * accompanied this code. If applicable, add the following below the
2671.25 * License Header, with the fields enclosed by brackets [] replaced by
2671.26 * your own identifying information:
2672.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Message.java Fri Jul 16 11:47:36 2010 -0400
2672.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Message.java Fri Jul 16 14:21:50 2010 -0400
2672.3 @@ -1,7 +1,10 @@
2672.4 /*
2672.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2672.6 *
2672.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2672.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2672.9 + *
2672.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2672.11 + * Other names may be trademarks of their respective owners.
2672.12 *
2672.13 * The contents of this file are subject to the terms of either the GNU
2672.14 * General Public License Version 2 only ("GPL") or the Common
2672.15 @@ -13,9 +16,9 @@
2672.16 * specific language governing permissions and limitations under the
2672.17 * License. When distributing the software, include this License Header
2672.18 * Notice in each file and include the License file at
2672.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2672.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2672.21 * particular file as subject to the "Classpath" exception as provided
2672.22 - * by Sun in the GPL Version 2 section of the License file that
2672.23 + * by Oracle in the GPL Version 2 section of the License file that
2672.24 * accompanied this code. If applicable, add the following below the
2672.25 * License Header, with the fields enclosed by brackets [] replaced by
2672.26 * your own identifying information:
2673.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/MessageBase.java Fri Jul 16 11:47:36 2010 -0400
2673.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/MessageBase.java Fri Jul 16 14:21:50 2010 -0400
2673.3 @@ -1,7 +1,10 @@
2673.4 /*
2673.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2673.6 *
2673.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2673.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2673.9 + *
2673.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2673.11 + * Other names may be trademarks of their respective owners.
2673.12 *
2673.13 * The contents of this file are subject to the terms of either the GNU
2673.14 * General Public License Version 2 only ("GPL") or the Common
2673.15 @@ -13,9 +16,9 @@
2673.16 * specific language governing permissions and limitations under the
2673.17 * License. When distributing the software, include this License Header
2673.18 * Notice in each file and include the License file at
2673.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2673.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2673.21 * particular file as subject to the "Classpath" exception as provided
2673.22 - * by Sun in the GPL Version 2 section of the License file that
2673.23 + * by Oracle in the GPL Version 2 section of the License file that
2673.24 * accompanied this code. If applicable, add the following below the
2673.25 * License Header, with the fields enclosed by brackets [] replaced by
2673.26 * your own identifying information:
2674.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/MessageGroup.java Fri Jul 16 11:47:36 2010 -0400
2674.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/MessageGroup.java Fri Jul 16 14:21:50 2010 -0400
2674.3 @@ -1,7 +1,10 @@
2674.4 /*
2674.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2674.6 *
2674.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2674.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2674.9 + *
2674.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2674.11 + * Other names may be trademarks of their respective owners.
2674.12 *
2674.13 * The contents of this file are subject to the terms of either the GNU
2674.14 * General Public License Version 2 only ("GPL") or the Common
2674.15 @@ -13,9 +16,9 @@
2674.16 * specific language governing permissions and limitations under the
2674.17 * License. When distributing the software, include this License Header
2674.18 * Notice in each file and include the License file at
2674.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2674.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2674.21 * particular file as subject to the "Classpath" exception as provided
2674.22 - * by Sun in the GPL Version 2 section of the License file that
2674.23 + * by Oracle in the GPL Version 2 section of the License file that
2674.24 * accompanied this code. If applicable, add the following below the
2674.25 * License Header, with the fields enclosed by brackets [] replaced by
2674.26 * your own identifying information:
2675.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/MessageGroupBase.java Fri Jul 16 11:47:36 2010 -0400
2675.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/MessageGroupBase.java Fri Jul 16 14:21:50 2010 -0400
2675.3 @@ -1,7 +1,10 @@
2675.4 /*
2675.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2675.6 *
2675.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2675.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2675.9 + *
2675.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2675.11 + * Other names may be trademarks of their respective owners.
2675.12 *
2675.13 * The contents of this file are subject to the terms of either the GNU
2675.14 * General Public License Version 2 only ("GPL") or the Common
2675.15 @@ -13,9 +16,9 @@
2675.16 * specific language governing permissions and limitations under the
2675.17 * License. When distributing the software, include this License Header
2675.18 * Notice in each file and include the License file at
2675.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2675.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2675.21 * particular file as subject to the "Classpath" exception as provided
2675.22 - * by Sun in the GPL Version 2 section of the License file that
2675.23 + * by Oracle in the GPL Version 2 section of the License file that
2675.24 * accompanied this code. If applicable, add the following below the
2675.25 * License Header, with the fields enclosed by brackets [] replaced by
2675.26 * your own identifying information:
2676.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Meta.java Fri Jul 16 11:47:36 2010 -0400
2676.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Meta.java Fri Jul 16 14:21:50 2010 -0400
2676.3 @@ -1,7 +1,10 @@
2676.4 /*
2676.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2676.6 *
2676.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2676.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2676.9 + *
2676.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2676.11 + * Other names may be trademarks of their respective owners.
2676.12 *
2676.13 * The contents of this file are subject to the terms of either the GNU
2676.14 * General Public License Version 2 only ("GPL") or the Common
2676.15 @@ -13,9 +16,9 @@
2676.16 * specific language governing permissions and limitations under the
2676.17 * License. When distributing the software, include this License Header
2676.18 * Notice in each file and include the License file at
2676.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2676.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2676.21 * particular file as subject to the "Classpath" exception as provided
2676.22 - * by Sun in the GPL Version 2 section of the License file that
2676.23 + * by Oracle in the GPL Version 2 section of the License file that
2676.24 * accompanied this code. If applicable, add the following below the
2676.25 * License Header, with the fields enclosed by brackets [] replaced by
2676.26 * your own identifying information:
2677.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/MetaBase.java Fri Jul 16 11:47:36 2010 -0400
2677.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/MetaBase.java Fri Jul 16 14:21:50 2010 -0400
2677.3 @@ -1,7 +1,10 @@
2677.4 /*
2677.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2677.6 *
2677.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2677.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2677.9 + *
2677.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2677.11 + * Other names may be trademarks of their respective owners.
2677.12 *
2677.13 * The contents of this file are subject to the terms of either the GNU
2677.14 * General Public License Version 2 only ("GPL") or the Common
2677.15 @@ -13,9 +16,9 @@
2677.16 * specific language governing permissions and limitations under the
2677.17 * License. When distributing the software, include this License Header
2677.18 * Notice in each file and include the License file at
2677.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2677.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2677.21 * particular file as subject to the "Classpath" exception as provided
2677.22 - * by Sun in the GPL Version 2 section of the License file that
2677.23 + * by Oracle in the GPL Version 2 section of the License file that
2677.24 * accompanied this code. If applicable, add the following below the
2677.25 * License Header, with the fields enclosed by brackets [] replaced by
2677.26 * your own identifying information:
2678.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/OrderableList.java Fri Jul 16 11:47:36 2010 -0400
2678.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/OrderableList.java Fri Jul 16 14:21:50 2010 -0400
2678.3 @@ -1,7 +1,10 @@
2678.4 /*
2678.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2678.6 *
2678.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2678.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2678.9 + *
2678.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2678.11 + * Other names may be trademarks of their respective owners.
2678.12 *
2678.13 * The contents of this file are subject to the terms of either the GNU
2678.14 * General Public License Version 2 only ("GPL") or the Common
2678.15 @@ -13,9 +16,9 @@
2678.16 * specific language governing permissions and limitations under the
2678.17 * License. When distributing the software, include this License Header
2678.18 * Notice in each file and include the License file at
2678.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2678.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2678.21 * particular file as subject to the "Classpath" exception as provided
2678.22 - * by Sun in the GPL Version 2 section of the License file that
2678.23 + * by Oracle in the GPL Version 2 section of the License file that
2678.24 * accompanied this code. If applicable, add the following below the
2678.25 * License Header, with the fields enclosed by brackets [] replaced by
2678.26 * your own identifying information:
2679.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/OrderableListBase.java Fri Jul 16 11:47:36 2010 -0400
2679.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/OrderableListBase.java Fri Jul 16 14:21:50 2010 -0400
2679.3 @@ -1,7 +1,10 @@
2679.4 /*
2679.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2679.6 *
2679.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2679.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2679.9 + *
2679.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2679.11 + * Other names may be trademarks of their respective owners.
2679.12 *
2679.13 * The contents of this file are subject to the terms of either the GNU
2679.14 * General Public License Version 2 only ("GPL") or the Common
2679.15 @@ -13,9 +16,9 @@
2679.16 * specific language governing permissions and limitations under the
2679.17 * License. When distributing the software, include this License Header
2679.18 * Notice in each file and include the License file at
2679.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2679.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2679.21 * particular file as subject to the "Classpath" exception as provided
2679.22 - * by Sun in the GPL Version 2 section of the License file that
2679.23 + * by Oracle in the GPL Version 2 section of the License file that
2679.24 * accompanied this code. If applicable, add the following below the
2679.25 * License Header, with the fields enclosed by brackets [] replaced by
2679.26 * your own identifying information:
2680.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Page.java Fri Jul 16 11:47:36 2010 -0400
2680.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Page.java Fri Jul 16 14:21:50 2010 -0400
2680.3 @@ -1,7 +1,10 @@
2680.4 /*
2680.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2680.6 *
2680.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2680.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2680.9 + *
2680.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2680.11 + * Other names may be trademarks of their respective owners.
2680.12 *
2680.13 * The contents of this file are subject to the terms of either the GNU
2680.14 * General Public License Version 2 only ("GPL") or the Common
2680.15 @@ -13,9 +16,9 @@
2680.16 * specific language governing permissions and limitations under the
2680.17 * License. When distributing the software, include this License Header
2680.18 * Notice in each file and include the License file at
2680.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2680.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2680.21 * particular file as subject to the "Classpath" exception as provided
2680.22 - * by Sun in the GPL Version 2 section of the License file that
2680.23 + * by Oracle in the GPL Version 2 section of the License file that
2680.24 * accompanied this code. If applicable, add the following below the
2680.25 * License Header, with the fields enclosed by brackets [] replaced by
2680.26 * your own identifying information:
2681.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageAlert.java Fri Jul 16 11:47:36 2010 -0400
2681.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageAlert.java Fri Jul 16 14:21:50 2010 -0400
2681.3 @@ -1,7 +1,10 @@
2681.4 /*
2681.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2681.6 *
2681.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2681.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2681.9 + *
2681.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2681.11 + * Other names may be trademarks of their respective owners.
2681.12 *
2681.13 * The contents of this file are subject to the terms of either the GNU
2681.14 * General Public License Version 2 only ("GPL") or the Common
2681.15 @@ -13,9 +16,9 @@
2681.16 * specific language governing permissions and limitations under the
2681.17 * License. When distributing the software, include this License Header
2681.18 * Notice in each file and include the License file at
2681.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2681.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2681.21 * particular file as subject to the "Classpath" exception as provided
2681.22 - * by Sun in the GPL Version 2 section of the License file that
2681.23 + * by Oracle in the GPL Version 2 section of the License file that
2681.24 * accompanied this code. If applicable, add the following below the
2681.25 * License Header, with the fields enclosed by brackets [] replaced by
2681.26 * your own identifying information:
2682.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageAlertBase.java Fri Jul 16 11:47:36 2010 -0400
2682.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageAlertBase.java Fri Jul 16 14:21:50 2010 -0400
2682.3 @@ -1,7 +1,10 @@
2682.4 /*
2682.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2682.6 *
2682.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2682.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2682.9 + *
2682.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2682.11 + * Other names may be trademarks of their respective owners.
2682.12 *
2682.13 * The contents of this file are subject to the terms of either the GNU
2682.14 * General Public License Version 2 only ("GPL") or the Common
2682.15 @@ -13,9 +16,9 @@
2682.16 * specific language governing permissions and limitations under the
2682.17 * License. When distributing the software, include this License Header
2682.18 * Notice in each file and include the License file at
2682.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2682.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2682.21 * particular file as subject to the "Classpath" exception as provided
2682.22 - * by Sun in the GPL Version 2 section of the License file that
2682.23 + * by Oracle in the GPL Version 2 section of the License file that
2682.24 * accompanied this code. If applicable, add the following below the
2682.25 * License Header, with the fields enclosed by brackets [] replaced by
2682.26 * your own identifying information:
2683.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageBase.java Fri Jul 16 11:47:36 2010 -0400
2683.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageBase.java Fri Jul 16 14:21:50 2010 -0400
2683.3 @@ -1,7 +1,10 @@
2683.4 /*
2683.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2683.6 *
2683.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2683.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2683.9 + *
2683.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2683.11 + * Other names may be trademarks of their respective owners.
2683.12 *
2683.13 * The contents of this file are subject to the terms of either the GNU
2683.14 * General Public License Version 2 only ("GPL") or the Common
2683.15 @@ -13,9 +16,9 @@
2683.16 * specific language governing permissions and limitations under the
2683.17 * License. When distributing the software, include this License Header
2683.18 * Notice in each file and include the License file at
2683.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2683.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2683.21 * particular file as subject to the "Classpath" exception as provided
2683.22 - * by Sun in the GPL Version 2 section of the License file that
2683.23 + * by Oracle in the GPL Version 2 section of the License file that
2683.24 * accompanied this code. If applicable, add the following below the
2683.25 * License Header, with the fields enclosed by brackets [] replaced by
2683.26 * your own identifying information:
2684.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageSeparator.java Fri Jul 16 11:47:36 2010 -0400
2684.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageSeparator.java Fri Jul 16 14:21:50 2010 -0400
2684.3 @@ -1,7 +1,10 @@
2684.4 /*
2684.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2684.6 *
2684.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2684.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2684.9 + *
2684.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2684.11 + * Other names may be trademarks of their respective owners.
2684.12 *
2684.13 * The contents of this file are subject to the terms of either the GNU
2684.14 * General Public License Version 2 only ("GPL") or the Common
2684.15 @@ -13,9 +16,9 @@
2684.16 * specific language governing permissions and limitations under the
2684.17 * License. When distributing the software, include this License Header
2684.18 * Notice in each file and include the License file at
2684.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2684.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2684.21 * particular file as subject to the "Classpath" exception as provided
2684.22 - * by Sun in the GPL Version 2 section of the License file that
2684.23 + * by Oracle in the GPL Version 2 section of the License file that
2684.24 * accompanied this code. If applicable, add the following below the
2684.25 * License Header, with the fields enclosed by brackets [] replaced by
2684.26 * your own identifying information:
2685.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageSeparatorBase.java Fri Jul 16 11:47:36 2010 -0400
2685.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PageSeparatorBase.java Fri Jul 16 14:21:50 2010 -0400
2685.3 @@ -1,7 +1,10 @@
2685.4 /*
2685.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2685.6 *
2685.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2685.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2685.9 + *
2685.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2685.11 + * Other names may be trademarks of their respective owners.
2685.12 *
2685.13 * The contents of this file are subject to the terms of either the GNU
2685.14 * General Public License Version 2 only ("GPL") or the Common
2685.15 @@ -13,9 +16,9 @@
2685.16 * specific language governing permissions and limitations under the
2685.17 * License. When distributing the software, include this License Header
2685.18 * Notice in each file and include the License file at
2685.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2685.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2685.21 * particular file as subject to the "Classpath" exception as provided
2685.22 - * by Sun in the GPL Version 2 section of the License file that
2685.23 + * by Oracle in the GPL Version 2 section of the License file that
2685.24 * accompanied this code. If applicable, add the following below the
2685.25 * License Header, with the fields enclosed by brackets [] replaced by
2685.26 * your own identifying information:
2686.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PanelGroup.java Fri Jul 16 11:47:36 2010 -0400
2686.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PanelGroup.java Fri Jul 16 14:21:50 2010 -0400
2686.3 @@ -1,7 +1,10 @@
2686.4 /*
2686.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2686.6 *
2686.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2686.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2686.9 + *
2686.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2686.11 + * Other names may be trademarks of their respective owners.
2686.12 *
2686.13 * The contents of this file are subject to the terms of either the GNU
2686.14 * General Public License Version 2 only ("GPL") or the Common
2686.15 @@ -13,9 +16,9 @@
2686.16 * specific language governing permissions and limitations under the
2686.17 * License. When distributing the software, include this License Header
2686.18 * Notice in each file and include the License file at
2686.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2686.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2686.21 * particular file as subject to the "Classpath" exception as provided
2686.22 - * by Sun in the GPL Version 2 section of the License file that
2686.23 + * by Oracle in the GPL Version 2 section of the License file that
2686.24 * accompanied this code. If applicable, add the following below the
2686.25 * License Header, with the fields enclosed by brackets [] replaced by
2686.26 * your own identifying information:
2687.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PanelGroupBase.java Fri Jul 16 11:47:36 2010 -0400
2687.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PanelGroupBase.java Fri Jul 16 14:21:50 2010 -0400
2687.3 @@ -1,7 +1,10 @@
2687.4 /*
2687.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2687.6 *
2687.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2687.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2687.9 + *
2687.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2687.11 + * Other names may be trademarks of their respective owners.
2687.12 *
2687.13 * The contents of this file are subject to the terms of either the GNU
2687.14 * General Public License Version 2 only ("GPL") or the Common
2687.15 @@ -13,9 +16,9 @@
2687.16 * specific language governing permissions and limitations under the
2687.17 * License. When distributing the software, include this License Header
2687.18 * Notice in each file and include the License file at
2687.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2687.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2687.21 * particular file as subject to the "Classpath" exception as provided
2687.22 - * by Sun in the GPL Version 2 section of the License file that
2687.23 + * by Oracle in the GPL Version 2 section of the License file that
2687.24 * accompanied this code. If applicable, add the following below the
2687.25 * License Header, with the fields enclosed by brackets [] replaced by
2687.26 * your own identifying information:
2688.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PanelLayout.java Fri Jul 16 11:47:36 2010 -0400
2688.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PanelLayout.java Fri Jul 16 14:21:50 2010 -0400
2688.3 @@ -1,7 +1,10 @@
2688.4 /*
2688.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2688.6 *
2688.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2688.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2688.9 + *
2688.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2688.11 + * Other names may be trademarks of their respective owners.
2688.12 *
2688.13 * The contents of this file are subject to the terms of either the GNU
2688.14 * General Public License Version 2 only ("GPL") or the Common
2688.15 @@ -13,9 +16,9 @@
2688.16 * specific language governing permissions and limitations under the
2688.17 * License. When distributing the software, include this License Header
2688.18 * Notice in each file and include the License file at
2688.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2688.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2688.21 * particular file as subject to the "Classpath" exception as provided
2688.22 - * by Sun in the GPL Version 2 section of the License file that
2688.23 + * by Oracle in the GPL Version 2 section of the License file that
2688.24 * accompanied this code. If applicable, add the following below the
2688.25 * License Header, with the fields enclosed by brackets [] replaced by
2688.26 * your own identifying information:
2689.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PanelLayoutBase.java Fri Jul 16 11:47:36 2010 -0400
2689.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PanelLayoutBase.java Fri Jul 16 14:21:50 2010 -0400
2689.3 @@ -1,7 +1,10 @@
2689.4 /*
2689.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2689.6 *
2689.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2689.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2689.9 + *
2689.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2689.11 + * Other names may be trademarks of their respective owners.
2689.12 *
2689.13 * The contents of this file are subject to the terms of either the GNU
2689.14 * General Public License Version 2 only ("GPL") or the Common
2689.15 @@ -13,9 +16,9 @@
2689.16 * specific language governing permissions and limitations under the
2689.17 * License. When distributing the software, include this License Header
2689.18 * Notice in each file and include the License file at
2689.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2689.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2689.21 * particular file as subject to the "Classpath" exception as provided
2689.22 - * by Sun in the GPL Version 2 section of the License file that
2689.23 + * by Oracle in the GPL Version 2 section of the License file that
2689.24 * accompanied this code. If applicable, add the following below the
2689.25 * License Header, with the fields enclosed by brackets [] replaced by
2689.26 * your own identifying information:
2690.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PasswordField.java Fri Jul 16 11:47:36 2010 -0400
2690.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PasswordField.java Fri Jul 16 14:21:50 2010 -0400
2690.3 @@ -1,7 +1,10 @@
2690.4 /*
2690.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2690.6 *
2690.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2690.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2690.9 + *
2690.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2690.11 + * Other names may be trademarks of their respective owners.
2690.12 *
2690.13 * The contents of this file are subject to the terms of either the GNU
2690.14 * General Public License Version 2 only ("GPL") or the Common
2690.15 @@ -13,9 +16,9 @@
2690.16 * specific language governing permissions and limitations under the
2690.17 * License. When distributing the software, include this License Header
2690.18 * Notice in each file and include the License file at
2690.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2690.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2690.21 * particular file as subject to the "Classpath" exception as provided
2690.22 - * by Sun in the GPL Version 2 section of the License file that
2690.23 + * by Oracle in the GPL Version 2 section of the License file that
2690.24 * accompanied this code. If applicable, add the following below the
2690.25 * License Header, with the fields enclosed by brackets [] replaced by
2690.26 * your own identifying information:
2691.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PasswordFieldBase.java Fri Jul 16 11:47:36 2010 -0400
2691.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PasswordFieldBase.java Fri Jul 16 14:21:50 2010 -0400
2691.3 @@ -1,7 +1,10 @@
2691.4 /*
2691.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2691.6 *
2691.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2691.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2691.9 + *
2691.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2691.11 + * Other names may be trademarks of their respective owners.
2691.12 *
2691.13 * The contents of this file are subject to the terms of either the GNU
2691.14 * General Public License Version 2 only ("GPL") or the Common
2691.15 @@ -13,9 +16,9 @@
2691.16 * specific language governing permissions and limitations under the
2691.17 * License. When distributing the software, include this License Header
2691.18 * Notice in each file and include the License file at
2691.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2691.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2691.21 * particular file as subject to the "Classpath" exception as provided
2691.22 - * by Sun in the GPL Version 2 section of the License file that
2691.23 + * by Oracle in the GPL Version 2 section of the License file that
2691.24 * accompanied this code. If applicable, add the following below the
2691.25 * License Header, with the fields enclosed by brackets [] replaced by
2691.26 * your own identifying information:
2692.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Property.java Fri Jul 16 11:47:36 2010 -0400
2692.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Property.java Fri Jul 16 14:21:50 2010 -0400
2692.3 @@ -1,7 +1,10 @@
2692.4 /*
2692.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2692.6 *
2692.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2692.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2692.9 + *
2692.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2692.11 + * Other names may be trademarks of their respective owners.
2692.12 *
2692.13 * The contents of this file are subject to the terms of either the GNU
2692.14 * General Public License Version 2 only ("GPL") or the Common
2692.15 @@ -13,9 +16,9 @@
2692.16 * specific language governing permissions and limitations under the
2692.17 * License. When distributing the software, include this License Header
2692.18 * Notice in each file and include the License file at
2692.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2692.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2692.21 * particular file as subject to the "Classpath" exception as provided
2692.22 - * by Sun in the GPL Version 2 section of the License file that
2692.23 + * by Oracle in the GPL Version 2 section of the License file that
2692.24 * accompanied this code. If applicable, add the following below the
2692.25 * License Header, with the fields enclosed by brackets [] replaced by
2692.26 * your own identifying information:
2693.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertyBase.java Fri Jul 16 11:47:36 2010 -0400
2693.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertyBase.java Fri Jul 16 14:21:50 2010 -0400
2693.3 @@ -1,7 +1,10 @@
2693.4 /*
2693.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2693.6 *
2693.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2693.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2693.9 + *
2693.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2693.11 + * Other names may be trademarks of their respective owners.
2693.12 *
2693.13 * The contents of this file are subject to the terms of either the GNU
2693.14 * General Public License Version 2 only ("GPL") or the Common
2693.15 @@ -13,9 +16,9 @@
2693.16 * specific language governing permissions and limitations under the
2693.17 * License. When distributing the software, include this License Header
2693.18 * Notice in each file and include the License file at
2693.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2693.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2693.21 * particular file as subject to the "Classpath" exception as provided
2693.22 - * by Sun in the GPL Version 2 section of the License file that
2693.23 + * by Oracle in the GPL Version 2 section of the License file that
2693.24 * accompanied this code. If applicable, add the following below the
2693.25 * License Header, with the fields enclosed by brackets [] replaced by
2693.26 * your own identifying information:
2694.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertySheet.java Fri Jul 16 11:47:36 2010 -0400
2694.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertySheet.java Fri Jul 16 14:21:50 2010 -0400
2694.3 @@ -1,7 +1,10 @@
2694.4 /*
2694.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2694.6 *
2694.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2694.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2694.9 + *
2694.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2694.11 + * Other names may be trademarks of their respective owners.
2694.12 *
2694.13 * The contents of this file are subject to the terms of either the GNU
2694.14 * General Public License Version 2 only ("GPL") or the Common
2694.15 @@ -13,9 +16,9 @@
2694.16 * specific language governing permissions and limitations under the
2694.17 * License. When distributing the software, include this License Header
2694.18 * Notice in each file and include the License file at
2694.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2694.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2694.21 * particular file as subject to the "Classpath" exception as provided
2694.22 - * by Sun in the GPL Version 2 section of the License file that
2694.23 + * by Oracle in the GPL Version 2 section of the License file that
2694.24 * accompanied this code. If applicable, add the following below the
2694.25 * License Header, with the fields enclosed by brackets [] replaced by
2694.26 * your own identifying information:
2695.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertySheetBase.java Fri Jul 16 11:47:36 2010 -0400
2695.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertySheetBase.java Fri Jul 16 14:21:50 2010 -0400
2695.3 @@ -1,7 +1,10 @@
2695.4 /*
2695.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2695.6 *
2695.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2695.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2695.9 + *
2695.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2695.11 + * Other names may be trademarks of their respective owners.
2695.12 *
2695.13 * The contents of this file are subject to the terms of either the GNU
2695.14 * General Public License Version 2 only ("GPL") or the Common
2695.15 @@ -13,9 +16,9 @@
2695.16 * specific language governing permissions and limitations under the
2695.17 * License. When distributing the software, include this License Header
2695.18 * Notice in each file and include the License file at
2695.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2695.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2695.21 * particular file as subject to the "Classpath" exception as provided
2695.22 - * by Sun in the GPL Version 2 section of the License file that
2695.23 + * by Oracle in the GPL Version 2 section of the License file that
2695.24 * accompanied this code. If applicable, add the following below the
2695.25 * License Header, with the fields enclosed by brackets [] replaced by
2695.26 * your own identifying information:
2696.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertySheetSection.java Fri Jul 16 11:47:36 2010 -0400
2696.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertySheetSection.java Fri Jul 16 14:21:50 2010 -0400
2696.3 @@ -1,7 +1,10 @@
2696.4 /*
2696.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2696.6 *
2696.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2696.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2696.9 + *
2696.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2696.11 + * Other names may be trademarks of their respective owners.
2696.12 *
2696.13 * The contents of this file are subject to the terms of either the GNU
2696.14 * General Public License Version 2 only ("GPL") or the Common
2696.15 @@ -13,9 +16,9 @@
2696.16 * specific language governing permissions and limitations under the
2696.17 * License. When distributing the software, include this License Header
2696.18 * Notice in each file and include the License file at
2696.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2696.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2696.21 * particular file as subject to the "Classpath" exception as provided
2696.22 - * by Sun in the GPL Version 2 section of the License file that
2696.23 + * by Oracle in the GPL Version 2 section of the License file that
2696.24 * accompanied this code. If applicable, add the following below the
2696.25 * License Header, with the fields enclosed by brackets [] replaced by
2696.26 * your own identifying information:
2697.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertySheetSectionBase.java Fri Jul 16 11:47:36 2010 -0400
2697.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/PropertySheetSectionBase.java Fri Jul 16 14:21:50 2010 -0400
2697.3 @@ -1,7 +1,10 @@
2697.4 /*
2697.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2697.6 *
2697.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2697.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2697.9 + *
2697.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2697.11 + * Other names may be trademarks of their respective owners.
2697.12 *
2697.13 * The contents of this file are subject to the terms of either the GNU
2697.14 * General Public License Version 2 only ("GPL") or the Common
2697.15 @@ -13,9 +16,9 @@
2697.16 * specific language governing permissions and limitations under the
2697.17 * License. When distributing the software, include this License Header
2697.18 * Notice in each file and include the License file at
2697.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2697.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2697.21 * particular file as subject to the "Classpath" exception as provided
2697.22 - * by Sun in the GPL Version 2 section of the License file that
2697.23 + * by Oracle in the GPL Version 2 section of the License file that
2697.24 * accompanied this code. If applicable, add the following below the
2697.25 * License Header, with the fields enclosed by brackets [] replaced by
2697.26 * your own identifying information:
2698.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/RadioButton.java Fri Jul 16 11:47:36 2010 -0400
2698.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/RadioButton.java Fri Jul 16 14:21:50 2010 -0400
2698.3 @@ -1,7 +1,10 @@
2698.4 /*
2698.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2698.6 *
2698.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2698.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2698.9 + *
2698.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2698.11 + * Other names may be trademarks of their respective owners.
2698.12 *
2698.13 * The contents of this file are subject to the terms of either the GNU
2698.14 * General Public License Version 2 only ("GPL") or the Common
2698.15 @@ -13,9 +16,9 @@
2698.16 * specific language governing permissions and limitations under the
2698.17 * License. When distributing the software, include this License Header
2698.18 * Notice in each file and include the License file at
2698.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2698.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2698.21 * particular file as subject to the "Classpath" exception as provided
2698.22 - * by Sun in the GPL Version 2 section of the License file that
2698.23 + * by Oracle in the GPL Version 2 section of the License file that
2698.24 * accompanied this code. If applicable, add the following below the
2698.25 * License Header, with the fields enclosed by brackets [] replaced by
2698.26 * your own identifying information:
2699.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/RadioButtonBase.java Fri Jul 16 11:47:36 2010 -0400
2699.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/RadioButtonBase.java Fri Jul 16 14:21:50 2010 -0400
2699.3 @@ -1,7 +1,10 @@
2699.4 /*
2699.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2699.6 *
2699.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2699.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2699.9 + *
2699.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2699.11 + * Other names may be trademarks of their respective owners.
2699.12 *
2699.13 * The contents of this file are subject to the terms of either the GNU
2699.14 * General Public License Version 2 only ("GPL") or the Common
2699.15 @@ -13,9 +16,9 @@
2699.16 * specific language governing permissions and limitations under the
2699.17 * License. When distributing the software, include this License Header
2699.18 * Notice in each file and include the License file at
2699.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2699.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2699.21 * particular file as subject to the "Classpath" exception as provided
2699.22 - * by Sun in the GPL Version 2 section of the License file that
2699.23 + * by Oracle in the GPL Version 2 section of the License file that
2699.24 * accompanied this code. If applicable, add the following below the
2699.25 * License Header, with the fields enclosed by brackets [] replaced by
2699.26 * your own identifying information:
2700.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/RadioButtonGroup.java Fri Jul 16 11:47:36 2010 -0400
2700.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/RadioButtonGroup.java Fri Jul 16 14:21:50 2010 -0400
2700.3 @@ -1,7 +1,10 @@
2700.4 /*
2700.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2700.6 *
2700.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2700.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2700.9 + *
2700.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2700.11 + * Other names may be trademarks of their respective owners.
2700.12 *
2700.13 * The contents of this file are subject to the terms of either the GNU
2700.14 * General Public License Version 2 only ("GPL") or the Common
2700.15 @@ -13,9 +16,9 @@
2700.16 * specific language governing permissions and limitations under the
2700.17 * License. When distributing the software, include this License Header
2700.18 * Notice in each file and include the License file at
2700.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2700.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2700.21 * particular file as subject to the "Classpath" exception as provided
2700.22 - * by Sun in the GPL Version 2 section of the License file that
2700.23 + * by Oracle in the GPL Version 2 section of the License file that
2700.24 * accompanied this code. If applicable, add the following below the
2700.25 * License Header, with the fields enclosed by brackets [] replaced by
2700.26 * your own identifying information:
2701.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/RadioButtonGroupBase.java Fri Jul 16 11:47:36 2010 -0400
2701.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/RadioButtonGroupBase.java Fri Jul 16 14:21:50 2010 -0400
2701.3 @@ -1,7 +1,10 @@
2701.4 /*
2701.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2701.6 *
2701.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2701.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2701.9 + *
2701.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2701.11 + * Other names may be trademarks of their respective owners.
2701.12 *
2701.13 * The contents of this file are subject to the terms of either the GNU
2701.14 * General Public License Version 2 only ("GPL") or the Common
2701.15 @@ -13,9 +16,9 @@
2701.16 * specific language governing permissions and limitations under the
2701.17 * License. When distributing the software, include this License Header
2701.18 * Notice in each file and include the License file at
2701.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2701.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2701.21 * particular file as subject to the "Classpath" exception as provided
2701.22 - * by Sun in the GPL Version 2 section of the License file that
2701.23 + * by Oracle in the GPL Version 2 section of the License file that
2701.24 * accompanied this code. If applicable, add the following below the
2701.25 * License Header, with the fields enclosed by brackets [] replaced by
2701.26 * your own identifying information:
2702.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/RbCbSelector.java Fri Jul 16 11:47:36 2010 -0400
2702.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/RbCbSelector.java Fri Jul 16 14:21:50 2010 -0400
2702.3 @@ -1,7 +1,10 @@
2702.4 /*
2702.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2702.6 *
2702.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2702.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2702.9 + *
2702.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2702.11 + * Other names may be trademarks of their respective owners.
2702.12 *
2702.13 * The contents of this file are subject to the terms of either the GNU
2702.14 * General Public License Version 2 only ("GPL") or the Common
2702.15 @@ -13,9 +16,9 @@
2702.16 * specific language governing permissions and limitations under the
2702.17 * License. When distributing the software, include this License Header
2702.18 * Notice in each file and include the License file at
2702.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2702.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2702.21 * particular file as subject to the "Classpath" exception as provided
2702.22 - * by Sun in the GPL Version 2 section of the License file that
2702.23 + * by Oracle in the GPL Version 2 section of the License file that
2702.24 * accompanied this code. If applicable, add the following below the
2702.25 * License Header, with the fields enclosed by brackets [] replaced by
2702.26 * your own identifying information:
2703.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/RbCbSelectorBase.java Fri Jul 16 11:47:36 2010 -0400
2703.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/RbCbSelectorBase.java Fri Jul 16 14:21:50 2010 -0400
2703.3 @@ -1,7 +1,10 @@
2703.4 /*
2703.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2703.6 *
2703.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2703.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2703.9 + *
2703.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2703.11 + * Other names may be trademarks of their respective owners.
2703.12 *
2703.13 * The contents of this file are subject to the terms of either the GNU
2703.14 * General Public License Version 2 only ("GPL") or the Common
2703.15 @@ -13,9 +16,9 @@
2703.16 * specific language governing permissions and limitations under the
2703.17 * License. When distributing the software, include this License Header
2703.18 * Notice in each file and include the License file at
2703.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2703.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2703.21 * particular file as subject to the "Classpath" exception as provided
2703.22 - * by Sun in the GPL Version 2 section of the License file that
2703.23 + * by Oracle in the GPL Version 2 section of the License file that
2703.24 * accompanied this code. If applicable, add the following below the
2703.25 * License Header, with the fields enclosed by brackets [] replaced by
2703.26 * your own identifying information:
2704.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Script.java Fri Jul 16 11:47:36 2010 -0400
2704.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Script.java Fri Jul 16 14:21:50 2010 -0400
2704.3 @@ -1,7 +1,10 @@
2704.4 /*
2704.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2704.6 *
2704.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2704.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2704.9 + *
2704.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2704.11 + * Other names may be trademarks of their respective owners.
2704.12 *
2704.13 * The contents of this file are subject to the terms of either the GNU
2704.14 * General Public License Version 2 only ("GPL") or the Common
2704.15 @@ -13,9 +16,9 @@
2704.16 * specific language governing permissions and limitations under the
2704.17 * License. When distributing the software, include this License Header
2704.18 * Notice in each file and include the License file at
2704.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2704.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2704.21 * particular file as subject to the "Classpath" exception as provided
2704.22 - * by Sun in the GPL Version 2 section of the License file that
2704.23 + * by Oracle in the GPL Version 2 section of the License file that
2704.24 * accompanied this code. If applicable, add the following below the
2704.25 * License Header, with the fields enclosed by brackets [] replaced by
2704.26 * your own identifying information:
2705.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ScriptBase.java Fri Jul 16 11:47:36 2010 -0400
2705.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ScriptBase.java Fri Jul 16 14:21:50 2010 -0400
2705.3 @@ -1,7 +1,10 @@
2705.4 /*
2705.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2705.6 *
2705.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2705.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2705.9 + *
2705.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2705.11 + * Other names may be trademarks of their respective owners.
2705.12 *
2705.13 * The contents of this file are subject to the terms of either the GNU
2705.14 * General Public License Version 2 only ("GPL") or the Common
2705.15 @@ -13,9 +16,9 @@
2705.16 * specific language governing permissions and limitations under the
2705.17 * License. When distributing the software, include this License Header
2705.18 * Notice in each file and include the License file at
2705.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2705.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2705.21 * particular file as subject to the "Classpath" exception as provided
2705.22 - * by Sun in the GPL Version 2 section of the License file that
2705.23 + * by Oracle in the GPL Version 2 section of the License file that
2705.24 * accompanied this code. If applicable, add the following below the
2705.25 * License Header, with the fields enclosed by brackets [] replaced by
2705.26 * your own identifying information:
2706.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Selector.java Fri Jul 16 11:47:36 2010 -0400
2706.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Selector.java Fri Jul 16 14:21:50 2010 -0400
2706.3 @@ -1,7 +1,10 @@
2706.4 /*
2706.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2706.6 *
2706.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2706.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2706.9 + *
2706.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2706.11 + * Other names may be trademarks of their respective owners.
2706.12 *
2706.13 * The contents of this file are subject to the terms of either the GNU
2706.14 * General Public License Version 2 only ("GPL") or the Common
2706.15 @@ -13,9 +16,9 @@
2706.16 * specific language governing permissions and limitations under the
2706.17 * License. When distributing the software, include this License Header
2706.18 * Notice in each file and include the License file at
2706.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2706.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2706.21 * particular file as subject to the "Classpath" exception as provided
2706.22 - * by Sun in the GPL Version 2 section of the License file that
2706.23 + * by Oracle in the GPL Version 2 section of the License file that
2706.24 * accompanied this code. If applicable, add the following below the
2706.25 * License Header, with the fields enclosed by brackets [] replaced by
2706.26 * your own identifying information:
2707.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/SelectorBase.java Fri Jul 16 11:47:36 2010 -0400
2707.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/SelectorBase.java Fri Jul 16 14:21:50 2010 -0400
2707.3 @@ -1,7 +1,10 @@
2707.4 /*
2707.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2707.6 *
2707.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2707.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2707.9 + *
2707.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2707.11 + * Other names may be trademarks of their respective owners.
2707.12 *
2707.13 * The contents of this file are subject to the terms of either the GNU
2707.14 * General Public License Version 2 only ("GPL") or the Common
2707.15 @@ -13,9 +16,9 @@
2707.16 * specific language governing permissions and limitations under the
2707.17 * License. When distributing the software, include this License Header
2707.18 * Notice in each file and include the License file at
2707.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2707.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2707.21 * particular file as subject to the "Classpath" exception as provided
2707.22 - * by Sun in the GPL Version 2 section of the License file that
2707.23 + * by Oracle in the GPL Version 2 section of the License file that
2707.24 * accompanied this code. If applicable, add the following below the
2707.25 * License Header, with the fields enclosed by brackets [] replaced by
2707.26 * your own identifying information:
2708.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/SelectorManager.java Fri Jul 16 11:47:36 2010 -0400
2708.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/SelectorManager.java Fri Jul 16 14:21:50 2010 -0400
2708.3 @@ -1,7 +1,10 @@
2708.4 /*
2708.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2708.6 *
2708.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2708.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2708.9 + *
2708.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2708.11 + * Other names may be trademarks of their respective owners.
2708.12 *
2708.13 * The contents of this file are subject to the terms of either the GNU
2708.14 * General Public License Version 2 only ("GPL") or the Common
2708.15 @@ -13,9 +16,9 @@
2708.16 * specific language governing permissions and limitations under the
2708.17 * License. When distributing the software, include this License Header
2708.18 * Notice in each file and include the License file at
2708.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2708.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2708.21 * particular file as subject to the "Classpath" exception as provided
2708.22 - * by Sun in the GPL Version 2 section of the License file that
2708.23 + * by Oracle in the GPL Version 2 section of the License file that
2708.24 * accompanied this code. If applicable, add the following below the
2708.25 * License Header, with the fields enclosed by brackets [] replaced by
2708.26 * your own identifying information:
2709.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/SkipHyperlink.java Fri Jul 16 11:47:36 2010 -0400
2709.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/SkipHyperlink.java Fri Jul 16 14:21:50 2010 -0400
2709.3 @@ -1,7 +1,10 @@
2709.4 /*
2709.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2709.6 *
2709.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2709.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2709.9 + *
2709.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2709.11 + * Other names may be trademarks of their respective owners.
2709.12 *
2709.13 * The contents of this file are subject to the terms of either the GNU
2709.14 * General Public License Version 2 only ("GPL") or the Common
2709.15 @@ -13,9 +16,9 @@
2709.16 * specific language governing permissions and limitations under the
2709.17 * License. When distributing the software, include this License Header
2709.18 * Notice in each file and include the License file at
2709.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2709.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2709.21 * particular file as subject to the "Classpath" exception as provided
2709.22 - * by Sun in the GPL Version 2 section of the License file that
2709.23 + * by Oracle in the GPL Version 2 section of the License file that
2709.24 * accompanied this code. If applicable, add the following below the
2709.25 * License Header, with the fields enclosed by brackets [] replaced by
2709.26 * your own identifying information:
2710.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/SkipHyperlinkBase.java Fri Jul 16 11:47:36 2010 -0400
2710.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/SkipHyperlinkBase.java Fri Jul 16 14:21:50 2010 -0400
2710.3 @@ -1,7 +1,10 @@
2710.4 /*
2710.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2710.6 *
2710.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2710.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2710.9 + *
2710.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2710.11 + * Other names may be trademarks of their respective owners.
2710.12 *
2710.13 * The contents of this file are subject to the terms of either the GNU
2710.14 * General Public License Version 2 only ("GPL") or the Common
2710.15 @@ -13,9 +16,9 @@
2710.16 * specific language governing permissions and limitations under the
2710.17 * License. When distributing the software, include this License Header
2710.18 * Notice in each file and include the License file at
2710.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2710.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2710.21 * particular file as subject to the "Classpath" exception as provided
2710.22 - * by Sun in the GPL Version 2 section of the License file that
2710.23 + * by Oracle in the GPL Version 2 section of the License file that
2710.24 * accompanied this code. If applicable, add the following below the
2710.25 * License Header, with the fields enclosed by brackets [] replaced by
2710.26 * your own identifying information:
2711.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/StaticText.java Fri Jul 16 11:47:36 2010 -0400
2711.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/StaticText.java Fri Jul 16 14:21:50 2010 -0400
2711.3 @@ -1,7 +1,10 @@
2711.4 /*
2711.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2711.6 *
2711.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2711.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2711.9 + *
2711.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2711.11 + * Other names may be trademarks of their respective owners.
2711.12 *
2711.13 * The contents of this file are subject to the terms of either the GNU
2711.14 * General Public License Version 2 only ("GPL") or the Common
2711.15 @@ -13,9 +16,9 @@
2711.16 * specific language governing permissions and limitations under the
2711.17 * License. When distributing the software, include this License Header
2711.18 * Notice in each file and include the License file at
2711.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2711.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2711.21 * particular file as subject to the "Classpath" exception as provided
2711.22 - * by Sun in the GPL Version 2 section of the License file that
2711.23 + * by Oracle in the GPL Version 2 section of the License file that
2711.24 * accompanied this code. If applicable, add the following below the
2711.25 * License Header, with the fields enclosed by brackets [] replaced by
2711.26 * your own identifying information:
2712.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/StaticTextBase.java Fri Jul 16 11:47:36 2010 -0400
2712.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/StaticTextBase.java Fri Jul 16 14:21:50 2010 -0400
2712.3 @@ -1,7 +1,10 @@
2712.4 /*
2712.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2712.6 *
2712.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2712.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2712.9 + *
2712.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2712.11 + * Other names may be trademarks of their respective owners.
2712.12 *
2712.13 * The contents of this file are subject to the terms of either the GNU
2712.14 * General Public License Version 2 only ("GPL") or the Common
2712.15 @@ -13,9 +16,9 @@
2712.16 * specific language governing permissions and limitations under the
2712.17 * License. When distributing the software, include this License Header
2712.18 * Notice in each file and include the License file at
2712.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2712.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2712.21 * particular file as subject to the "Classpath" exception as provided
2712.22 - * by Sun in the GPL Version 2 section of the License file that
2712.23 + * by Oracle in the GPL Version 2 section of the License file that
2712.24 * accompanied this code. If applicable, add the following below the
2712.25 * License Header, with the fields enclosed by brackets [] replaced by
2712.26 * your own identifying information:
2713.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Tab.java Fri Jul 16 11:47:36 2010 -0400
2713.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Tab.java Fri Jul 16 14:21:50 2010 -0400
2713.3 @@ -1,7 +1,10 @@
2713.4 /*
2713.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2713.6 *
2713.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2713.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2713.9 + *
2713.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2713.11 + * Other names may be trademarks of their respective owners.
2713.12 *
2713.13 * The contents of this file are subject to the terms of either the GNU
2713.14 * General Public License Version 2 only ("GPL") or the Common
2713.15 @@ -13,9 +16,9 @@
2713.16 * specific language governing permissions and limitations under the
2713.17 * License. When distributing the software, include this License Header
2713.18 * Notice in each file and include the License file at
2713.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2713.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2713.21 * particular file as subject to the "Classpath" exception as provided
2713.22 - * by Sun in the GPL Version 2 section of the License file that
2713.23 + * by Oracle in the GPL Version 2 section of the License file that
2713.24 * accompanied this code. If applicable, add the following below the
2713.25 * License Header, with the fields enclosed by brackets [] replaced by
2713.26 * your own identifying information:
2714.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TabBase.java Fri Jul 16 11:47:36 2010 -0400
2714.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TabBase.java Fri Jul 16 14:21:50 2010 -0400
2714.3 @@ -1,7 +1,10 @@
2714.4 /*
2714.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2714.6 *
2714.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2714.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2714.9 + *
2714.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2714.11 + * Other names may be trademarks of their respective owners.
2714.12 *
2714.13 * The contents of this file are subject to the terms of either the GNU
2714.14 * General Public License Version 2 only ("GPL") or the Common
2714.15 @@ -13,9 +16,9 @@
2714.16 * specific language governing permissions and limitations under the
2714.17 * License. When distributing the software, include this License Header
2714.18 * Notice in each file and include the License file at
2714.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2714.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2714.21 * particular file as subject to the "Classpath" exception as provided
2714.22 - * by Sun in the GPL Version 2 section of the License file that
2714.23 + * by Oracle in the GPL Version 2 section of the License file that
2714.24 * accompanied this code. If applicable, add the following below the
2714.25 * License Header, with the fields enclosed by brackets [] replaced by
2714.26 * your own identifying information:
2715.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TabSet.java Fri Jul 16 11:47:36 2010 -0400
2715.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TabSet.java Fri Jul 16 14:21:50 2010 -0400
2715.3 @@ -1,7 +1,10 @@
2715.4 /*
2715.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2715.6 *
2715.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2715.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2715.9 + *
2715.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2715.11 + * Other names may be trademarks of their respective owners.
2715.12 *
2715.13 * The contents of this file are subject to the terms of either the GNU
2715.14 * General Public License Version 2 only ("GPL") or the Common
2715.15 @@ -13,9 +16,9 @@
2715.16 * specific language governing permissions and limitations under the
2715.17 * License. When distributing the software, include this License Header
2715.18 * Notice in each file and include the License file at
2715.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2715.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2715.21 * particular file as subject to the "Classpath" exception as provided
2715.22 - * by Sun in the GPL Version 2 section of the License file that
2715.23 + * by Oracle in the GPL Version 2 section of the License file that
2715.24 * accompanied this code. If applicable, add the following below the
2715.25 * License Header, with the fields enclosed by brackets [] replaced by
2715.26 * your own identifying information:
2716.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TabSetBase.java Fri Jul 16 11:47:36 2010 -0400
2716.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TabSetBase.java Fri Jul 16 14:21:50 2010 -0400
2716.3 @@ -1,7 +1,10 @@
2716.4 /*
2716.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2716.6 *
2716.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2716.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2716.9 + *
2716.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2716.11 + * Other names may be trademarks of their respective owners.
2716.12 *
2716.13 * The contents of this file are subject to the terms of either the GNU
2716.14 * General Public License Version 2 only ("GPL") or the Common
2716.15 @@ -13,9 +16,9 @@
2716.16 * specific language governing permissions and limitations under the
2716.17 * License. When distributing the software, include this License Header
2716.18 * Notice in each file and include the License file at
2716.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2716.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2716.21 * particular file as subject to the "Classpath" exception as provided
2716.22 - * by Sun in the GPL Version 2 section of the License file that
2716.23 + * by Oracle in the GPL Version 2 section of the License file that
2716.24 * accompanied this code. If applicable, add the following below the
2716.25 * License Header, with the fields enclosed by brackets [] replaced by
2716.26 * your own identifying information:
2717.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Table.java Fri Jul 16 11:47:36 2010 -0400
2717.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Table.java Fri Jul 16 14:21:50 2010 -0400
2717.3 @@ -1,7 +1,10 @@
2717.4 /*
2717.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2717.6 *
2717.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2717.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2717.9 + *
2717.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2717.11 + * Other names may be trademarks of their respective owners.
2717.12 *
2717.13 * The contents of this file are subject to the terms of either the GNU
2717.14 * General Public License Version 2 only ("GPL") or the Common
2717.15 @@ -13,9 +16,9 @@
2717.16 * specific language governing permissions and limitations under the
2717.17 * License. When distributing the software, include this License Header
2717.18 * Notice in each file and include the License file at
2717.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2717.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2717.21 * particular file as subject to the "Classpath" exception as provided
2717.22 - * by Sun in the GPL Version 2 section of the License file that
2717.23 + * by Oracle in the GPL Version 2 section of the License file that
2717.24 * accompanied this code. If applicable, add the following below the
2717.25 * License Header, with the fields enclosed by brackets [] replaced by
2717.26 * your own identifying information:
2718.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableActions.java Fri Jul 16 11:47:36 2010 -0400
2718.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableActions.java Fri Jul 16 14:21:50 2010 -0400
2718.3 @@ -1,7 +1,10 @@
2718.4 /*
2718.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2718.6 *
2718.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2718.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2718.9 + *
2718.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2718.11 + * Other names may be trademarks of their respective owners.
2718.12 *
2718.13 * The contents of this file are subject to the terms of either the GNU
2718.14 * General Public License Version 2 only ("GPL") or the Common
2718.15 @@ -13,9 +16,9 @@
2718.16 * specific language governing permissions and limitations under the
2718.17 * License. When distributing the software, include this License Header
2718.18 * Notice in each file and include the License file at
2718.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2718.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2718.21 * particular file as subject to the "Classpath" exception as provided
2718.22 - * by Sun in the GPL Version 2 section of the License file that
2718.23 + * by Oracle in the GPL Version 2 section of the License file that
2718.24 * accompanied this code. If applicable, add the following below the
2718.25 * License Header, with the fields enclosed by brackets [] replaced by
2718.26 * your own identifying information:
2719.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableActionsBase.java Fri Jul 16 11:47:36 2010 -0400
2719.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableActionsBase.java Fri Jul 16 14:21:50 2010 -0400
2719.3 @@ -1,7 +1,10 @@
2719.4 /*
2719.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2719.6 *
2719.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2719.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2719.9 + *
2719.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2719.11 + * Other names may be trademarks of their respective owners.
2719.12 *
2719.13 * The contents of this file are subject to the terms of either the GNU
2719.14 * General Public License Version 2 only ("GPL") or the Common
2719.15 @@ -13,9 +16,9 @@
2719.16 * specific language governing permissions and limitations under the
2719.17 * License. When distributing the software, include this License Header
2719.18 * Notice in each file and include the License file at
2719.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2719.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2719.21 * particular file as subject to the "Classpath" exception as provided
2719.22 - * by Sun in the GPL Version 2 section of the License file that
2719.23 + * by Oracle in the GPL Version 2 section of the License file that
2719.24 * accompanied this code. If applicable, add the following below the
2719.25 * License Header, with the fields enclosed by brackets [] replaced by
2719.26 * your own identifying information:
2720.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableBase.java Fri Jul 16 11:47:36 2010 -0400
2720.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableBase.java Fri Jul 16 14:21:50 2010 -0400
2720.3 @@ -1,7 +1,10 @@
2720.4 /*
2720.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2720.6 *
2720.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2720.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2720.9 + *
2720.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2720.11 + * Other names may be trademarks of their respective owners.
2720.12 *
2720.13 * The contents of this file are subject to the terms of either the GNU
2720.14 * General Public License Version 2 only ("GPL") or the Common
2720.15 @@ -13,9 +16,9 @@
2720.16 * specific language governing permissions and limitations under the
2720.17 * License. When distributing the software, include this License Header
2720.18 * Notice in each file and include the License file at
2720.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2720.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2720.21 * particular file as subject to the "Classpath" exception as provided
2720.22 - * by Sun in the GPL Version 2 section of the License file that
2720.23 + * by Oracle in the GPL Version 2 section of the License file that
2720.24 * accompanied this code. If applicable, add the following below the
2720.25 * License Header, with the fields enclosed by brackets [] replaced by
2720.26 * your own identifying information:
2721.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableColumn.java Fri Jul 16 11:47:36 2010 -0400
2721.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableColumn.java Fri Jul 16 14:21:50 2010 -0400
2721.3 @@ -1,7 +1,10 @@
2721.4 /*
2721.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2721.6 *
2721.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2721.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2721.9 + *
2721.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2721.11 + * Other names may be trademarks of their respective owners.
2721.12 *
2721.13 * The contents of this file are subject to the terms of either the GNU
2721.14 * General Public License Version 2 only ("GPL") or the Common
2721.15 @@ -13,9 +16,9 @@
2721.16 * specific language governing permissions and limitations under the
2721.17 * License. When distributing the software, include this License Header
2721.18 * Notice in each file and include the License file at
2721.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2721.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2721.21 * particular file as subject to the "Classpath" exception as provided
2721.22 - * by Sun in the GPL Version 2 section of the License file that
2721.23 + * by Oracle in the GPL Version 2 section of the License file that
2721.24 * accompanied this code. If applicable, add the following below the
2721.25 * License Header, with the fields enclosed by brackets [] replaced by
2721.26 * your own identifying information:
2722.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableColumnBase.java Fri Jul 16 11:47:36 2010 -0400
2722.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableColumnBase.java Fri Jul 16 14:21:50 2010 -0400
2722.3 @@ -1,7 +1,10 @@
2722.4 /*
2722.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2722.6 *
2722.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2722.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2722.9 + *
2722.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2722.11 + * Other names may be trademarks of their respective owners.
2722.12 *
2722.13 * The contents of this file are subject to the terms of either the GNU
2722.14 * General Public License Version 2 only ("GPL") or the Common
2722.15 @@ -13,9 +16,9 @@
2722.16 * specific language governing permissions and limitations under the
2722.17 * License. When distributing the software, include this License Header
2722.18 * Notice in each file and include the License file at
2722.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2722.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2722.21 * particular file as subject to the "Classpath" exception as provided
2722.22 - * by Sun in the GPL Version 2 section of the License file that
2722.23 + * by Oracle in the GPL Version 2 section of the License file that
2722.24 * accompanied this code. If applicable, add the following below the
2722.25 * License Header, with the fields enclosed by brackets [] replaced by
2722.26 * your own identifying information:
2723.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableFooter.java Fri Jul 16 11:47:36 2010 -0400
2723.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableFooter.java Fri Jul 16 14:21:50 2010 -0400
2723.3 @@ -1,7 +1,10 @@
2723.4 /*
2723.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2723.6 *
2723.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2723.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2723.9 + *
2723.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2723.11 + * Other names may be trademarks of their respective owners.
2723.12 *
2723.13 * The contents of this file are subject to the terms of either the GNU
2723.14 * General Public License Version 2 only ("GPL") or the Common
2723.15 @@ -13,9 +16,9 @@
2723.16 * specific language governing permissions and limitations under the
2723.17 * License. When distributing the software, include this License Header
2723.18 * Notice in each file and include the License file at
2723.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2723.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2723.21 * particular file as subject to the "Classpath" exception as provided
2723.22 - * by Sun in the GPL Version 2 section of the License file that
2723.23 + * by Oracle in the GPL Version 2 section of the License file that
2723.24 * accompanied this code. If applicable, add the following below the
2723.25 * License Header, with the fields enclosed by brackets [] replaced by
2723.26 * your own identifying information:
2724.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableFooterBase.java Fri Jul 16 11:47:36 2010 -0400
2724.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableFooterBase.java Fri Jul 16 14:21:50 2010 -0400
2724.3 @@ -1,7 +1,10 @@
2724.4 /*
2724.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2724.6 *
2724.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2724.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2724.9 + *
2724.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2724.11 + * Other names may be trademarks of their respective owners.
2724.12 *
2724.13 * The contents of this file are subject to the terms of either the GNU
2724.14 * General Public License Version 2 only ("GPL") or the Common
2724.15 @@ -13,9 +16,9 @@
2724.16 * specific language governing permissions and limitations under the
2724.17 * License. When distributing the software, include this License Header
2724.18 * Notice in each file and include the License file at
2724.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2724.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2724.21 * particular file as subject to the "Classpath" exception as provided
2724.22 - * by Sun in the GPL Version 2 section of the License file that
2724.23 + * by Oracle in the GPL Version 2 section of the License file that
2724.24 * accompanied this code. If applicable, add the following below the
2724.25 * License Header, with the fields enclosed by brackets [] replaced by
2724.26 * your own identifying information:
2725.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableHeader.java Fri Jul 16 11:47:36 2010 -0400
2725.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableHeader.java Fri Jul 16 14:21:50 2010 -0400
2725.3 @@ -1,7 +1,10 @@
2725.4 /*
2725.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2725.6 *
2725.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2725.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2725.9 + *
2725.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2725.11 + * Other names may be trademarks of their respective owners.
2725.12 *
2725.13 * The contents of this file are subject to the terms of either the GNU
2725.14 * General Public License Version 2 only ("GPL") or the Common
2725.15 @@ -13,9 +16,9 @@
2725.16 * specific language governing permissions and limitations under the
2725.17 * License. When distributing the software, include this License Header
2725.18 * Notice in each file and include the License file at
2725.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2725.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2725.21 * particular file as subject to the "Classpath" exception as provided
2725.22 - * by Sun in the GPL Version 2 section of the License file that
2725.23 + * by Oracle in the GPL Version 2 section of the License file that
2725.24 * accompanied this code. If applicable, add the following below the
2725.25 * License Header, with the fields enclosed by brackets [] replaced by
2725.26 * your own identifying information:
2726.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableHeaderBase.java Fri Jul 16 11:47:36 2010 -0400
2726.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableHeaderBase.java Fri Jul 16 14:21:50 2010 -0400
2726.3 @@ -1,7 +1,10 @@
2726.4 /*
2726.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2726.6 *
2726.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2726.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2726.9 + *
2726.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2726.11 + * Other names may be trademarks of their respective owners.
2726.12 *
2726.13 * The contents of this file are subject to the terms of either the GNU
2726.14 * General Public License Version 2 only ("GPL") or the Common
2726.15 @@ -13,9 +16,9 @@
2726.16 * specific language governing permissions and limitations under the
2726.17 * License. When distributing the software, include this License Header
2726.18 * Notice in each file and include the License file at
2726.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2726.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2726.21 * particular file as subject to the "Classpath" exception as provided
2726.22 - * by Sun in the GPL Version 2 section of the License file that
2726.23 + * by Oracle in the GPL Version 2 section of the License file that
2726.24 * accompanied this code. If applicable, add the following below the
2726.25 * License Header, with the fields enclosed by brackets [] replaced by
2726.26 * your own identifying information:
2727.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TablePanels.java Fri Jul 16 11:47:36 2010 -0400
2727.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TablePanels.java Fri Jul 16 14:21:50 2010 -0400
2727.3 @@ -1,7 +1,10 @@
2727.4 /*
2727.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2727.6 *
2727.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2727.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2727.9 + *
2727.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2727.11 + * Other names may be trademarks of their respective owners.
2727.12 *
2727.13 * The contents of this file are subject to the terms of either the GNU
2727.14 * General Public License Version 2 only ("GPL") or the Common
2727.15 @@ -13,9 +16,9 @@
2727.16 * specific language governing permissions and limitations under the
2727.17 * License. When distributing the software, include this License Header
2727.18 * Notice in each file and include the License file at
2727.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2727.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2727.21 * particular file as subject to the "Classpath" exception as provided
2727.22 - * by Sun in the GPL Version 2 section of the License file that
2727.23 + * by Oracle in the GPL Version 2 section of the License file that
2727.24 * accompanied this code. If applicable, add the following below the
2727.25 * License Header, with the fields enclosed by brackets [] replaced by
2727.26 * your own identifying information:
2728.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TablePanelsBase.java Fri Jul 16 11:47:36 2010 -0400
2728.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TablePanelsBase.java Fri Jul 16 14:21:50 2010 -0400
2728.3 @@ -1,7 +1,10 @@
2728.4 /*
2728.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2728.6 *
2728.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2728.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2728.9 + *
2728.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2728.11 + * Other names may be trademarks of their respective owners.
2728.12 *
2728.13 * The contents of this file are subject to the terms of either the GNU
2728.14 * General Public License Version 2 only ("GPL") or the Common
2728.15 @@ -13,9 +16,9 @@
2728.16 * specific language governing permissions and limitations under the
2728.17 * License. When distributing the software, include this License Header
2728.18 * Notice in each file and include the License file at
2728.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2728.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2728.21 * particular file as subject to the "Classpath" exception as provided
2728.22 - * by Sun in the GPL Version 2 section of the License file that
2728.23 + * by Oracle in the GPL Version 2 section of the License file that
2728.24 * accompanied this code. If applicable, add the following below the
2728.25 * License Header, with the fields enclosed by brackets [] replaced by
2728.26 * your own identifying information:
2729.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableRowGroup.java Fri Jul 16 11:47:36 2010 -0400
2729.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableRowGroup.java Fri Jul 16 14:21:50 2010 -0400
2729.3 @@ -1,7 +1,10 @@
2729.4 /*
2729.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2729.6 *
2729.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2729.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2729.9 + *
2729.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2729.11 + * Other names may be trademarks of their respective owners.
2729.12 *
2729.13 * The contents of this file are subject to the terms of either the GNU
2729.14 * General Public License Version 2 only ("GPL") or the Common
2729.15 @@ -13,9 +16,9 @@
2729.16 * specific language governing permissions and limitations under the
2729.17 * License. When distributing the software, include this License Header
2729.18 * Notice in each file and include the License file at
2729.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2729.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2729.21 * particular file as subject to the "Classpath" exception as provided
2729.22 - * by Sun in the GPL Version 2 section of the License file that
2729.23 + * by Oracle in the GPL Version 2 section of the License file that
2729.24 * accompanied this code. If applicable, add the following below the
2729.25 * License Header, with the fields enclosed by brackets [] replaced by
2729.26 * your own identifying information:
2730.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableRowGroupBase.java Fri Jul 16 11:47:36 2010 -0400
2730.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TableRowGroupBase.java Fri Jul 16 14:21:50 2010 -0400
2730.3 @@ -1,7 +1,10 @@
2730.4 /*
2730.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2730.6 *
2730.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2730.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2730.9 + *
2730.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2730.11 + * Other names may be trademarks of their respective owners.
2730.12 *
2730.13 * The contents of this file are subject to the terms of either the GNU
2730.14 * General Public License Version 2 only ("GPL") or the Common
2730.15 @@ -13,9 +16,9 @@
2730.16 * specific language governing permissions and limitations under the
2730.17 * License. When distributing the software, include this License Header
2730.18 * Notice in each file and include the License file at
2730.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2730.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2730.21 * particular file as subject to the "Classpath" exception as provided
2730.22 - * by Sun in the GPL Version 2 section of the License file that
2730.23 + * by Oracle in the GPL Version 2 section of the License file that
2730.24 * accompanied this code. If applicable, add the following below the
2730.25 * License Header, with the fields enclosed by brackets [] replaced by
2730.26 * your own identifying information:
2731.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TemplateComponent.java Fri Jul 16 11:47:36 2010 -0400
2731.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TemplateComponent.java Fri Jul 16 14:21:50 2010 -0400
2731.3 @@ -1,7 +1,10 @@
2731.4 /*
2731.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2731.6 *
2731.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2731.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2731.9 + *
2731.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2731.11 + * Other names may be trademarks of their respective owners.
2731.12 *
2731.13 * The contents of this file are subject to the terms of either the GNU
2731.14 * General Public License Version 2 only ("GPL") or the Common
2731.15 @@ -13,9 +16,9 @@
2731.16 * specific language governing permissions and limitations under the
2731.17 * License. When distributing the software, include this License Header
2731.18 * Notice in each file and include the License file at
2731.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2731.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2731.21 * particular file as subject to the "Classpath" exception as provided
2731.22 - * by Sun in the GPL Version 2 section of the License file that
2731.23 + * by Oracle in the GPL Version 2 section of the License file that
2731.24 * accompanied this code. If applicable, add the following below the
2731.25 * License Header, with the fields enclosed by brackets [] replaced by
2731.26 * your own identifying information:
2732.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TemplateComponentBase.java Fri Jul 16 11:47:36 2010 -0400
2732.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TemplateComponentBase.java Fri Jul 16 14:21:50 2010 -0400
2732.3 @@ -1,7 +1,10 @@
2732.4 /*
2732.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2732.6 *
2732.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2732.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2732.9 + *
2732.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2732.11 + * Other names may be trademarks of their respective owners.
2732.12 *
2732.13 * The contents of this file are subject to the terms of either the GNU
2732.14 * General Public License Version 2 only ("GPL") or the Common
2732.15 @@ -13,9 +16,9 @@
2732.16 * specific language governing permissions and limitations under the
2732.17 * License. When distributing the software, include this License Header
2732.18 * Notice in each file and include the License file at
2732.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2732.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2732.21 * particular file as subject to the "Classpath" exception as provided
2732.22 - * by Sun in the GPL Version 2 section of the License file that
2732.23 + * by Oracle in the GPL Version 2 section of the License file that
2732.24 * accompanied this code. If applicable, add the following below the
2732.25 * License Header, with the fields enclosed by brackets [] replaced by
2732.26 * your own identifying information:
2733.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TemplateComponentBaseBase.java Fri Jul 16 11:47:36 2010 -0400
2733.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TemplateComponentBaseBase.java Fri Jul 16 14:21:50 2010 -0400
2733.3 @@ -1,7 +1,10 @@
2733.4 /*
2733.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2733.6 *
2733.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2733.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2733.9 + *
2733.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2733.11 + * Other names may be trademarks of their respective owners.
2733.12 *
2733.13 * The contents of this file are subject to the terms of either the GNU
2733.14 * General Public License Version 2 only ("GPL") or the Common
2733.15 @@ -13,9 +16,9 @@
2733.16 * specific language governing permissions and limitations under the
2733.17 * License. When distributing the software, include this License Header
2733.18 * Notice in each file and include the License file at
2733.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2733.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2733.21 * particular file as subject to the "Classpath" exception as provided
2733.22 - * by Sun in the GPL Version 2 section of the License file that
2733.23 + * by Oracle in the GPL Version 2 section of the License file that
2733.24 * accompanied this code. If applicable, add the following below the
2733.25 * License Header, with the fields enclosed by brackets [] replaced by
2733.26 * your own identifying information:
2734.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TextArea.java Fri Jul 16 11:47:36 2010 -0400
2734.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TextArea.java Fri Jul 16 14:21:50 2010 -0400
2734.3 @@ -1,7 +1,10 @@
2734.4 /*
2734.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2734.6 *
2734.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2734.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2734.9 + *
2734.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2734.11 + * Other names may be trademarks of their respective owners.
2734.12 *
2734.13 * The contents of this file are subject to the terms of either the GNU
2734.14 * General Public License Version 2 only ("GPL") or the Common
2734.15 @@ -13,9 +16,9 @@
2734.16 * specific language governing permissions and limitations under the
2734.17 * License. When distributing the software, include this License Header
2734.18 * Notice in each file and include the License file at
2734.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2734.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2734.21 * particular file as subject to the "Classpath" exception as provided
2734.22 - * by Sun in the GPL Version 2 section of the License file that
2734.23 + * by Oracle in the GPL Version 2 section of the License file that
2734.24 * accompanied this code. If applicable, add the following below the
2734.25 * License Header, with the fields enclosed by brackets [] replaced by
2734.26 * your own identifying information:
2735.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TextAreaBase.java Fri Jul 16 11:47:36 2010 -0400
2735.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TextAreaBase.java Fri Jul 16 14:21:50 2010 -0400
2735.3 @@ -1,7 +1,10 @@
2735.4 /*
2735.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2735.6 *
2735.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2735.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2735.9 + *
2735.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2735.11 + * Other names may be trademarks of their respective owners.
2735.12 *
2735.13 * The contents of this file are subject to the terms of either the GNU
2735.14 * General Public License Version 2 only ("GPL") or the Common
2735.15 @@ -13,9 +16,9 @@
2735.16 * specific language governing permissions and limitations under the
2735.17 * License. When distributing the software, include this License Header
2735.18 * Notice in each file and include the License file at
2735.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2735.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2735.21 * particular file as subject to the "Classpath" exception as provided
2735.22 - * by Sun in the GPL Version 2 section of the License file that
2735.23 + * by Oracle in the GPL Version 2 section of the License file that
2735.24 * accompanied this code. If applicable, add the following below the
2735.25 * License Header, with the fields enclosed by brackets [] replaced by
2735.26 * your own identifying information:
2736.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TextField.java Fri Jul 16 11:47:36 2010 -0400
2736.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TextField.java Fri Jul 16 14:21:50 2010 -0400
2736.3 @@ -1,7 +1,10 @@
2736.4 /*
2736.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2736.6 *
2736.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2736.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2736.9 + *
2736.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2736.11 + * Other names may be trademarks of their respective owners.
2736.12 *
2736.13 * The contents of this file are subject to the terms of either the GNU
2736.14 * General Public License Version 2 only ("GPL") or the Common
2736.15 @@ -13,9 +16,9 @@
2736.16 * specific language governing permissions and limitations under the
2736.17 * License. When distributing the software, include this License Header
2736.18 * Notice in each file and include the License file at
2736.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2736.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2736.21 * particular file as subject to the "Classpath" exception as provided
2736.22 - * by Sun in the GPL Version 2 section of the License file that
2736.23 + * by Oracle in the GPL Version 2 section of the License file that
2736.24 * accompanied this code. If applicable, add the following below the
2736.25 * License Header, with the fields enclosed by brackets [] replaced by
2736.26 * your own identifying information:
2737.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TextFieldBase.java Fri Jul 16 11:47:36 2010 -0400
2737.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TextFieldBase.java Fri Jul 16 14:21:50 2010 -0400
2737.3 @@ -1,7 +1,10 @@
2737.4 /*
2737.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2737.6 *
2737.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2737.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2737.9 + *
2737.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2737.11 + * Other names may be trademarks of their respective owners.
2737.12 *
2737.13 * The contents of this file are subject to the terms of either the GNU
2737.14 * General Public License Version 2 only ("GPL") or the Common
2737.15 @@ -13,9 +16,9 @@
2737.16 * specific language governing permissions and limitations under the
2737.17 * License. When distributing the software, include this License Header
2737.18 * Notice in each file and include the License file at
2737.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2737.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2737.21 * particular file as subject to the "Classpath" exception as provided
2737.22 - * by Sun in the GPL Version 2 section of the License file that
2737.23 + * by Oracle in the GPL Version 2 section of the License file that
2737.24 * accompanied this code. If applicable, add the following below the
2737.25 * License Header, with the fields enclosed by brackets [] replaced by
2737.26 * your own identifying information:
2738.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ThemeLinks.java Fri Jul 16 11:47:36 2010 -0400
2738.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ThemeLinks.java Fri Jul 16 14:21:50 2010 -0400
2738.3 @@ -1,7 +1,10 @@
2738.4 /*
2738.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2738.6 *
2738.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2738.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2738.9 + *
2738.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2738.11 + * Other names may be trademarks of their respective owners.
2738.12 *
2738.13 * The contents of this file are subject to the terms of either the GNU
2738.14 * General Public License Version 2 only ("GPL") or the Common
2738.15 @@ -13,9 +16,9 @@
2738.16 * specific language governing permissions and limitations under the
2738.17 * License. When distributing the software, include this License Header
2738.18 * Notice in each file and include the License file at
2738.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2738.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2738.21 * particular file as subject to the "Classpath" exception as provided
2738.22 - * by Sun in the GPL Version 2 section of the License file that
2738.23 + * by Oracle in the GPL Version 2 section of the License file that
2738.24 * accompanied this code. If applicable, add the following below the
2738.25 * License Header, with the fields enclosed by brackets [] replaced by
2738.26 * your own identifying information:
2739.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/ThemeLinksBase.java Fri Jul 16 11:47:36 2010 -0400
2739.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/ThemeLinksBase.java Fri Jul 16 14:21:50 2010 -0400
2739.3 @@ -1,7 +1,10 @@
2739.4 /*
2739.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2739.6 *
2739.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2739.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2739.9 + *
2739.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2739.11 + * Other names may be trademarks of their respective owners.
2739.12 *
2739.13 * The contents of this file are subject to the terms of either the GNU
2739.14 * General Public License Version 2 only ("GPL") or the Common
2739.15 @@ -13,9 +16,9 @@
2739.16 * specific language governing permissions and limitations under the
2739.17 * License. When distributing the software, include this License Header
2739.18 * Notice in each file and include the License file at
2739.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2739.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2739.21 * particular file as subject to the "Classpath" exception as provided
2739.22 - * by Sun in the GPL Version 2 section of the License file that
2739.23 + * by Oracle in the GPL Version 2 section of the License file that
2739.24 * accompanied this code. If applicable, add the following below the
2739.25 * License Header, with the fields enclosed by brackets [] replaced by
2739.26 * your own identifying information:
2740.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Time.java Fri Jul 16 11:47:36 2010 -0400
2740.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Time.java Fri Jul 16 14:21:50 2010 -0400
2740.3 @@ -1,7 +1,10 @@
2740.4 /*
2740.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2740.6 *
2740.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2740.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2740.9 + *
2740.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2740.11 + * Other names may be trademarks of their respective owners.
2740.12 *
2740.13 * The contents of this file are subject to the terms of either the GNU
2740.14 * General Public License Version 2 only ("GPL") or the Common
2740.15 @@ -13,9 +16,9 @@
2740.16 * specific language governing permissions and limitations under the
2740.17 * License. When distributing the software, include this License Header
2740.18 * Notice in each file and include the License file at
2740.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2740.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2740.21 * particular file as subject to the "Classpath" exception as provided
2740.22 - * by Sun in the GPL Version 2 section of the License file that
2740.23 + * by Oracle in the GPL Version 2 section of the License file that
2740.24 * accompanied this code. If applicable, add the following below the
2740.25 * License Header, with the fields enclosed by brackets [] replaced by
2740.26 * your own identifying information:
2741.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TimeBase.java Fri Jul 16 11:47:36 2010 -0400
2741.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TimeBase.java Fri Jul 16 14:21:50 2010 -0400
2741.3 @@ -1,7 +1,10 @@
2741.4 /*
2741.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2741.6 *
2741.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2741.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2741.9 + *
2741.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2741.11 + * Other names may be trademarks of their respective owners.
2741.12 *
2741.13 * The contents of this file are subject to the terms of either the GNU
2741.14 * General Public License Version 2 only ("GPL") or the Common
2741.15 @@ -13,9 +16,9 @@
2741.16 * specific language governing permissions and limitations under the
2741.17 * License. When distributing the software, include this License Header
2741.18 * Notice in each file and include the License file at
2741.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2741.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2741.21 * particular file as subject to the "Classpath" exception as provided
2741.22 - * by Sun in the GPL Version 2 section of the License file that
2741.23 + * by Oracle in the GPL Version 2 section of the License file that
2741.24 * accompanied this code. If applicable, add the following below the
2741.25 * License Header, with the fields enclosed by brackets [] replaced by
2741.26 * your own identifying information:
2742.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Tree.java Fri Jul 16 11:47:36 2010 -0400
2742.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Tree.java Fri Jul 16 14:21:50 2010 -0400
2742.3 @@ -1,7 +1,10 @@
2742.4 /*
2742.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2742.6 *
2742.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2742.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2742.9 + *
2742.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2742.11 + * Other names may be trademarks of their respective owners.
2742.12 *
2742.13 * The contents of this file are subject to the terms of either the GNU
2742.14 * General Public License Version 2 only ("GPL") or the Common
2742.15 @@ -13,9 +16,9 @@
2742.16 * specific language governing permissions and limitations under the
2742.17 * License. When distributing the software, include this License Header
2742.18 * Notice in each file and include the License file at
2742.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2742.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2742.21 * particular file as subject to the "Classpath" exception as provided
2742.22 - * by Sun in the GPL Version 2 section of the License file that
2742.23 + * by Oracle in the GPL Version 2 section of the License file that
2742.24 * accompanied this code. If applicable, add the following below the
2742.25 * License Header, with the fields enclosed by brackets [] replaced by
2742.26 * your own identifying information:
2743.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TreeBase.java Fri Jul 16 11:47:36 2010 -0400
2743.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TreeBase.java Fri Jul 16 14:21:50 2010 -0400
2743.3 @@ -1,7 +1,10 @@
2743.4 /*
2743.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2743.6 *
2743.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2743.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2743.9 + *
2743.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2743.11 + * Other names may be trademarks of their respective owners.
2743.12 *
2743.13 * The contents of this file are subject to the terms of either the GNU
2743.14 * General Public License Version 2 only ("GPL") or the Common
2743.15 @@ -13,9 +16,9 @@
2743.16 * specific language governing permissions and limitations under the
2743.17 * License. When distributing the software, include this License Header
2743.18 * Notice in each file and include the License file at
2743.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2743.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2743.21 * particular file as subject to the "Classpath" exception as provided
2743.22 - * by Sun in the GPL Version 2 section of the License file that
2743.23 + * by Oracle in the GPL Version 2 section of the License file that
2743.24 * accompanied this code. If applicable, add the following below the
2743.25 * License Header, with the fields enclosed by brackets [] replaced by
2743.26 * your own identifying information:
2744.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TreeNode.java Fri Jul 16 11:47:36 2010 -0400
2744.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TreeNode.java Fri Jul 16 14:21:50 2010 -0400
2744.3 @@ -1,7 +1,10 @@
2744.4 /*
2744.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2744.6 *
2744.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2744.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2744.9 + *
2744.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2744.11 + * Other names may be trademarks of their respective owners.
2744.12 *
2744.13 * The contents of this file are subject to the terms of either the GNU
2744.14 * General Public License Version 2 only ("GPL") or the Common
2744.15 @@ -13,9 +16,9 @@
2744.16 * specific language governing permissions and limitations under the
2744.17 * License. When distributing the software, include this License Header
2744.18 * Notice in each file and include the License file at
2744.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2744.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2744.21 * particular file as subject to the "Classpath" exception as provided
2744.22 - * by Sun in the GPL Version 2 section of the License file that
2744.23 + * by Oracle in the GPL Version 2 section of the License file that
2744.24 * accompanied this code. If applicable, add the following below the
2744.25 * License Header, with the fields enclosed by brackets [] replaced by
2744.26 * your own identifying information:
2745.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/TreeNodeBase.java Fri Jul 16 11:47:36 2010 -0400
2745.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/TreeNodeBase.java Fri Jul 16 14:21:50 2010 -0400
2745.3 @@ -1,7 +1,10 @@
2745.4 /*
2745.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2745.6 *
2745.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2745.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2745.9 + *
2745.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2745.11 + * Other names may be trademarks of their respective owners.
2745.12 *
2745.13 * The contents of this file are subject to the terms of either the GNU
2745.14 * General Public License Version 2 only ("GPL") or the Common
2745.15 @@ -13,9 +16,9 @@
2745.16 * specific language governing permissions and limitations under the
2745.17 * License. When distributing the software, include this License Header
2745.18 * Notice in each file and include the License file at
2745.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2745.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2745.21 * particular file as subject to the "Classpath" exception as provided
2745.22 - * by Sun in the GPL Version 2 section of the License file that
2745.23 + * by Oracle in the GPL Version 2 section of the License file that
2745.24 * accompanied this code. If applicable, add the following below the
2745.25 * License Header, with the fields enclosed by brackets [] replaced by
2745.26 * your own identifying information:
2746.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/Upload.java Fri Jul 16 11:47:36 2010 -0400
2746.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/Upload.java Fri Jul 16 14:21:50 2010 -0400
2746.3 @@ -1,7 +1,10 @@
2746.4 /*
2746.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2746.6 *
2746.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2746.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2746.9 + *
2746.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2746.11 + * Other names may be trademarks of their respective owners.
2746.12 *
2746.13 * The contents of this file are subject to the terms of either the GNU
2746.14 * General Public License Version 2 only ("GPL") or the Common
2746.15 @@ -13,9 +16,9 @@
2746.16 * specific language governing permissions and limitations under the
2746.17 * License. When distributing the software, include this License Header
2746.18 * Notice in each file and include the License file at
2746.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2746.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2746.21 * particular file as subject to the "Classpath" exception as provided
2746.22 - * by Sun in the GPL Version 2 section of the License file that
2746.23 + * by Oracle in the GPL Version 2 section of the License file that
2746.24 * accompanied this code. If applicable, add the following below the
2746.25 * License Header, with the fields enclosed by brackets [] replaced by
2746.26 * your own identifying information:
2747.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/UploadBase.java Fri Jul 16 11:47:36 2010 -0400
2747.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/UploadBase.java Fri Jul 16 14:21:50 2010 -0400
2747.3 @@ -1,7 +1,10 @@
2747.4 /*
2747.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2747.6 *
2747.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2747.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2747.9 + *
2747.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2747.11 + * Other names may be trademarks of their respective owners.
2747.12 *
2747.13 * The contents of this file are subject to the terms of either the GNU
2747.14 * General Public License Version 2 only ("GPL") or the Common
2747.15 @@ -13,9 +16,9 @@
2747.16 * specific language governing permissions and limitations under the
2747.17 * License. When distributing the software, include this License Header
2747.18 * Notice in each file and include the License file at
2747.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2747.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2747.21 * particular file as subject to the "Classpath" exception as provided
2747.22 - * by Sun in the GPL Version 2 section of the License file that
2747.23 + * by Oracle in the GPL Version 2 section of the License file that
2747.24 * accompanied this code. If applicable, add the following below the
2747.25 * License Header, with the fields enclosed by brackets [] replaced by
2747.26 * your own identifying information:
2748.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/Util.java Fri Jul 16 11:47:36 2010 -0400
2748.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/Util.java Fri Jul 16 14:21:50 2010 -0400
2748.3 @@ -1,7 +1,10 @@
2748.4 /*
2748.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2748.6 *
2748.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2748.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2748.9 + *
2748.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2748.11 + * Other names may be trademarks of their respective owners.
2748.12 *
2748.13 * The contents of this file are subject to the terms of either the GNU
2748.14 * General Public License Version 2 only ("GPL") or the Common
2748.15 @@ -13,9 +16,9 @@
2748.16 * specific language governing permissions and limitations under the
2748.17 * License. When distributing the software, include this License Header
2748.18 * Notice in each file and include the License file at
2748.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2748.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2748.21 * particular file as subject to the "Classpath" exception as provided
2748.22 - * by Sun in the GPL Version 2 section of the License file that
2748.23 + * by Oracle in the GPL Version 2 section of the License file that
2748.24 * accompanied this code. If applicable, add the following below the
2748.25 * License Header, with the fields enclosed by brackets [] replaced by
2748.26 * your own identifying information:
2749.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/ComponentType.java Fri Jul 16 11:47:36 2010 -0400
2749.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/ComponentType.java Fri Jul 16 14:21:50 2010 -0400
2749.3 @@ -1,7 +1,10 @@
2749.4 /*
2749.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2749.6 *
2749.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2749.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2749.9 + *
2749.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2749.11 + * Other names may be trademarks of their respective owners.
2749.12 *
2749.13 * The contents of this file are subject to the terms of either the GNU
2749.14 * General Public License Version 2 only ("GPL") or the Common
2749.15 @@ -13,9 +16,9 @@
2749.16 * specific language governing permissions and limitations under the
2749.17 * License. When distributing the software, include this License Header
2749.18 * Notice in each file and include the License file at
2749.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2749.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2749.21 * particular file as subject to the "Classpath" exception as provided
2749.22 - * by Sun in the GPL Version 2 section of the License file that
2749.23 + * by Oracle in the GPL Version 2 section of the License file that
2749.24 * accompanied this code. If applicable, add the following below the
2749.25 * License Header, with the fields enclosed by brackets [] replaced by
2749.26 * your own identifying information:
2750.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutAttribute.java Fri Jul 16 11:47:36 2010 -0400
2750.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutAttribute.java Fri Jul 16 14:21:50 2010 -0400
2750.3 @@ -1,7 +1,10 @@
2750.4 /*
2750.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2750.6 *
2750.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2750.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2750.9 + *
2750.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2750.11 + * Other names may be trademarks of their respective owners.
2750.12 *
2750.13 * The contents of this file are subject to the terms of either the GNU
2750.14 * General Public License Version 2 only ("GPL") or the Common
2750.15 @@ -13,9 +16,9 @@
2750.16 * specific language governing permissions and limitations under the
2750.17 * License. When distributing the software, include this License Header
2750.18 * Notice in each file and include the License file at
2750.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2750.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2750.21 * particular file as subject to the "Classpath" exception as provided
2750.22 - * by Sun in the GPL Version 2 section of the License file that
2750.23 + * by Oracle in the GPL Version 2 section of the License file that
2750.24 * accompanied this code. If applicable, add the following below the
2750.25 * License Header, with the fields enclosed by brackets [] replaced by
2750.26 * your own identifying information:
2751.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutComponent.java Fri Jul 16 11:47:36 2010 -0400
2751.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutComponent.java Fri Jul 16 14:21:50 2010 -0400
2751.3 @@ -1,7 +1,10 @@
2751.4 /*
2751.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2751.6 *
2751.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2751.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2751.9 + *
2751.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2751.11 + * Other names may be trademarks of their respective owners.
2751.12 *
2751.13 * The contents of this file are subject to the terms of either the GNU
2751.14 * General Public License Version 2 only ("GPL") or the Common
2751.15 @@ -13,9 +16,9 @@
2751.16 * specific language governing permissions and limitations under the
2751.17 * License. When distributing the software, include this License Header
2751.18 * Notice in each file and include the License file at
2751.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2751.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2751.21 * particular file as subject to the "Classpath" exception as provided
2751.22 - * by Sun in the GPL Version 2 section of the License file that
2751.23 + * by Oracle in the GPL Version 2 section of the License file that
2751.24 * accompanied this code. If applicable, add the following below the
2751.25 * License Header, with the fields enclosed by brackets [] replaced by
2751.26 * your own identifying information:
2752.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutDefinition.java Fri Jul 16 11:47:36 2010 -0400
2752.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutDefinition.java Fri Jul 16 14:21:50 2010 -0400
2752.3 @@ -1,7 +1,10 @@
2752.4 /*
2752.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2752.6 *
2752.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2752.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2752.9 + *
2752.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2752.11 + * Other names may be trademarks of their respective owners.
2752.12 *
2752.13 * The contents of this file are subject to the terms of either the GNU
2752.14 * General Public License Version 2 only ("GPL") or the Common
2752.15 @@ -13,9 +16,9 @@
2752.16 * specific language governing permissions and limitations under the
2752.17 * License. When distributing the software, include this License Header
2752.18 * Notice in each file and include the License file at
2752.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2752.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2752.21 * particular file as subject to the "Classpath" exception as provided
2752.22 - * by Sun in the GPL Version 2 section of the License file that
2752.23 + * by Oracle in the GPL Version 2 section of the License file that
2752.24 * accompanied this code. If applicable, add the following below the
2752.25 * License Header, with the fields enclosed by brackets [] replaced by
2752.26 * your own identifying information:
2753.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutElement.java Fri Jul 16 11:47:36 2010 -0400
2753.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutElement.java Fri Jul 16 14:21:50 2010 -0400
2753.3 @@ -1,7 +1,10 @@
2753.4 /*
2753.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2753.6 *
2753.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2753.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2753.9 + *
2753.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2753.11 + * Other names may be trademarks of their respective owners.
2753.12 *
2753.13 * The contents of this file are subject to the terms of either the GNU
2753.14 * General Public License Version 2 only ("GPL") or the Common
2753.15 @@ -13,9 +16,9 @@
2753.16 * specific language governing permissions and limitations under the
2753.17 * License. When distributing the software, include this License Header
2753.18 * Notice in each file and include the License file at
2753.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2753.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2753.21 * particular file as subject to the "Classpath" exception as provided
2753.22 - * by Sun in the GPL Version 2 section of the License file that
2753.23 + * by Oracle in the GPL Version 2 section of the License file that
2753.24 * accompanied this code. If applicable, add the following below the
2753.25 * License Header, with the fields enclosed by brackets [] replaced by
2753.26 * your own identifying information:
2754.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutElementBase.java Fri Jul 16 11:47:36 2010 -0400
2754.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutElementBase.java Fri Jul 16 14:21:50 2010 -0400
2754.3 @@ -1,7 +1,10 @@
2754.4 /*
2754.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2754.6 *
2754.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2754.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2754.9 + *
2754.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2754.11 + * Other names may be trademarks of their respective owners.
2754.12 *
2754.13 * The contents of this file are subject to the terms of either the GNU
2754.14 * General Public License Version 2 only ("GPL") or the Common
2754.15 @@ -13,9 +16,9 @@
2754.16 * specific language governing permissions and limitations under the
2754.17 * License. When distributing the software, include this License Header
2754.18 * Notice in each file and include the License file at
2754.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2754.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2754.21 * particular file as subject to the "Classpath" exception as provided
2754.22 - * by Sun in the GPL Version 2 section of the License file that
2754.23 + * by Oracle in the GPL Version 2 section of the License file that
2754.24 * accompanied this code. If applicable, add the following below the
2754.25 * License Header, with the fields enclosed by brackets [] replaced by
2754.26 * your own identifying information:
2755.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutFacet.java Fri Jul 16 11:47:36 2010 -0400
2755.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutFacet.java Fri Jul 16 14:21:50 2010 -0400
2755.3 @@ -1,7 +1,10 @@
2755.4 /*
2755.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2755.6 *
2755.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2755.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2755.9 + *
2755.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2755.11 + * Other names may be trademarks of their respective owners.
2755.12 *
2755.13 * The contents of this file are subject to the terms of either the GNU
2755.14 * General Public License Version 2 only ("GPL") or the Common
2755.15 @@ -13,9 +16,9 @@
2755.16 * specific language governing permissions and limitations under the
2755.17 * License. When distributing the software, include this License Header
2755.18 * Notice in each file and include the License file at
2755.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2755.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2755.21 * particular file as subject to the "Classpath" exception as provided
2755.22 - * by Sun in the GPL Version 2 section of the License file that
2755.23 + * by Oracle in the GPL Version 2 section of the License file that
2755.24 * accompanied this code. If applicable, add the following below the
2755.25 * License Header, with the fields enclosed by brackets [] replaced by
2755.26 * your own identifying information:
2756.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutForEach.java Fri Jul 16 11:47:36 2010 -0400
2756.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutForEach.java Fri Jul 16 14:21:50 2010 -0400
2756.3 @@ -1,7 +1,10 @@
2756.4 /*
2756.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2756.6 *
2756.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2756.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2756.9 + *
2756.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2756.11 + * Other names may be trademarks of their respective owners.
2756.12 *
2756.13 * The contents of this file are subject to the terms of either the GNU
2756.14 * General Public License Version 2 only ("GPL") or the Common
2756.15 @@ -13,9 +16,9 @@
2756.16 * specific language governing permissions and limitations under the
2756.17 * License. When distributing the software, include this License Header
2756.18 * Notice in each file and include the License file at
2756.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2756.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2756.21 * particular file as subject to the "Classpath" exception as provided
2756.22 - * by Sun in the GPL Version 2 section of the License file that
2756.23 + * by Oracle in the GPL Version 2 section of the License file that
2756.24 * accompanied this code. If applicable, add the following below the
2756.25 * License Header, with the fields enclosed by brackets [] replaced by
2756.26 * your own identifying information:
2757.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutIf.java Fri Jul 16 11:47:36 2010 -0400
2757.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutIf.java Fri Jul 16 14:21:50 2010 -0400
2757.3 @@ -1,7 +1,10 @@
2757.4 /*
2757.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2757.6 *
2757.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2757.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2757.9 + *
2757.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2757.11 + * Other names may be trademarks of their respective owners.
2757.12 *
2757.13 * The contents of this file are subject to the terms of either the GNU
2757.14 * General Public License Version 2 only ("GPL") or the Common
2757.15 @@ -13,9 +16,9 @@
2757.16 * specific language governing permissions and limitations under the
2757.17 * License. When distributing the software, include this License Header
2757.18 * Notice in each file and include the License file at
2757.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2757.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2757.21 * particular file as subject to the "Classpath" exception as provided
2757.22 - * by Sun in the GPL Version 2 section of the License file that
2757.23 + * by Oracle in the GPL Version 2 section of the License file that
2757.24 * accompanied this code. If applicable, add the following below the
2757.25 * License Header, with the fields enclosed by brackets [] replaced by
2757.26 * your own identifying information:
2758.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutMarkup.java Fri Jul 16 11:47:36 2010 -0400
2758.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutMarkup.java Fri Jul 16 14:21:50 2010 -0400
2758.3 @@ -1,7 +1,10 @@
2758.4 /*
2758.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2758.6 *
2758.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2758.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2758.9 + *
2758.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2758.11 + * Other names may be trademarks of their respective owners.
2758.12 *
2758.13 * The contents of this file are subject to the terms of either the GNU
2758.14 * General Public License Version 2 only ("GPL") or the Common
2758.15 @@ -13,9 +16,9 @@
2758.16 * specific language governing permissions and limitations under the
2758.17 * License. When distributing the software, include this License Header
2758.18 * Notice in each file and include the License file at
2758.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2758.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2758.21 * particular file as subject to the "Classpath" exception as provided
2758.22 - * by Sun in the GPL Version 2 section of the License file that
2758.23 + * by Oracle in the GPL Version 2 section of the License file that
2758.24 * accompanied this code. If applicable, add the following below the
2758.25 * License Header, with the fields enclosed by brackets [] replaced by
2758.26 * your own identifying information:
2759.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutStaticText.java Fri Jul 16 11:47:36 2010 -0400
2759.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutStaticText.java Fri Jul 16 14:21:50 2010 -0400
2759.3 @@ -1,7 +1,10 @@
2759.4 /*
2759.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2759.6 *
2759.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2759.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2759.9 + *
2759.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2759.11 + * Other names may be trademarks of their respective owners.
2759.12 *
2759.13 * The contents of this file are subject to the terms of either the GNU
2759.14 * General Public License Version 2 only ("GPL") or the Common
2759.15 @@ -13,9 +16,9 @@
2759.16 * specific language governing permissions and limitations under the
2759.17 * License. When distributing the software, include this License Header
2759.18 * Notice in each file and include the License file at
2759.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2759.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2759.21 * particular file as subject to the "Classpath" exception as provided
2759.22 - * by Sun in the GPL Version 2 section of the License file that
2759.23 + * by Oracle in the GPL Version 2 section of the License file that
2759.24 * accompanied this code. If applicable, add the following below the
2759.25 * License Header, with the fields enclosed by brackets [] replaced by
2759.26 * your own identifying information:
2760.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutWhile.java Fri Jul 16 11:47:36 2010 -0400
2760.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/LayoutWhile.java Fri Jul 16 14:21:50 2010 -0400
2760.3 @@ -1,7 +1,10 @@
2760.4 /*
2760.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2760.6 *
2760.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2760.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2760.9 + *
2760.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2760.11 + * Other names may be trademarks of their respective owners.
2760.12 *
2760.13 * The contents of this file are subject to the terms of either the GNU
2760.14 * General Public License Version 2 only ("GPL") or the Common
2760.15 @@ -13,9 +16,9 @@
2760.16 * specific language governing permissions and limitations under the
2760.17 * License. When distributing the software, include this License Header
2760.18 * Notice in each file and include the License file at
2760.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2760.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2760.21 * particular file as subject to the "Classpath" exception as provided
2760.22 - * by Sun in the GPL Version 2 section of the License file that
2760.23 + * by Oracle in the GPL Version 2 section of the License file that
2760.24 * accompanied this code. If applicable, add the following below the
2760.25 * License Header, with the fields enclosed by brackets [] replaced by
2760.26 * your own identifying information:
2761.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/Resource.java Fri Jul 16 11:47:36 2010 -0400
2761.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/descriptors/Resource.java Fri Jul 16 14:21:50 2010 -0400
2761.3 @@ -1,7 +1,10 @@
2761.4 /*
2761.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2761.6 *
2761.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2761.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2761.9 + *
2761.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2761.11 + * Other names may be trademarks of their respective owners.
2761.12 *
2761.13 * The contents of this file are subject to the terms of either the GNU
2761.14 * General Public License Version 2 only ("GPL") or the Common
2761.15 @@ -13,9 +16,9 @@
2761.16 * specific language governing permissions and limitations under the
2761.17 * License. When distributing the software, include this License Header
2761.18 * Notice in each file and include the License file at
2761.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2761.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2761.21 * particular file as subject to the "Classpath" exception as provided
2761.22 - * by Sun in the GPL Version 2 section of the License file that
2761.23 + * by Oracle in the GPL Version 2 section of the License file that
2761.24 * accompanied this code. If applicable, add the following below the
2761.25 * License Header, with the fields enclosed by brackets [] replaced by
2761.26 * your own identifying information:
2762.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/AfterCreateEvent.java Fri Jul 16 11:47:36 2010 -0400
2762.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/AfterCreateEvent.java Fri Jul 16 14:21:50 2010 -0400
2762.3 @@ -1,7 +1,10 @@
2762.4 /*
2762.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2762.6 *
2762.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2762.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2762.9 + *
2762.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2762.11 + * Other names may be trademarks of their respective owners.
2762.12 *
2762.13 * The contents of this file are subject to the terms of either the GNU
2762.14 * General Public License Version 2 only ("GPL") or the Common
2762.15 @@ -13,9 +16,9 @@
2762.16 * specific language governing permissions and limitations under the
2762.17 * License. When distributing the software, include this License Header
2762.18 * Notice in each file and include the License file at
2762.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2762.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2762.21 * particular file as subject to the "Classpath" exception as provided
2762.22 - * by Sun in the GPL Version 2 section of the License file that
2762.23 + * by Oracle in the GPL Version 2 section of the License file that
2762.24 * accompanied this code. If applicable, add the following below the
2762.25 * License Header, with the fields enclosed by brackets [] replaced by
2762.26 * your own identifying information:
2763.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/AfterEncodeEvent.java Fri Jul 16 11:47:36 2010 -0400
2763.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/AfterEncodeEvent.java Fri Jul 16 14:21:50 2010 -0400
2763.3 @@ -1,7 +1,10 @@
2763.4 /*
2763.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2763.6 *
2763.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2763.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2763.9 + *
2763.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2763.11 + * Other names may be trademarks of their respective owners.
2763.12 *
2763.13 * The contents of this file are subject to the terms of either the GNU
2763.14 * General Public License Version 2 only ("GPL") or the Common
2763.15 @@ -13,9 +16,9 @@
2763.16 * specific language governing permissions and limitations under the
2763.17 * License. When distributing the software, include this License Header
2763.18 * Notice in each file and include the License file at
2763.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2763.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2763.21 * particular file as subject to the "Classpath" exception as provided
2763.22 - * by Sun in the GPL Version 2 section of the License file that
2763.23 + * by Oracle in the GPL Version 2 section of the License file that
2763.24 * accompanied this code. If applicable, add the following below the
2763.25 * License Header, with the fields enclosed by brackets [] replaced by
2763.26 * your own identifying information:
2764.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/AfterLoopEvent.java Fri Jul 16 11:47:36 2010 -0400
2764.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/AfterLoopEvent.java Fri Jul 16 14:21:50 2010 -0400
2764.3 @@ -1,7 +1,10 @@
2764.4 /*
2764.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2764.6 *
2764.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2764.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2764.9 + *
2764.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2764.11 + * Other names may be trademarks of their respective owners.
2764.12 *
2764.13 * The contents of this file are subject to the terms of either the GNU
2764.14 * General Public License Version 2 only ("GPL") or the Common
2764.15 @@ -13,9 +16,9 @@
2764.16 * specific language governing permissions and limitations under the
2764.17 * License. When distributing the software, include this License Header
2764.18 * Notice in each file and include the License file at
2764.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2764.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2764.21 * particular file as subject to the "Classpath" exception as provided
2764.22 - * by Sun in the GPL Version 2 section of the License file that
2764.23 + * by Oracle in the GPL Version 2 section of the License file that
2764.24 * accompanied this code. If applicable, add the following below the
2764.25 * License Header, with the fields enclosed by brackets [] replaced by
2764.26 * your own identifying information:
2765.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/BeforeCreateEvent.java Fri Jul 16 11:47:36 2010 -0400
2765.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/BeforeCreateEvent.java Fri Jul 16 14:21:50 2010 -0400
2765.3 @@ -1,7 +1,10 @@
2765.4 /*
2765.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2765.6 *
2765.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2765.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2765.9 + *
2765.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2765.11 + * Other names may be trademarks of their respective owners.
2765.12 *
2765.13 * The contents of this file are subject to the terms of either the GNU
2765.14 * General Public License Version 2 only ("GPL") or the Common
2765.15 @@ -13,9 +16,9 @@
2765.16 * specific language governing permissions and limitations under the
2765.17 * License. When distributing the software, include this License Header
2765.18 * Notice in each file and include the License file at
2765.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2765.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2765.21 * particular file as subject to the "Classpath" exception as provided
2765.22 - * by Sun in the GPL Version 2 section of the License file that
2765.23 + * by Oracle in the GPL Version 2 section of the License file that
2765.24 * accompanied this code. If applicable, add the following below the
2765.25 * License Header, with the fields enclosed by brackets [] replaced by
2765.26 * your own identifying information:
2766.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/BeforeEncodeEvent.java Fri Jul 16 11:47:36 2010 -0400
2766.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/BeforeEncodeEvent.java Fri Jul 16 14:21:50 2010 -0400
2766.3 @@ -1,7 +1,10 @@
2766.4 /*
2766.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2766.6 *
2766.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2766.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2766.9 + *
2766.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2766.11 + * Other names may be trademarks of their respective owners.
2766.12 *
2766.13 * The contents of this file are subject to the terms of either the GNU
2766.14 * General Public License Version 2 only ("GPL") or the Common
2766.15 @@ -13,9 +16,9 @@
2766.16 * specific language governing permissions and limitations under the
2766.17 * License. When distributing the software, include this License Header
2766.18 * Notice in each file and include the License file at
2766.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2766.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2766.21 * particular file as subject to the "Classpath" exception as provided
2766.22 - * by Sun in the GPL Version 2 section of the License file that
2766.23 + * by Oracle in the GPL Version 2 section of the License file that
2766.24 * accompanied this code. If applicable, add the following below the
2766.25 * License Header, with the fields enclosed by brackets [] replaced by
2766.26 * your own identifying information:
2767.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/BeforeLoopEvent.java Fri Jul 16 11:47:36 2010 -0400
2767.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/BeforeLoopEvent.java Fri Jul 16 14:21:50 2010 -0400
2767.3 @@ -1,7 +1,10 @@
2767.4 /*
2767.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2767.6 *
2767.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2767.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2767.9 + *
2767.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2767.11 + * Other names may be trademarks of their respective owners.
2767.12 *
2767.13 * The contents of this file are subject to the terms of either the GNU
2767.14 * General Public License Version 2 only ("GPL") or the Common
2767.15 @@ -13,9 +16,9 @@
2767.16 * specific language governing permissions and limitations under the
2767.17 * License. When distributing the software, include this License Header
2767.18 * Notice in each file and include the License file at
2767.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2767.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2767.21 * particular file as subject to the "Classpath" exception as provided
2767.22 - * by Sun in the GPL Version 2 section of the License file that
2767.23 + * by Oracle in the GPL Version 2 section of the License file that
2767.24 * accompanied this code. If applicable, add the following below the
2767.25 * License Header, with the fields enclosed by brackets [] replaced by
2767.26 * your own identifying information:
2768.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/CommandEvent.java Fri Jul 16 11:47:36 2010 -0400
2768.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/CommandEvent.java Fri Jul 16 14:21:50 2010 -0400
2768.3 @@ -1,7 +1,10 @@
2768.4 /*
2768.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2768.6 *
2768.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2768.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2768.9 + *
2768.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2768.11 + * Other names may be trademarks of their respective owners.
2768.12 *
2768.13 * The contents of this file are subject to the terms of either the GNU
2768.14 * General Public License Version 2 only ("GPL") or the Common
2768.15 @@ -13,9 +16,9 @@
2768.16 * specific language governing permissions and limitations under the
2768.17 * License. When distributing the software, include this License Header
2768.18 * Notice in each file and include the License file at
2768.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2768.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2768.21 * particular file as subject to the "Classpath" exception as provided
2768.22 - * by Sun in the GPL Version 2 section of the License file that
2768.23 + * by Oracle in the GPL Version 2 section of the License file that
2768.24 * accompanied this code. If applicable, add the following below the
2768.25 * License Header, with the fields enclosed by brackets [] replaced by
2768.26 * your own identifying information:
2769.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/DecodeEvent.java Fri Jul 16 11:47:36 2010 -0400
2769.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/DecodeEvent.java Fri Jul 16 14:21:50 2010 -0400
2769.3 @@ -1,7 +1,10 @@
2769.4 /*
2769.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2769.6 *
2769.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2769.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2769.9 + *
2769.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2769.11 + * Other names may be trademarks of their respective owners.
2769.12 *
2769.13 * The contents of this file are subject to the terms of either the GNU
2769.14 * General Public License Version 2 only ("GPL") or the Common
2769.15 @@ -13,9 +16,9 @@
2769.16 * specific language governing permissions and limitations under the
2769.17 * License. When distributing the software, include this License Header
2769.18 * Notice in each file and include the License file at
2769.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2769.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2769.21 * particular file as subject to the "Classpath" exception as provided
2769.22 - * by Sun in the GPL Version 2 section of the License file that
2769.23 + * by Oracle in the GPL Version 2 section of the License file that
2769.24 * accompanied this code. If applicable, add the following below the
2769.25 * License Header, with the fields enclosed by brackets [] replaced by
2769.26 * your own identifying information:
2770.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/EncodeEvent.java Fri Jul 16 11:47:36 2010 -0400
2770.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/EncodeEvent.java Fri Jul 16 14:21:50 2010 -0400
2770.3 @@ -1,7 +1,10 @@
2770.4 /*
2770.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2770.6 *
2770.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2770.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2770.9 + *
2770.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2770.11 + * Other names may be trademarks of their respective owners.
2770.12 *
2770.13 * The contents of this file are subject to the terms of either the GNU
2770.14 * General Public License Version 2 only ("GPL") or the Common
2770.15 @@ -13,9 +16,9 @@
2770.16 * specific language governing permissions and limitations under the
2770.17 * License. When distributing the software, include this License Header
2770.18 * Notice in each file and include the License file at
2770.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2770.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2770.21 * particular file as subject to the "Classpath" exception as provided
2770.22 - * by Sun in the GPL Version 2 section of the License file that
2770.23 + * by Oracle in the GPL Version 2 section of the License file that
2770.24 * accompanied this code. If applicable, add the following below the
2770.25 * License Header, with the fields enclosed by brackets [] replaced by
2770.26 * your own identifying information:
2771.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/EventObjectBase.java Fri Jul 16 11:47:36 2010 -0400
2771.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/EventObjectBase.java Fri Jul 16 14:21:50 2010 -0400
2771.3 @@ -1,7 +1,10 @@
2771.4 /*
2771.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2771.6 *
2771.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2771.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2771.9 + *
2771.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2771.11 + * Other names may be trademarks of their respective owners.
2771.12 *
2771.13 * The contents of this file are subject to the terms of either the GNU
2771.14 * General Public License Version 2 only ("GPL") or the Common
2771.15 @@ -13,9 +16,9 @@
2771.16 * specific language governing permissions and limitations under the
2771.17 * License. When distributing the software, include this License Header
2771.18 * Notice in each file and include the License file at
2771.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2771.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2771.21 * particular file as subject to the "Classpath" exception as provided
2771.22 - * by Sun in the GPL Version 2 section of the License file that
2771.23 + * by Oracle in the GPL Version 2 section of the License file that
2771.24 * accompanied this code. If applicable, add the following below the
2771.25 * License Header, with the fields enclosed by brackets [] replaced by
2771.26 * your own identifying information:
2772.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/Handler.java Fri Jul 16 11:47:36 2010 -0400
2772.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/Handler.java Fri Jul 16 14:21:50 2010 -0400
2772.3 @@ -1,7 +1,10 @@
2772.4 /*
2772.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2772.6 *
2772.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2772.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2772.9 + *
2772.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2772.11 + * Other names may be trademarks of their respective owners.
2772.12 *
2772.13 * The contents of this file are subject to the terms of either the GNU
2772.14 * General Public License Version 2 only ("GPL") or the Common
2772.15 @@ -13,9 +16,9 @@
2772.16 * specific language governing permissions and limitations under the
2772.17 * License. When distributing the software, include this License Header
2772.18 * Notice in each file and include the License file at
2772.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2772.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2772.21 * particular file as subject to the "Classpath" exception as provided
2772.22 - * by Sun in the GPL Version 2 section of the License file that
2772.23 + * by Oracle in the GPL Version 2 section of the License file that
2772.24 * accompanied this code. If applicable, add the following below the
2772.25 * License Header, with the fields enclosed by brackets [] replaced by
2772.26 * your own identifying information:
2773.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/HandlerContext.java Fri Jul 16 11:47:36 2010 -0400
2773.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/HandlerContext.java Fri Jul 16 14:21:50 2010 -0400
2773.3 @@ -1,7 +1,10 @@
2773.4 /*
2773.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2773.6 *
2773.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2773.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2773.9 + *
2773.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2773.11 + * Other names may be trademarks of their respective owners.
2773.12 *
2773.13 * The contents of this file are subject to the terms of either the GNU
2773.14 * General Public License Version 2 only ("GPL") or the Common
2773.15 @@ -13,9 +16,9 @@
2773.16 * specific language governing permissions and limitations under the
2773.17 * License. When distributing the software, include this License Header
2773.18 * Notice in each file and include the License file at
2773.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2773.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2773.21 * particular file as subject to the "Classpath" exception as provided
2773.22 - * by Sun in the GPL Version 2 section of the License file that
2773.23 + * by Oracle in the GPL Version 2 section of the License file that
2773.24 * accompanied this code. If applicable, add the following below the
2773.25 * License Header, with the fields enclosed by brackets [] replaced by
2773.26 * your own identifying information:
2774.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/HandlerContextImpl.java Fri Jul 16 11:47:36 2010 -0400
2774.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/HandlerContextImpl.java Fri Jul 16 14:21:50 2010 -0400
2774.3 @@ -1,7 +1,10 @@
2774.4 /*
2774.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2774.6 *
2774.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2774.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2774.9 + *
2774.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2774.11 + * Other names may be trademarks of their respective owners.
2774.12 *
2774.13 * The contents of this file are subject to the terms of either the GNU
2774.14 * General Public License Version 2 only ("GPL") or the Common
2774.15 @@ -13,9 +16,9 @@
2774.16 * specific language governing permissions and limitations under the
2774.17 * License. When distributing the software, include this License Header
2774.18 * Notice in each file and include the License file at
2774.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2774.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2774.21 * particular file as subject to the "Classpath" exception as provided
2774.22 - * by Sun in the GPL Version 2 section of the License file that
2774.23 + * by Oracle in the GPL Version 2 section of the License file that
2774.24 * accompanied this code. If applicable, add the following below the
2774.25 * License Header, with the fields enclosed by brackets [] replaced by
2774.26 * your own identifying information:
2775.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/HandlerDefinition.java Fri Jul 16 11:47:36 2010 -0400
2775.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/HandlerDefinition.java Fri Jul 16 14:21:50 2010 -0400
2775.3 @@ -1,7 +1,10 @@
2775.4 /*
2775.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2775.6 *
2775.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2775.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2775.9 + *
2775.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2775.11 + * Other names may be trademarks of their respective owners.
2775.12 *
2775.13 * The contents of this file are subject to the terms of either the GNU
2775.14 * General Public License Version 2 only ("GPL") or the Common
2775.15 @@ -13,9 +16,9 @@
2775.16 * specific language governing permissions and limitations under the
2775.17 * License. When distributing the software, include this License Header
2775.18 * Notice in each file and include the License file at
2775.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2775.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2775.21 * particular file as subject to the "Classpath" exception as provided
2775.22 - * by Sun in the GPL Version 2 section of the License file that
2775.23 + * by Oracle in the GPL Version 2 section of the License file that
2775.24 * accompanied this code. If applicable, add the following below the
2775.25 * License Header, with the fields enclosed by brackets [] replaced by
2775.26 * your own identifying information:
2776.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/IODescriptor.java Fri Jul 16 11:47:36 2010 -0400
2776.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/IODescriptor.java Fri Jul 16 14:21:50 2010 -0400
2776.3 @@ -1,7 +1,10 @@
2776.4 /*
2776.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2776.6 *
2776.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2776.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2776.9 + *
2776.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2776.11 + * Other names may be trademarks of their respective owners.
2776.12 *
2776.13 * The contents of this file are subject to the terms of either the GNU
2776.14 * General Public License Version 2 only ("GPL") or the Common
2776.15 @@ -13,9 +16,9 @@
2776.16 * specific language governing permissions and limitations under the
2776.17 * License. When distributing the software, include this License Header
2776.18 * Notice in each file and include the License file at
2776.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2776.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2776.21 * particular file as subject to the "Classpath" exception as provided
2776.22 - * by Sun in the GPL Version 2 section of the License file that
2776.23 + * by Oracle in the GPL Version 2 section of the License file that
2776.24 * accompanied this code. If applicable, add the following below the
2776.25 * License Header, with the fields enclosed by brackets [] replaced by
2776.26 * your own identifying information:
2777.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/OutputMapping.java Fri Jul 16 11:47:36 2010 -0400
2777.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/OutputMapping.java Fri Jul 16 14:21:50 2010 -0400
2777.3 @@ -1,7 +1,10 @@
2777.4 /*
2777.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2777.6 *
2777.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2777.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2777.9 + *
2777.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2777.11 + * Other names may be trademarks of their respective owners.
2777.12 *
2777.13 * The contents of this file are subject to the terms of either the GNU
2777.14 * General Public License Version 2 only ("GPL") or the Common
2777.15 @@ -13,9 +16,9 @@
2777.16 * specific language governing permissions and limitations under the
2777.17 * License. When distributing the software, include this License Header
2777.18 * Notice in each file and include the License file at
2777.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2777.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2777.21 * particular file as subject to the "Classpath" exception as provided
2777.22 - * by Sun in the GPL Version 2 section of the License file that
2777.23 + * by Oracle in the GPL Version 2 section of the License file that
2777.24 * accompanied this code. If applicable, add the following below the
2777.25 * License Header, with the fields enclosed by brackets [] replaced by
2777.26 * your own identifying information:
2778.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/OutputType.java Fri Jul 16 11:47:36 2010 -0400
2778.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/OutputType.java Fri Jul 16 14:21:50 2010 -0400
2778.3 @@ -1,7 +1,10 @@
2778.4 /*
2778.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2778.6 *
2778.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2778.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2778.9 + *
2778.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2778.11 + * Other names may be trademarks of their respective owners.
2778.12 *
2778.13 * The contents of this file are subject to the terms of either the GNU
2778.14 * General Public License Version 2 only ("GPL") or the Common
2778.15 @@ -13,9 +16,9 @@
2778.16 * specific language governing permissions and limitations under the
2778.17 * License. When distributing the software, include this License Header
2778.18 * Notice in each file and include the License file at
2778.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2778.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2778.21 * particular file as subject to the "Classpath" exception as provided
2778.22 - * by Sun in the GPL Version 2 section of the License file that
2778.23 + * by Oracle in the GPL Version 2 section of the License file that
2778.24 * accompanied this code. If applicable, add the following below the
2778.25 * License Header, with the fields enclosed by brackets [] replaced by
2778.26 * your own identifying information:
2779.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/OutputTypeManager.java Fri Jul 16 11:47:36 2010 -0400
2779.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/OutputTypeManager.java Fri Jul 16 14:21:50 2010 -0400
2779.3 @@ -1,7 +1,10 @@
2779.4 /*
2779.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2779.6 *
2779.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2779.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2779.9 + *
2779.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2779.11 + * Other names may be trademarks of their respective owners.
2779.12 *
2779.13 * The contents of this file are subject to the terms of either the GNU
2779.14 * General Public License Version 2 only ("GPL") or the Common
2779.15 @@ -13,9 +16,9 @@
2779.16 * specific language governing permissions and limitations under the
2779.17 * License. When distributing the software, include this License Header
2779.18 * Notice in each file and include the License file at
2779.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2779.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2779.21 * particular file as subject to the "Classpath" exception as provided
2779.22 - * by Sun in the GPL Version 2 section of the License file that
2779.23 + * by Oracle in the GPL Version 2 section of the License file that
2779.24 * accompanied this code. If applicable, add the following below the
2779.25 * License Header, with the fields enclosed by brackets [] replaced by
2779.26 * your own identifying information:
2780.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/RequestAttributeOutputType.java Fri Jul 16 11:47:36 2010 -0400
2780.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/RequestAttributeOutputType.java Fri Jul 16 14:21:50 2010 -0400
2780.3 @@ -1,7 +1,10 @@
2780.4 /*
2780.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2780.6 *
2780.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2780.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2780.9 + *
2780.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2780.11 + * Other names may be trademarks of their respective owners.
2780.12 *
2780.13 * The contents of this file are subject to the terms of either the GNU
2780.14 * General Public License Version 2 only ("GPL") or the Common
2780.15 @@ -13,9 +16,9 @@
2780.16 * specific language governing permissions and limitations under the
2780.17 * License. When distributing the software, include this License Header
2780.18 * Notice in each file and include the License file at
2780.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2780.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2780.21 * particular file as subject to the "Classpath" exception as provided
2780.22 - * by Sun in the GPL Version 2 section of the License file that
2780.23 + * by Oracle in the GPL Version 2 section of the License file that
2780.24 * accompanied this code. If applicable, add the following below the
2780.25 * License Header, with the fields enclosed by brackets [] replaced by
2780.26 * your own identifying information:
2781.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/SessionAttributeOutputType.java Fri Jul 16 11:47:36 2010 -0400
2781.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/SessionAttributeOutputType.java Fri Jul 16 14:21:50 2010 -0400
2781.3 @@ -1,7 +1,10 @@
2781.4 /*
2781.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2781.6 *
2781.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2781.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2781.9 + *
2781.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2781.11 + * Other names may be trademarks of their respective owners.
2781.12 *
2781.13 * The contents of this file are subject to the terms of either the GNU
2781.14 * General Public License Version 2 only ("GPL") or the Common
2781.15 @@ -13,9 +16,9 @@
2781.16 * specific language governing permissions and limitations under the
2781.17 * License. When distributing the software, include this License Header
2781.18 * Notice in each file and include the License file at
2781.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2781.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2781.21 * particular file as subject to the "Classpath" exception as provided
2781.22 - * by Sun in the GPL Version 2 section of the License file that
2781.23 + * by Oracle in the GPL Version 2 section of the License file that
2781.24 * accompanied this code. If applicable, add the following below the
2781.25 * License Header, with the fields enclosed by brackets [] replaced by
2781.26 * your own identifying information:
2782.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/UIComponentHolder.java Fri Jul 16 11:47:36 2010 -0400
2782.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/event/UIComponentHolder.java Fri Jul 16 14:21:50 2010 -0400
2782.3 @@ -1,7 +1,10 @@
2782.4 /*
2782.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2782.6 *
2782.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2782.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2782.9 + *
2782.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2782.11 + * Other names may be trademarks of their respective owners.
2782.12 *
2782.13 * The contents of this file are subject to the terms of either the GNU
2782.14 * General Public License Version 2 only ("GPL") or the Common
2782.15 @@ -13,9 +16,9 @@
2782.16 * specific language governing permissions and limitations under the
2782.17 * License. When distributing the software, include this License Header
2782.18 * Notice in each file and include the License file at
2782.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2782.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2782.21 * particular file as subject to the "Classpath" exception as provided
2782.22 - * by Sun in the GPL Version 2 section of the License file that
2782.23 + * by Oracle in the GPL Version 2 section of the License file that
2782.24 * accompanied this code. If applicable, add the following below the
2782.25 * License Header, with the fields enclosed by brackets [] replaced by
2782.26 * your own identifying information:
2783.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/AnchorFactory.java Fri Jul 16 11:47:36 2010 -0400
2783.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/AnchorFactory.java Fri Jul 16 14:21:50 2010 -0400
2783.3 @@ -1,7 +1,10 @@
2783.4 /*
2783.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2783.6 *
2783.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2783.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2783.9 + *
2783.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2783.11 + * Other names may be trademarks of their respective owners.
2783.12 *
2783.13 * The contents of this file are subject to the terms of either the GNU
2783.14 * General Public License Version 2 only ("GPL") or the Common
2783.15 @@ -13,9 +16,9 @@
2783.16 * specific language governing permissions and limitations under the
2783.17 * License. When distributing the software, include this License Header
2783.18 * Notice in each file and include the License file at
2783.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2783.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2783.21 * particular file as subject to the "Classpath" exception as provided
2783.22 - * by Sun in the GPL Version 2 section of the License file that
2783.23 + * by Oracle in the GPL Version 2 section of the License file that
2783.24 * accompanied this code. If applicable, add the following below the
2783.25 * License Header, with the fields enclosed by brackets [] replaced by
2783.26 * your own identifying information:
2784.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ButtonFactory.java Fri Jul 16 11:47:36 2010 -0400
2784.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ButtonFactory.java Fri Jul 16 14:21:50 2010 -0400
2784.3 @@ -1,7 +1,10 @@
2784.4 /*
2784.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2784.6 *
2784.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2784.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2784.9 + *
2784.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2784.11 + * Other names may be trademarks of their respective owners.
2784.12 *
2784.13 * The contents of this file are subject to the terms of either the GNU
2784.14 * General Public License Version 2 only ("GPL") or the Common
2784.15 @@ -13,9 +16,9 @@
2784.16 * specific language governing permissions and limitations under the
2784.17 * License. When distributing the software, include this License Header
2784.18 * Notice in each file and include the License file at
2784.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2784.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2784.21 * particular file as subject to the "Classpath" exception as provided
2784.22 - * by Sun in the GPL Version 2 section of the License file that
2784.23 + * by Oracle in the GPL Version 2 section of the License file that
2784.24 * accompanied this code. If applicable, add the following below the
2784.25 * License Header, with the fields enclosed by brackets [] replaced by
2784.26 * your own identifying information:
2785.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ComponentFactory.java Fri Jul 16 11:47:36 2010 -0400
2785.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ComponentFactory.java Fri Jul 16 14:21:50 2010 -0400
2785.3 @@ -1,7 +1,10 @@
2785.4 /*
2785.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2785.6 *
2785.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2785.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2785.9 + *
2785.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2785.11 + * Other names may be trademarks of their respective owners.
2785.12 *
2785.13 * The contents of this file are subject to the terms of either the GNU
2785.14 * General Public License Version 2 only ("GPL") or the Common
2785.15 @@ -13,9 +16,9 @@
2785.16 * specific language governing permissions and limitations under the
2785.17 * License. When distributing the software, include this License Header
2785.18 * Notice in each file and include the License file at
2785.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2785.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2785.21 * particular file as subject to the "Classpath" exception as provided
2785.22 - * by Sun in the GPL Version 2 section of the License file that
2785.23 + * by Oracle in the GPL Version 2 section of the License file that
2785.24 * accompanied this code. If applicable, add the following below the
2785.25 * License Header, with the fields enclosed by brackets [] replaced by
2785.26 * your own identifying information:
2786.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ComponentFactoryBase.java Fri Jul 16 11:47:36 2010 -0400
2786.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ComponentFactoryBase.java Fri Jul 16 14:21:50 2010 -0400
2786.3 @@ -1,7 +1,10 @@
2786.4 /*
2786.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2786.6 *
2786.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2786.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2786.9 + *
2786.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2786.11 + * Other names may be trademarks of their respective owners.
2786.12 *
2786.13 * The contents of this file are subject to the terms of either the GNU
2786.14 * General Public License Version 2 only ("GPL") or the Common
2786.15 @@ -13,9 +16,9 @@
2786.16 * specific language governing permissions and limitations under the
2786.17 * License. When distributing the software, include this License Header
2786.18 * Notice in each file and include the License file at
2786.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2786.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2786.21 * particular file as subject to the "Classpath" exception as provided
2786.22 - * by Sun in the GPL Version 2 section of the License file that
2786.23 + * by Oracle in the GPL Version 2 section of the License file that
2786.24 * accompanied this code. If applicable, add the following below the
2786.25 * License Header, with the fields enclosed by brackets [] replaced by
2786.26 * your own identifying information:
2787.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/FieldFactory.java Fri Jul 16 11:47:36 2010 -0400
2787.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/FieldFactory.java Fri Jul 16 14:21:50 2010 -0400
2787.3 @@ -1,7 +1,10 @@
2787.4 /*
2787.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2787.6 *
2787.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2787.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2787.9 + *
2787.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2787.11 + * Other names may be trademarks of their respective owners.
2787.12 *
2787.13 * The contents of this file are subject to the terms of either the GNU
2787.14 * General Public License Version 2 only ("GPL") or the Common
2787.15 @@ -13,9 +16,9 @@
2787.16 * specific language governing permissions and limitations under the
2787.17 * License. When distributing the software, include this License Header
2787.18 * Notice in each file and include the License file at
2787.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2787.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2787.21 * particular file as subject to the "Classpath" exception as provided
2787.22 - * by Sun in the GPL Version 2 section of the License file that
2787.23 + * by Oracle in the GPL Version 2 section of the License file that
2787.24 * accompanied this code. If applicable, add the following below the
2787.25 * License Header, with the fields enclosed by brackets [] replaced by
2787.26 * your own identifying information:
2788.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/HelpInlineFactory.java Fri Jul 16 11:47:36 2010 -0400
2788.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/HelpInlineFactory.java Fri Jul 16 14:21:50 2010 -0400
2788.3 @@ -1,7 +1,10 @@
2788.4 /*
2788.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2788.6 *
2788.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2788.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2788.9 + *
2788.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2788.11 + * Other names may be trademarks of their respective owners.
2788.12 *
2788.13 * The contents of this file are subject to the terms of either the GNU
2788.14 * General Public License Version 2 only ("GPL") or the Common
2788.15 @@ -13,9 +16,9 @@
2788.16 * specific language governing permissions and limitations under the
2788.17 * License. When distributing the software, include this License Header
2788.18 * Notice in each file and include the License file at
2788.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2788.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2788.21 * particular file as subject to the "Classpath" exception as provided
2788.22 - * by Sun in the GPL Version 2 section of the License file that
2788.23 + * by Oracle in the GPL Version 2 section of the License file that
2788.24 * accompanied this code. If applicable, add the following below the
2788.25 * License Header, with the fields enclosed by brackets [] replaced by
2788.26 * your own identifying information:
2789.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/HyperlinkFactory.java Fri Jul 16 11:47:36 2010 -0400
2789.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/HyperlinkFactory.java Fri Jul 16 14:21:50 2010 -0400
2789.3 @@ -1,7 +1,10 @@
2789.4 /*
2789.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2789.6 *
2789.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2789.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2789.9 + *
2789.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2789.11 + * Other names may be trademarks of their respective owners.
2789.12 *
2789.13 * The contents of this file are subject to the terms of either the GNU
2789.14 * General Public License Version 2 only ("GPL") or the Common
2789.15 @@ -13,9 +16,9 @@
2789.16 * specific language governing permissions and limitations under the
2789.17 * License. When distributing the software, include this License Header
2789.18 * Notice in each file and include the License file at
2789.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2789.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2789.21 * particular file as subject to the "Classpath" exception as provided
2789.22 - * by Sun in the GPL Version 2 section of the License file that
2789.23 + * by Oracle in the GPL Version 2 section of the License file that
2789.24 * accompanied this code. If applicable, add the following below the
2789.25 * License Header, with the fields enclosed by brackets [] replaced by
2789.26 * your own identifying information:
2790.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/IconFactory.java Fri Jul 16 11:47:36 2010 -0400
2790.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/IconFactory.java Fri Jul 16 14:21:50 2010 -0400
2790.3 @@ -1,7 +1,10 @@
2790.4 /*
2790.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2790.6 *
2790.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2790.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2790.9 + *
2790.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2790.11 + * Other names may be trademarks of their respective owners.
2790.12 *
2790.13 * The contents of this file are subject to the terms of either the GNU
2790.14 * General Public License Version 2 only ("GPL") or the Common
2790.15 @@ -13,9 +16,9 @@
2790.16 * specific language governing permissions and limitations under the
2790.17 * License. When distributing the software, include this License Header
2790.18 * Notice in each file and include the License file at
2790.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2790.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2790.21 * particular file as subject to the "Classpath" exception as provided
2790.22 - * by Sun in the GPL Version 2 section of the License file that
2790.23 + * by Oracle in the GPL Version 2 section of the License file that
2790.24 * accompanied this code. If applicable, add the following below the
2790.25 * License Header, with the fields enclosed by brackets [] replaced by
2790.26 * your own identifying information:
2791.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/IconHyperlinkFactory.java Fri Jul 16 11:47:36 2010 -0400
2791.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/IconHyperlinkFactory.java Fri Jul 16 14:21:50 2010 -0400
2791.3 @@ -1,7 +1,10 @@
2791.4 /*
2791.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2791.6 *
2791.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2791.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2791.9 + *
2791.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2791.11 + * Other names may be trademarks of their respective owners.
2791.12 *
2791.13 * The contents of this file are subject to the terms of either the GNU
2791.14 * General Public License Version 2 only ("GPL") or the Common
2791.15 @@ -13,9 +16,9 @@
2791.16 * specific language governing permissions and limitations under the
2791.17 * License. When distributing the software, include this License Header
2791.18 * Notice in each file and include the License file at
2791.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2791.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2791.21 * particular file as subject to the "Classpath" exception as provided
2791.22 - * by Sun in the GPL Version 2 section of the License file that
2791.23 + * by Oracle in the GPL Version 2 section of the License file that
2791.24 * accompanied this code. If applicable, add the following below the
2791.25 * License Header, with the fields enclosed by brackets [] replaced by
2791.26 * your own identifying information:
2792.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ImageComponentFactory.java Fri Jul 16 11:47:36 2010 -0400
2792.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ImageComponentFactory.java Fri Jul 16 14:21:50 2010 -0400
2792.3 @@ -1,7 +1,10 @@
2792.4 /*
2792.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2792.6 *
2792.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2792.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2792.9 + *
2792.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2792.11 + * Other names may be trademarks of their respective owners.
2792.12 *
2792.13 * The contents of this file are subject to the terms of either the GNU
2792.14 * General Public License Version 2 only ("GPL") or the Common
2792.15 @@ -13,9 +16,9 @@
2792.16 * specific language governing permissions and limitations under the
2792.17 * License. When distributing the software, include this License Header
2792.18 * Notice in each file and include the License file at
2792.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2792.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2792.21 * particular file as subject to the "Classpath" exception as provided
2792.22 - * by Sun in the GPL Version 2 section of the License file that
2792.23 + * by Oracle in the GPL Version 2 section of the License file that
2792.24 * accompanied this code. If applicable, add the following below the
2792.25 * License Header, with the fields enclosed by brackets [] replaced by
2792.26 * your own identifying information:
2793.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ImageHyperlinkFactory.java Fri Jul 16 11:47:36 2010 -0400
2793.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/ImageHyperlinkFactory.java Fri Jul 16 14:21:50 2010 -0400
2793.3 @@ -1,7 +1,10 @@
2793.4 /*
2793.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2793.6 *
2793.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2793.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2793.9 + *
2793.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2793.11 + * Other names may be trademarks of their respective owners.
2793.12 *
2793.13 * The contents of this file are subject to the terms of either the GNU
2793.14 * General Public License Version 2 only ("GPL") or the Common
2793.15 @@ -13,9 +16,9 @@
2793.16 * specific language governing permissions and limitations under the
2793.17 * License. When distributing the software, include this License Header
2793.18 * Notice in each file and include the License file at
2793.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2793.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2793.21 * particular file as subject to the "Classpath" exception as provided
2793.22 - * by Sun in the GPL Version 2 section of the License file that
2793.23 + * by Oracle in the GPL Version 2 section of the License file that
2793.24 * accompanied this code. If applicable, add the following below the
2793.25 * License Header, with the fields enclosed by brackets [] replaced by
2793.26 * your own identifying information:
2794.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/LabelFactory.java Fri Jul 16 11:47:36 2010 -0400
2794.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/LabelFactory.java Fri Jul 16 14:21:50 2010 -0400
2794.3 @@ -1,7 +1,10 @@
2794.4 /*
2794.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2794.6 *
2794.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2794.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2794.9 + *
2794.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2794.11 + * Other names may be trademarks of their respective owners.
2794.12 *
2794.13 * The contents of this file are subject to the terms of either the GNU
2794.14 * General Public License Version 2 only ("GPL") or the Common
2794.15 @@ -13,9 +16,9 @@
2794.16 * specific language governing permissions and limitations under the
2794.17 * License. When distributing the software, include this License Header
2794.18 * Notice in each file and include the License file at
2794.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2794.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2794.21 * particular file as subject to the "Classpath" exception as provided
2794.22 - * by Sun in the GPL Version 2 section of the License file that
2794.23 + * by Oracle in the GPL Version 2 section of the License file that
2794.24 * accompanied this code. If applicable, add the following below the
2794.25 * License Header, with the fields enclosed by brackets [] replaced by
2794.26 * your own identifying information:
2795.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/LegendFactory.java Fri Jul 16 11:47:36 2010 -0400
2795.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/LegendFactory.java Fri Jul 16 14:21:50 2010 -0400
2795.3 @@ -1,7 +1,10 @@
2795.4 /*
2795.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2795.6 *
2795.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2795.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2795.9 + *
2795.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2795.11 + * Other names may be trademarks of their respective owners.
2795.12 *
2795.13 * The contents of this file are subject to the terms of either the GNU
2795.14 * General Public License Version 2 only ("GPL") or the Common
2795.15 @@ -13,9 +16,9 @@
2795.16 * specific language governing permissions and limitations under the
2795.17 * License. When distributing the software, include this License Header
2795.18 * Notice in each file and include the License file at
2795.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2795.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2795.21 * particular file as subject to the "Classpath" exception as provided
2795.22 - * by Sun in the GPL Version 2 section of the License file that
2795.23 + * by Oracle in the GPL Version 2 section of the License file that
2795.24 * accompanied this code. If applicable, add the following below the
2795.25 * License Header, with the fields enclosed by brackets [] replaced by
2795.26 * your own identifying information:
2796.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/LocalizedStringFactory.java Fri Jul 16 11:47:36 2010 -0400
2796.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/LocalizedStringFactory.java Fri Jul 16 14:21:50 2010 -0400
2796.3 @@ -1,7 +1,10 @@
2796.4 /*
2796.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2796.6 *
2796.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2796.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2796.9 + *
2796.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2796.11 + * Other names may be trademarks of their respective owners.
2796.12 *
2796.13 * The contents of this file are subject to the terms of either the GNU
2796.14 * General Public License Version 2 only ("GPL") or the Common
2796.15 @@ -13,9 +16,9 @@
2796.16 * specific language governing permissions and limitations under the
2796.17 * License. When distributing the software, include this License Header
2796.18 * Notice in each file and include the License file at
2796.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2796.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2796.21 * particular file as subject to the "Classpath" exception as provided
2796.22 - * by Sun in the GPL Version 2 section of the License file that
2796.23 + * by Oracle in the GPL Version 2 section of the License file that
2796.24 * accompanied this code. If applicable, add the following below the
2796.25 * License Header, with the fields enclosed by brackets [] replaced by
2796.26 * your own identifying information:
2797.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/StaticTextFactory.java Fri Jul 16 11:47:36 2010 -0400
2797.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/factories/StaticTextFactory.java Fri Jul 16 14:21:50 2010 -0400
2797.3 @@ -1,7 +1,10 @@
2797.4 /*
2797.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2797.6 *
2797.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2797.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2797.9 + *
2797.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2797.11 + * Other names may be trademarks of their respective owners.
2797.12 *
2797.13 * The contents of this file are subject to the terms of either the GNU
2797.14 * General Public License Version 2 only ("GPL") or the Common
2797.15 @@ -13,9 +16,9 @@
2797.16 * specific language governing permissions and limitations under the
2797.17 * License. When distributing the software, include this License Header
2797.18 * Notice in each file and include the License file at
2797.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2797.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2797.21 * particular file as subject to the "Classpath" exception as provided
2797.22 - * by Sun in the GPL Version 2 section of the License file that
2797.23 + * by Oracle in the GPL Version 2 section of the License file that
2797.24 * accompanied this code. If applicable, add the following below the
2797.25 * License Header, with the fields enclosed by brackets [] replaced by
2797.26 * your own identifying information:
2798.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/handlers/ComponentHandlers.java Fri Jul 16 11:47:36 2010 -0400
2798.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/handlers/ComponentHandlers.java Fri Jul 16 14:21:50 2010 -0400
2798.3 @@ -1,7 +1,10 @@
2798.4 /*
2798.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2798.6 *
2798.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2798.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2798.9 + *
2798.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2798.11 + * Other names may be trademarks of their respective owners.
2798.12 *
2798.13 * The contents of this file are subject to the terms of either the GNU
2798.14 * General Public License Version 2 only ("GPL") or the Common
2798.15 @@ -13,9 +16,9 @@
2798.16 * specific language governing permissions and limitations under the
2798.17 * License. When distributing the software, include this License Header
2798.18 * Notice in each file and include the License file at
2798.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2798.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2798.21 * particular file as subject to the "Classpath" exception as provided
2798.22 - * by Sun in the GPL Version 2 section of the License file that
2798.23 + * by Oracle in the GPL Version 2 section of the License file that
2798.24 * accompanied this code. If applicable, add the following below the
2798.25 * License Header, with the fields enclosed by brackets [] replaced by
2798.26 * your own identifying information:
2799.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/handlers/PropertySheetHandlers.java Fri Jul 16 11:47:36 2010 -0400
2799.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/handlers/PropertySheetHandlers.java Fri Jul 16 14:21:50 2010 -0400
2799.3 @@ -1,7 +1,10 @@
2799.4 /*
2799.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2799.6 *
2799.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2799.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2799.9 + *
2799.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2799.11 + * Other names may be trademarks of their respective owners.
2799.12 *
2799.13 * The contents of this file are subject to the terms of either the GNU
2799.14 * General Public License Version 2 only ("GPL") or the Common
2799.15 @@ -13,9 +16,9 @@
2799.16 * specific language governing permissions and limitations under the
2799.17 * License. When distributing the software, include this License Header
2799.18 * Notice in each file and include the License file at
2799.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2799.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2799.21 * particular file as subject to the "Classpath" exception as provided
2799.22 - * by Sun in the GPL Version 2 section of the License file that
2799.23 + * by Oracle in the GPL Version 2 section of the License file that
2799.24 * accompanied this code. If applicable, add the following below the
2799.25 * License Header, with the fields enclosed by brackets [] replaced by
2799.26 * your own identifying information:
2800.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/handlers/TreeHandlers.java Fri Jul 16 11:47:36 2010 -0400
2800.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/handlers/TreeHandlers.java Fri Jul 16 14:21:50 2010 -0400
2800.3 @@ -1,7 +1,10 @@
2800.4 /*
2800.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2800.6 *
2800.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2800.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2800.9 + *
2800.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2800.11 + * Other names may be trademarks of their respective owners.
2800.12 *
2800.13 * The contents of this file are subject to the terms of either the GNU
2800.14 * General Public License Version 2 only ("GPL") or the Common
2800.15 @@ -13,9 +16,9 @@
2800.16 * specific language governing permissions and limitations under the
2800.17 * License. When distributing the software, include this License Header
2800.18 * Notice in each file and include the License file at
2800.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2800.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2800.21 * particular file as subject to the "Classpath" exception as provided
2800.22 - * by Sun in the GPL Version 2 section of the License file that
2800.23 + * by Oracle in the GPL Version 2 section of the License file that
2800.24 * accompanied this code. If applicable, add the following below the
2800.25 * License Header, with the fields enclosed by brackets [] replaced by
2800.26 * your own identifying information:
2801.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/handlers/UtilHandlers.java Fri Jul 16 11:47:36 2010 -0400
2801.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/component/util/handlers/UtilHandlers.java Fri Jul 16 14:21:50 2010 -0400
2801.3 @@ -1,7 +1,10 @@
2801.4 /*
2801.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2801.6 *
2801.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2801.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2801.9 + *
2801.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2801.11 + * Other names may be trademarks of their respective owners.
2801.12 *
2801.13 * The contents of this file are subject to the terms of either the GNU
2801.14 * General Public License Version 2 only ("GPL") or the Common
2801.15 @@ -13,9 +16,9 @@
2801.16 * specific language governing permissions and limitations under the
2801.17 * License. When distributing the software, include this License Header
2801.18 * Notice in each file and include the License file at
2801.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2801.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2801.21 * particular file as subject to the "Classpath" exception as provided
2801.22 - * by Sun in the GPL Version 2 section of the License file that
2801.23 + * by Oracle in the GPL Version 2 section of the License file that
2801.24 * accompanied this code. If applicable, add the following below the
2801.25 * License Header, with the fields enclosed by brackets [] replaced by
2801.26 * your own identifying information:
2802.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/converter/DateConverter.java Fri Jul 16 11:47:36 2010 -0400
2802.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/converter/DateConverter.java Fri Jul 16 14:21:50 2010 -0400
2802.3 @@ -1,7 +1,10 @@
2802.4 /*
2802.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2802.6 *
2802.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2802.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2802.9 + *
2802.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2802.11 + * Other names may be trademarks of their respective owners.
2802.12 *
2802.13 * The contents of this file are subject to the terms of either the GNU
2802.14 * General Public License Version 2 only ("GPL") or the Common
2802.15 @@ -13,9 +16,9 @@
2802.16 * specific language governing permissions and limitations under the
2802.17 * License. When distributing the software, include this License Header
2802.18 * Notice in each file and include the License file at
2802.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2802.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2802.21 * particular file as subject to the "Classpath" exception as provided
2802.22 - * by Sun in the GPL Version 2 section of the License file that
2802.23 + * by Oracle in the GPL Version 2 section of the License file that
2802.24 * accompanied this code. If applicable, add the following below the
2802.25 * License Header, with the fields enclosed by brackets [] replaced by
2802.26 * your own identifying information:
2803.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/el/ConstantMethodBinding.java Fri Jul 16 11:47:36 2010 -0400
2803.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/el/ConstantMethodBinding.java Fri Jul 16 14:21:50 2010 -0400
2803.3 @@ -1,7 +1,10 @@
2803.4 /*
2803.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2803.6 *
2803.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2803.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2803.9 + *
2803.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2803.11 + * Other names may be trademarks of their respective owners.
2803.12 *
2803.13 * The contents of this file are subject to the terms of either the GNU
2803.14 * General Public License Version 2 only ("GPL") or the Common
2803.15 @@ -13,9 +16,9 @@
2803.16 * specific language governing permissions and limitations under the
2803.17 * License. When distributing the software, include this License Header
2803.18 * Notice in each file and include the License file at
2803.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2803.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2803.21 * particular file as subject to the "Classpath" exception as provided
2803.22 - * by Sun in the GPL Version 2 section of the License file that
2803.23 + * by Oracle in the GPL Version 2 section of the License file that
2803.24 * accompanied this code. If applicable, add the following below the
2803.25 * License Header, with the fields enclosed by brackets [] replaced by
2803.26 * your own identifying information:
2804.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/el/DropDownMethodBinding.java Fri Jul 16 11:47:36 2010 -0400
2804.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/el/DropDownMethodBinding.java Fri Jul 16 14:21:50 2010 -0400
2804.3 @@ -1,7 +1,10 @@
2804.4 /*
2804.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2804.6 *
2804.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2804.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2804.9 + *
2804.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2804.11 + * Other names may be trademarks of their respective owners.
2804.12 *
2804.13 * The contents of this file are subject to the terms of either the GNU
2804.14 * General Public License Version 2 only ("GPL") or the Common
2804.15 @@ -13,9 +16,9 @@
2804.16 * specific language governing permissions and limitations under the
2804.17 * License. When distributing the software, include this License Header
2804.18 * Notice in each file and include the License file at
2804.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2804.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2804.21 * particular file as subject to the "Classpath" exception as provided
2804.22 - * by Sun in the GPL Version 2 section of the License file that
2804.23 + * by Oracle in the GPL Version 2 section of the License file that
2804.24 * accompanied this code. If applicable, add the following below the
2804.25 * License Header, with the fields enclosed by brackets [] replaced by
2804.26 * your own identifying information:
2805.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/event/TabActionListener.java Fri Jul 16 11:47:36 2010 -0400
2805.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/event/TabActionListener.java Fri Jul 16 14:21:50 2010 -0400
2805.3 @@ -1,7 +1,10 @@
2805.4 /*
2805.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2805.6 *
2805.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2805.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2805.9 + *
2805.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2805.11 + * Other names may be trademarks of their respective owners.
2805.12 *
2805.13 * The contents of this file are subject to the terms of either the GNU
2805.14 * General Public License Version 2 only ("GPL") or the Common
2805.15 @@ -13,9 +16,9 @@
2805.16 * specific language governing permissions and limitations under the
2805.17 * License. When distributing the software, include this License Header
2805.18 * Notice in each file and include the License file at
2805.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2805.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2805.21 * particular file as subject to the "Classpath" exception as provided
2805.22 - * by Sun in the GPL Version 2 section of the License file that
2805.23 + * by Oracle in the GPL Version 2 section of the License file that
2805.24 * accompanied this code. If applicable, add the following below the
2805.25 * License Header, with the fields enclosed by brackets [] replaced by
2805.26 * your own identifying information:
2806.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/event/TablePaginationActionListener.java Fri Jul 16 11:47:36 2010 -0400
2806.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/event/TablePaginationActionListener.java Fri Jul 16 14:21:50 2010 -0400
2806.3 @@ -1,7 +1,10 @@
2806.4 /*
2806.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2806.6 *
2806.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2806.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2806.9 + *
2806.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2806.11 + * Other names may be trademarks of their respective owners.
2806.12 *
2806.13 * The contents of this file are subject to the terms of either the GNU
2806.14 * General Public License Version 2 only ("GPL") or the Common
2806.15 @@ -13,9 +16,9 @@
2806.16 * specific language governing permissions and limitations under the
2806.17 * License. When distributing the software, include this License Header
2806.18 * Notice in each file and include the License file at
2806.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2806.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2806.21 * particular file as subject to the "Classpath" exception as provided
2806.22 - * by Sun in the GPL Version 2 section of the License file that
2806.23 + * by Oracle in the GPL Version 2 section of the License file that
2806.24 * accompanied this code. If applicable, add the following below the
2806.25 * License Header, with the fields enclosed by brackets [] replaced by
2806.26 * your own identifying information:
2807.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/event/TableSelectPhaseListener.java Fri Jul 16 11:47:36 2010 -0400
2807.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/event/TableSelectPhaseListener.java Fri Jul 16 14:21:50 2010 -0400
2807.3 @@ -1,7 +1,10 @@
2807.4 /*
2807.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2807.6 *
2807.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2807.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2807.9 + *
2807.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2807.11 + * Other names may be trademarks of their respective owners.
2807.12 *
2807.13 * The contents of this file are subject to the terms of either the GNU
2807.14 * General Public License Version 2 only ("GPL") or the Common
2807.15 @@ -13,9 +16,9 @@
2807.16 * specific language governing permissions and limitations under the
2807.17 * License. When distributing the software, include this License Header
2807.18 * Notice in each file and include the License file at
2807.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2807.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2807.21 * particular file as subject to the "Classpath" exception as provided
2807.22 - * by Sun in the GPL Version 2 section of the License file that
2807.23 + * by Oracle in the GPL Version 2 section of the License file that
2807.24 * accompanied this code. If applicable, add the following below the
2807.25 * License Header, with the fields enclosed by brackets [] replaced by
2807.26 * your own identifying information:
2808.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/event/TableSortActionListener.java Fri Jul 16 11:47:36 2010 -0400
2808.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/event/TableSortActionListener.java Fri Jul 16 14:21:50 2010 -0400
2808.3 @@ -1,7 +1,10 @@
2808.4 /*
2808.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2808.6 *
2808.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2808.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2808.9 + *
2808.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2808.11 + * Other names may be trademarks of their respective owners.
2808.12 *
2808.13 * The contents of this file are subject to the terms of either the GNU
2808.14 * General Public License Version 2 only ("GPL") or the Common
2808.15 @@ -13,9 +16,9 @@
2808.16 * specific language governing permissions and limitations under the
2808.17 * License. When distributing the software, include this License Header
2808.18 * Notice in each file and include the License file at
2808.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2808.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2808.21 * particular file as subject to the "Classpath" exception as provided
2808.22 - * by Sun in the GPL Version 2 section of the License file that
2808.23 + * by Oracle in the GPL Version 2 section of the License file that
2808.24 * accompanied this code. If applicable, add the following below the
2808.25 * License Header, with the fields enclosed by brackets [] replaced by
2808.26 * your own identifying information:
2809.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/faces/DataProviderPropertyResolver.java Fri Jul 16 11:47:36 2010 -0400
2809.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/faces/DataProviderPropertyResolver.java Fri Jul 16 14:21:50 2010 -0400
2809.3 @@ -1,7 +1,10 @@
2809.4 /*
2809.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2809.6 *
2809.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2809.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2809.9 + *
2809.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2809.11 + * Other names may be trademarks of their respective owners.
2809.12 *
2809.13 * The contents of this file are subject to the terms of either the GNU
2809.14 * General Public License Version 2 only ("GPL") or the Common
2809.15 @@ -13,9 +16,9 @@
2809.16 * specific language governing permissions and limitations under the
2809.17 * License. When distributing the software, include this License Header
2809.18 * Notice in each file and include the License file at
2809.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2809.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2809.21 * particular file as subject to the "Classpath" exception as provided
2809.22 - * by Sun in the GPL Version 2 section of the License file that
2809.23 + * by Oracle in the GPL Version 2 section of the License file that
2809.24 * accompanied this code. If applicable, add the following below the
2809.25 * License Header, with the fields enclosed by brackets [] replaced by
2809.26 * your own identifying information:
2810.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ResultSetPropertyResolver.java Fri Jul 16 11:47:36 2010 -0400
2810.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ResultSetPropertyResolver.java Fri Jul 16 14:21:50 2010 -0400
2810.3 @@ -1,7 +1,10 @@
2810.4 /*
2810.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2810.6 *
2810.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2810.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2810.9 + *
2810.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2810.11 + * Other names may be trademarks of their respective owners.
2810.12 *
2810.13 * The contents of this file are subject to the terms of either the GNU
2810.14 * General Public License Version 2 only ("GPL") or the Common
2810.15 @@ -13,9 +16,9 @@
2810.16 * specific language governing permissions and limitations under the
2810.17 * License. When distributing the software, include this License Header
2810.18 * Notice in each file and include the License file at
2810.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2810.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2810.21 * particular file as subject to the "Classpath" exception as provided
2810.22 - * by Sun in the GPL Version 2 section of the License file that
2810.23 + * by Oracle in the GPL Version 2 section of the License file that
2810.24 * accompanied this code. If applicable, add the following below the
2810.25 * License Header, with the fields enclosed by brackets [] replaced by
2810.26 * your own identifying information:
2811.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/faces/TableDataProviderDataModel.java Fri Jul 16 11:47:36 2010 -0400
2811.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/faces/TableDataProviderDataModel.java Fri Jul 16 14:21:50 2010 -0400
2811.3 @@ -1,7 +1,10 @@
2811.4 /*
2811.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2811.6 *
2811.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2811.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2811.9 + *
2811.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2811.11 + * Other names may be trademarks of their respective owners.
2811.12 *
2811.13 * The contents of this file are subject to the terms of either the GNU
2811.14 * General Public License Version 2 only ("GPL") or the Common
2811.15 @@ -13,9 +16,9 @@
2811.16 * specific language governing permissions and limitations under the
2811.17 * License. When distributing the software, include this License Header
2811.18 * Notice in each file and include the License file at
2811.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2811.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2811.21 * particular file as subject to the "Classpath" exception as provided
2811.22 - * by Sun in the GPL Version 2 section of the License file that
2811.23 + * by Oracle in the GPL Version 2 section of the License file that
2811.24 * accompanied this code. If applicable, add the following below the
2811.25 * License Header, with the fields enclosed by brackets [] replaced by
2811.26 * your own identifying information:
2812.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/faces/UIComponentPropertyResolver.java Fri Jul 16 11:47:36 2010 -0400
2812.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/faces/UIComponentPropertyResolver.java Fri Jul 16 14:21:50 2010 -0400
2812.3 @@ -1,7 +1,10 @@
2812.4 /*
2812.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2812.6 *
2812.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2812.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2812.9 + *
2812.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2812.11 + * Other names may be trademarks of their respective owners.
2812.12 *
2812.13 * The contents of this file are subject to the terms of either the GNU
2812.14 * General Public License Version 2 only ("GPL") or the Common
2812.15 @@ -13,9 +16,9 @@
2812.16 * specific language governing permissions and limitations under the
2812.17 * License. When distributing the software, include this License Header
2812.18 * Notice in each file and include the License file at
2812.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2812.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2812.21 * particular file as subject to the "Classpath" exception as provided
2812.22 - * by Sun in the GPL Version 2 section of the License file that
2812.23 + * by Oracle in the GPL Version 2 section of the License file that
2812.24 * accompanied this code. If applicable, add the following below the
2812.25 * License Header, with the fields enclosed by brackets [] replaced by
2812.26 * your own identifying information:
2813.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ValueBindingFilterCriteria.java Fri Jul 16 11:47:36 2010 -0400
2813.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ValueBindingFilterCriteria.java Fri Jul 16 14:21:50 2010 -0400
2813.3 @@ -1,7 +1,10 @@
2813.4 /*
2813.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2813.6 *
2813.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2813.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2813.9 + *
2813.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2813.11 + * Other names may be trademarks of their respective owners.
2813.12 *
2813.13 * The contents of this file are subject to the terms of either the GNU
2813.14 * General Public License Version 2 only ("GPL") or the Common
2813.15 @@ -13,9 +16,9 @@
2813.16 * specific language governing permissions and limitations under the
2813.17 * License. When distributing the software, include this License Header
2813.18 * Notice in each file and include the License file at
2813.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2813.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2813.21 * particular file as subject to the "Classpath" exception as provided
2813.22 - * by Sun in the GPL Version 2 section of the License file that
2813.23 + * by Oracle in the GPL Version 2 section of the License file that
2813.24 * accompanied this code. If applicable, add the following below the
2813.25 * License Header, with the fields enclosed by brackets [] replaced by
2813.26 * your own identifying information:
2814.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ValueBindingSortCriteria.java Fri Jul 16 11:47:36 2010 -0400
2814.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ValueBindingSortCriteria.java Fri Jul 16 14:21:50 2010 -0400
2814.3 @@ -1,7 +1,10 @@
2814.4 /*
2814.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2814.6 *
2814.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2814.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2814.9 + *
2814.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2814.11 + * Other names may be trademarks of their respective owners.
2814.12 *
2814.13 * The contents of this file are subject to the terms of either the GNU
2814.14 * General Public License Version 2 only ("GPL") or the Common
2814.15 @@ -13,9 +16,9 @@
2814.16 * specific language governing permissions and limitations under the
2814.17 * License. When distributing the software, include this License Header
2814.18 * Notice in each file and include the License file at
2814.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2814.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2814.21 * particular file as subject to the "Classpath" exception as provided
2814.22 - * by Sun in the GPL Version 2 section of the License file that
2814.23 + * by Oracle in the GPL Version 2 section of the License file that
2814.24 * accompanied this code. If applicable, add the following below the
2814.25 * License Header, with the fields enclosed by brackets [] replaced by
2814.26 * your own identifying information:
2815.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ValueExpressionFilterCriteria.java Fri Jul 16 11:47:36 2010 -0400
2815.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ValueExpressionFilterCriteria.java Fri Jul 16 14:21:50 2010 -0400
2815.3 @@ -1,7 +1,10 @@
2815.4 /*
2815.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2815.6 *
2815.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2815.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2815.9 + *
2815.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2815.11 + * Other names may be trademarks of their respective owners.
2815.12 *
2815.13 * The contents of this file are subject to the terms of either the GNU
2815.14 * General Public License Version 2 only ("GPL") or the Common
2815.15 @@ -13,9 +16,9 @@
2815.16 * specific language governing permissions and limitations under the
2815.17 * License. When distributing the software, include this License Header
2815.18 * Notice in each file and include the License file at
2815.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2815.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2815.21 * particular file as subject to the "Classpath" exception as provided
2815.22 - * by Sun in the GPL Version 2 section of the License file that
2815.23 + * by Oracle in the GPL Version 2 section of the License file that
2815.24 * accompanied this code. If applicable, add the following below the
2815.25 * License Header, with the fields enclosed by brackets [] replaced by
2815.26 * your own identifying information:
2816.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ValueExpressionSortCriteria.java Fri Jul 16 11:47:36 2010 -0400
2816.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/faces/ValueExpressionSortCriteria.java Fri Jul 16 14:21:50 2010 -0400
2816.3 @@ -1,7 +1,10 @@
2816.4 /*
2816.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2816.6 *
2816.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2816.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2816.9 + *
2816.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2816.11 + * Other names may be trademarks of their respective owners.
2816.12 *
2816.13 * The contents of this file are subject to the terms of either the GNU
2816.14 * General Public License Version 2 only ("GPL") or the Common
2816.15 @@ -13,9 +16,9 @@
2816.16 * specific language governing permissions and limitations under the
2816.17 * License. When distributing the software, include this License Header
2816.18 * Notice in each file and include the License file at
2816.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2816.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2816.21 * particular file as subject to the "Classpath" exception as provided
2816.22 - * by Sun in the GPL Version 2 section of the License file that
2816.23 + * by Oracle in the GPL Version 2 section of the License file that
2816.24 * accompanied this code. If applicable, add the following below the
2816.25 * License Header, with the fields enclosed by brackets [] replaced by
2816.26 * your own identifying information:
2817.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2817.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2817.3 @@ -1,7 +1,10 @@
2817.4 # -----------------------------------------------------------------------------
2817.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2817.6 #
2817.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2817.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2817.9 +#
2817.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2817.11 +# Other names may be trademarks of their respective owners.
2817.12 #
2817.13 # The contents of this file are subject to the terms of either the GNU
2817.14 # General Public License Version 2 only ("GPL") or the Common
2817.15 @@ -13,9 +16,9 @@
2817.16 # specific language governing permissions and limitations under the
2817.17 # License. When distributing the software, include this License Header
2817.18 # Notice in each file and include the License file at
2817.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2817.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2817.21 # particular file as subject to the "Classpath" exception as provided
2817.22 -# by Sun in the GPL Version 2 section of the License file that
2817.23 +# by Oracle in the GPL Version 2 section of the License file that
2817.24 # accompanied this code. If applicable, add the following below the
2817.25 # License Header, with the fields enclosed by brackets [] replaced by
2817.26 # your own identifying information:
2818.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/ClockTime.java Fri Jul 16 11:47:36 2010 -0400
2818.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/ClockTime.java Fri Jul 16 14:21:50 2010 -0400
2818.3 @@ -1,7 +1,10 @@
2818.4 /*
2818.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2818.6 *
2818.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2818.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2818.9 + *
2818.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2818.11 + * Other names may be trademarks of their respective owners.
2818.12 *
2818.13 * The contents of this file are subject to the terms of either the GNU
2818.14 * General Public License Version 2 only ("GPL") or the Common
2818.15 @@ -13,9 +16,9 @@
2818.16 * specific language governing permissions and limitations under the
2818.17 * License. When distributing the software, include this License Header
2818.18 * Notice in each file and include the License file at
2818.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2818.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2818.21 * particular file as subject to the "Classpath" exception as provided
2818.22 - * by Sun in the GPL Version 2 section of the License file that
2818.23 + * by Oracle in the GPL Version 2 section of the License file that
2818.24 * accompanied this code. If applicable, add the following below the
2818.25 * License Header, with the fields enclosed by brackets [] replaced by
2818.26 * your own identifying information:
2819.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/DefaultOptionsList.java Fri Jul 16 11:47:36 2010 -0400
2819.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/DefaultOptionsList.java Fri Jul 16 14:21:50 2010 -0400
2819.3 @@ -1,7 +1,10 @@
2819.4 /*
2819.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2819.6 *
2819.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2819.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2819.9 + *
2819.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2819.11 + * Other names may be trademarks of their respective owners.
2819.12 *
2819.13 * The contents of this file are subject to the terms of either the GNU
2819.14 * General Public License Version 2 only ("GPL") or the Common
2819.15 @@ -13,9 +16,9 @@
2819.16 * specific language governing permissions and limitations under the
2819.17 * License. When distributing the software, include this License Header
2819.18 * Notice in each file and include the License file at
2819.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2819.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2819.21 * particular file as subject to the "Classpath" exception as provided
2819.22 - * by Sun in the GPL Version 2 section of the License file that
2819.23 + * by Oracle in the GPL Version 2 section of the License file that
2819.24 * accompanied this code. If applicable, add the following below the
2819.25 * License Header, with the fields enclosed by brackets [] replaced by
2819.26 * your own identifying information:
2820.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/DefaultTableDataProvider.java Fri Jul 16 11:47:36 2010 -0400
2820.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/DefaultTableDataProvider.java Fri Jul 16 14:21:50 2010 -0400
2820.3 @@ -1,7 +1,10 @@
2820.4 /*
2820.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2820.6 *
2820.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2820.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2820.9 + *
2820.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2820.11 + * Other names may be trademarks of their respective owners.
2820.12 *
2820.13 * The contents of this file are subject to the terms of either the GNU
2820.14 * General Public License Version 2 only ("GPL") or the Common
2820.15 @@ -13,9 +16,9 @@
2820.16 * specific language governing permissions and limitations under the
2820.17 * License. When distributing the software, include this License Header
2820.18 * Notice in each file and include the License file at
2820.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2820.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2820.21 * particular file as subject to the "Classpath" exception as provided
2820.22 - * by Sun in the GPL Version 2 section of the License file that
2820.23 + * by Oracle in the GPL Version 2 section of the License file that
2820.24 * accompanied this code. If applicable, add the following below the
2820.25 * License Header, with the fields enclosed by brackets [] replaced by
2820.26 * your own identifying information:
2821.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/DefaultThemeResources.properties Fri Jul 16 11:47:36 2010 -0400
2821.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/DefaultThemeResources.properties Fri Jul 16 14:21:50 2010 -0400
2821.3 @@ -1,6 +1,9 @@
2821.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2821.5 #
2821.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2821.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2821.8 +#
2821.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2821.10 +# Other names may be trademarks of their respective owners.
2821.11 #
2821.12 # The contents of this file are subject to the terms of either the GNU
2821.13 # General Public License Version 2 only ("GPL") or the Common
2821.14 @@ -12,9 +15,9 @@
2821.15 # specific language governing permissions and limitations under the
2821.16 # License. When distributing the software, include this License Header
2821.17 # Notice in each file and include the License file at
2821.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2821.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2821.20 # particular file as subject to the "Classpath" exception as provided
2821.21 -# by Sun in the GPL Version 2 section of the License file that
2821.22 +# by Oracle in the GPL Version 2 section of the License file that
2821.23 # accompanied this code. If applicable, add the following below the
2821.24 # License Header, with the fields enclosed by brackets [] replaced by
2821.25 # your own identifying information:
2822.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/Markup.java Fri Jul 16 11:47:36 2010 -0400
2822.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/Markup.java Fri Jul 16 14:21:50 2010 -0400
2822.3 @@ -1,7 +1,10 @@
2822.4 /*
2822.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2822.6 *
2822.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2822.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2822.9 + *
2822.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2822.11 + * Other names may be trademarks of their respective owners.
2822.12 *
2822.13 * The contents of this file are subject to the terms of either the GNU
2822.14 * General Public License Version 2 only ("GPL") or the Common
2822.15 @@ -13,9 +16,9 @@
2822.16 * specific language governing permissions and limitations under the
2822.17 * License. When distributing the software, include this License Header
2822.18 * Notice in each file and include the License file at
2822.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2822.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2822.21 * particular file as subject to the "Classpath" exception as provided
2822.22 - * by Sun in the GPL Version 2 section of the License file that
2822.23 + * by Oracle in the GPL Version 2 section of the License file that
2822.24 * accompanied this code. If applicable, add the following below the
2822.25 * License Header, with the fields enclosed by brackets [] replaced by
2822.26 * your own identifying information:
2823.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/MultipleSelectOptionsList.java Fri Jul 16 11:47:36 2010 -0400
2823.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/MultipleSelectOptionsList.java Fri Jul 16 14:21:50 2010 -0400
2823.3 @@ -1,7 +1,10 @@
2823.4 /*
2823.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2823.6 *
2823.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2823.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2823.9 + *
2823.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2823.11 + * Other names may be trademarks of their respective owners.
2823.12 *
2823.13 * The contents of this file are subject to the terms of either the GNU
2823.14 * General Public License Version 2 only ("GPL") or the Common
2823.15 @@ -13,9 +16,9 @@
2823.16 * specific language governing permissions and limitations under the
2823.17 * License. When distributing the software, include this License Header
2823.18 * Notice in each file and include the License file at
2823.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2823.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2823.21 * particular file as subject to the "Classpath" exception as provided
2823.22 - * by Sun in the GPL Version 2 section of the License file that
2823.23 + * by Oracle in the GPL Version 2 section of the License file that
2823.24 * accompanied this code. If applicable, add the following below the
2823.25 * License Header, with the fields enclosed by brackets [] replaced by
2823.26 * your own identifying information:
2824.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/Option.java Fri Jul 16 11:47:36 2010 -0400
2824.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/Option.java Fri Jul 16 14:21:50 2010 -0400
2824.3 @@ -1,7 +1,10 @@
2824.4 /*
2824.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2824.6 *
2824.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2824.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2824.9 + *
2824.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2824.11 + * Other names may be trademarks of their respective owners.
2824.12 *
2824.13 * The contents of this file are subject to the terms of either the GNU
2824.14 * General Public License Version 2 only ("GPL") or the Common
2824.15 @@ -13,9 +16,9 @@
2824.16 * specific language governing permissions and limitations under the
2824.17 * License. When distributing the software, include this License Header
2824.18 * Notice in each file and include the License file at
2824.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2824.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2824.21 * particular file as subject to the "Classpath" exception as provided
2824.22 - * by Sun in the GPL Version 2 section of the License file that
2824.23 + * by Oracle in the GPL Version 2 section of the License file that
2824.24 * accompanied this code. If applicable, add the following below the
2824.25 * License Header, with the fields enclosed by brackets [] replaced by
2824.26 * your own identifying information:
2825.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/OptionGroup.java Fri Jul 16 11:47:36 2010 -0400
2825.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/OptionGroup.java Fri Jul 16 14:21:50 2010 -0400
2825.3 @@ -1,7 +1,10 @@
2825.4 /*
2825.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2825.6 *
2825.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2825.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2825.9 + *
2825.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2825.11 + * Other names may be trademarks of their respective owners.
2825.12 *
2825.13 * The contents of this file are subject to the terms of either the GNU
2825.14 * General Public License Version 2 only ("GPL") or the Common
2825.15 @@ -13,9 +16,9 @@
2825.16 * specific language governing permissions and limitations under the
2825.17 * License. When distributing the software, include this License Header
2825.18 * Notice in each file and include the License file at
2825.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2825.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2825.21 * particular file as subject to the "Classpath" exception as provided
2825.22 - * by Sun in the GPL Version 2 section of the License file that
2825.23 + * by Oracle in the GPL Version 2 section of the License file that
2825.24 * accompanied this code. If applicable, add the following below the
2825.25 * License Header, with the fields enclosed by brackets [] replaced by
2825.26 * your own identifying information:
2826.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/OptionTitle.java Fri Jul 16 11:47:36 2010 -0400
2826.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/OptionTitle.java Fri Jul 16 14:21:50 2010 -0400
2826.3 @@ -1,7 +1,10 @@
2826.4 /*
2826.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2826.6 *
2826.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2826.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2826.9 + *
2826.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2826.11 + * Other names may be trademarks of their respective owners.
2826.12 *
2826.13 * The contents of this file are subject to the terms of either the GNU
2826.14 * General Public License Version 2 only ("GPL") or the Common
2826.15 @@ -13,9 +16,9 @@
2826.16 * specific language governing permissions and limitations under the
2826.17 * License. When distributing the software, include this License Header
2826.18 * Notice in each file and include the License file at
2826.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2826.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2826.21 * particular file as subject to the "Classpath" exception as provided
2826.22 - * by Sun in the GPL Version 2 section of the License file that
2826.23 + * by Oracle in the GPL Version 2 section of the License file that
2826.24 * accompanied this code. If applicable, add the following below the
2826.25 * License Header, with the fields enclosed by brackets [] replaced by
2826.26 * your own identifying information:
2827.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/OptionsList.java Fri Jul 16 11:47:36 2010 -0400
2827.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/OptionsList.java Fri Jul 16 14:21:50 2010 -0400
2827.3 @@ -1,7 +1,10 @@
2827.4 /*
2827.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2827.6 *
2827.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2827.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2827.9 + *
2827.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2827.11 + * Other names may be trademarks of their respective owners.
2827.12 *
2827.13 * The contents of this file are subject to the terms of either the GNU
2827.14 * General Public License Version 2 only ("GPL") or the Common
2827.15 @@ -13,9 +16,9 @@
2827.16 * specific language governing permissions and limitations under the
2827.17 * License. When distributing the software, include this License Header
2827.18 * Notice in each file and include the License file at
2827.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2827.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2827.21 * particular file as subject to the "Classpath" exception as provided
2827.22 - * by Sun in the GPL Version 2 section of the License file that
2827.23 + * by Oracle in the GPL Version 2 section of the License file that
2827.24 * accompanied this code. If applicable, add the following below the
2827.25 * License Header, with the fields enclosed by brackets [] replaced by
2827.26 * your own identifying information:
2828.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/ResourceItem.java Fri Jul 16 11:47:36 2010 -0400
2828.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/ResourceItem.java Fri Jul 16 14:21:50 2010 -0400
2828.3 @@ -1,7 +1,10 @@
2828.4 /*
2828.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2828.6 *
2828.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2828.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2828.9 + *
2828.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2828.11 + * Other names may be trademarks of their respective owners.
2828.12 *
2828.13 * The contents of this file are subject to the terms of either the GNU
2828.14 * General Public License Version 2 only ("GPL") or the Common
2828.15 @@ -13,9 +16,9 @@
2828.16 * specific language governing permissions and limitations under the
2828.17 * License. When distributing the software, include this License Header
2828.18 * Notice in each file and include the License file at
2828.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2828.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2828.21 * particular file as subject to the "Classpath" exception as provided
2828.22 - * by Sun in the GPL Version 2 section of the License file that
2828.23 + * by Oracle in the GPL Version 2 section of the License file that
2828.24 * accompanied this code. If applicable, add the following below the
2828.25 * License Header, with the fields enclosed by brackets [] replaced by
2828.26 * your own identifying information:
2829.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/ResourceModel.java Fri Jul 16 11:47:36 2010 -0400
2829.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/ResourceModel.java Fri Jul 16 14:21:50 2010 -0400
2829.3 @@ -1,7 +1,10 @@
2829.4 /*
2829.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2829.6 *
2829.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2829.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2829.9 + *
2829.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2829.11 + * Other names may be trademarks of their respective owners.
2829.12 *
2829.13 * The contents of this file are subject to the terms of either the GNU
2829.14 * General Public License Version 2 only ("GPL") or the Common
2829.15 @@ -13,9 +16,9 @@
2829.16 * specific language governing permissions and limitations under the
2829.17 * License. When distributing the software, include this License Header
2829.18 * Notice in each file and include the License file at
2829.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2829.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2829.21 * particular file as subject to the "Classpath" exception as provided
2829.22 - * by Sun in the GPL Version 2 section of the License file that
2829.23 + * by Oracle in the GPL Version 2 section of the License file that
2829.24 * accompanied this code. If applicable, add the following below the
2829.25 * License Header, with the fields enclosed by brackets [] replaced by
2829.26 * your own identifying information:
2830.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/ResourceModelException.java Fri Jul 16 11:47:36 2010 -0400
2830.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/ResourceModelException.java Fri Jul 16 14:21:50 2010 -0400
2830.3 @@ -1,7 +1,10 @@
2830.4 /*
2830.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2830.6 *
2830.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2830.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2830.9 + *
2830.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2830.11 + * Other names may be trademarks of their respective owners.
2830.12 *
2830.13 * The contents of this file are subject to the terms of either the GNU
2830.14 * General Public License Version 2 only ("GPL") or the Common
2830.15 @@ -13,9 +16,9 @@
2830.16 * specific language governing permissions and limitations under the
2830.17 * License. When distributing the software, include this License Header
2830.18 * Notice in each file and include the License file at
2830.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2830.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2830.21 * particular file as subject to the "Classpath" exception as provided
2830.22 - * by Sun in the GPL Version 2 section of the License file that
2830.23 + * by Oracle in the GPL Version 2 section of the License file that
2830.24 * accompanied this code. If applicable, add the following below the
2830.25 * License Header, with the fields enclosed by brackets [] replaced by
2830.26 * your own identifying information:
2831.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/ScheduledEvent.java Fri Jul 16 11:47:36 2010 -0400
2831.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/ScheduledEvent.java Fri Jul 16 14:21:50 2010 -0400
2831.3 @@ -1,7 +1,10 @@
2831.4 /*
2831.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2831.6 *
2831.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2831.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2831.9 + *
2831.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2831.11 + * Other names may be trademarks of their respective owners.
2831.12 *
2831.13 * The contents of this file are subject to the terms of either the GNU
2831.14 * General Public License Version 2 only ("GPL") or the Common
2831.15 @@ -13,9 +16,9 @@
2831.16 * specific language governing permissions and limitations under the
2831.17 * License. When distributing the software, include this License Header
2831.18 * Notice in each file and include the License file at
2831.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2831.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2831.21 * particular file as subject to the "Classpath" exception as provided
2831.22 - * by Sun in the GPL Version 2 section of the License file that
2831.23 + * by Oracle in the GPL Version 2 section of the License file that
2831.24 * accompanied this code. If applicable, add the following below the
2831.25 * License Header, with the fields enclosed by brackets [] replaced by
2831.26 * your own identifying information:
2832.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/ScriptMarkup.java Fri Jul 16 11:47:36 2010 -0400
2832.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/ScriptMarkup.java Fri Jul 16 14:21:50 2010 -0400
2832.3 @@ -1,7 +1,10 @@
2832.4 /*
2832.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2832.6 *
2832.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2832.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2832.9 + *
2832.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2832.11 + * Other names may be trademarks of their respective owners.
2832.12 *
2832.13 * The contents of this file are subject to the terms of either the GNU
2832.14 * General Public License Version 2 only ("GPL") or the Common
2832.15 @@ -13,9 +16,9 @@
2832.16 * specific language governing permissions and limitations under the
2832.17 * License. When distributing the software, include this License Header
2832.18 * Notice in each file and include the License file at
2832.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2832.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2832.21 * particular file as subject to the "Classpath" exception as provided
2832.22 - * by Sun in the GPL Version 2 section of the License file that
2832.23 + * by Oracle in the GPL Version 2 section of the License file that
2832.24 * accompanied this code. If applicable, add the following below the
2832.25 * License Header, with the fields enclosed by brackets [] replaced by
2832.26 * your own identifying information:
2833.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/Separator.java Fri Jul 16 11:47:36 2010 -0400
2833.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/Separator.java Fri Jul 16 14:21:50 2010 -0400
2833.3 @@ -1,7 +1,10 @@
2833.4 /*
2833.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2833.6 *
2833.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2833.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2833.9 + *
2833.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2833.11 + * Other names may be trademarks of their respective owners.
2833.12 *
2833.13 * The contents of this file are subject to the terms of either the GNU
2833.14 * General Public License Version 2 only ("GPL") or the Common
2833.15 @@ -13,9 +16,9 @@
2833.16 * specific language governing permissions and limitations under the
2833.17 * License. When distributing the software, include this License Header
2833.18 * Notice in each file and include the License file at
2833.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2833.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2833.21 * particular file as subject to the "Classpath" exception as provided
2833.22 - * by Sun in the GPL Version 2 section of the License file that
2833.23 + * by Oracle in the GPL Version 2 section of the License file that
2833.24 * accompanied this code. If applicable, add the following below the
2833.25 * License Header, with the fields enclosed by brackets [] replaced by
2833.26 * your own identifying information:
2834.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/SingleSelectOptionsList.java Fri Jul 16 11:47:36 2010 -0400
2834.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/SingleSelectOptionsList.java Fri Jul 16 14:21:50 2010 -0400
2834.3 @@ -1,7 +1,10 @@
2834.4 /*
2834.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2834.6 *
2834.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2834.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2834.9 + *
2834.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2834.11 + * Other names may be trademarks of their respective owners.
2834.12 *
2834.13 * The contents of this file are subject to the terms of either the GNU
2834.14 * General Public License Version 2 only ("GPL") or the Common
2834.15 @@ -13,9 +16,9 @@
2834.16 * specific language governing permissions and limitations under the
2834.17 * License. When distributing the software, include this License Header
2834.18 * Notice in each file and include the License file at
2834.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2834.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2834.21 * particular file as subject to the "Classpath" exception as provided
2834.22 - * by Sun in the GPL Version 2 section of the License file that
2834.23 + * by Oracle in the GPL Version 2 section of the License file that
2834.24 * accompanied this code. If applicable, add the following below the
2834.25 * License Header, with the fields enclosed by brackets [] replaced by
2834.26 * your own identifying information:
2835.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/UploadedFile.java Fri Jul 16 11:47:36 2010 -0400
2835.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/UploadedFile.java Fri Jul 16 14:21:50 2010 -0400
2835.3 @@ -1,7 +1,10 @@
2835.4 /*
2835.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2835.6 *
2835.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2835.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2835.9 + *
2835.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2835.11 + * Other names may be trademarks of their respective owners.
2835.12 *
2835.13 * The contents of this file are subject to the terms of either the GNU
2835.14 * General Public License Version 2 only ("GPL") or the Common
2835.15 @@ -13,9 +16,9 @@
2835.16 * specific language governing permissions and limitations under the
2835.17 * License. When distributing the software, include this License Header
2835.18 * Notice in each file and include the License file at
2835.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2835.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2835.21 * particular file as subject to the "Classpath" exception as provided
2835.22 - * by Sun in the GPL Version 2 section of the License file that
2835.23 + * by Oracle in the GPL Version 2 section of the License file that
2835.24 * accompanied this code. If applicable, add the following below the
2835.25 * License Header, with the fields enclosed by brackets [] replaced by
2835.26 * your own identifying information:
2836.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/list/EndGroup.java Fri Jul 16 11:47:36 2010 -0400
2836.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/list/EndGroup.java Fri Jul 16 14:21:50 2010 -0400
2836.3 @@ -1,7 +1,10 @@
2836.4 /*
2836.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2836.6 *
2836.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2836.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2836.9 + *
2836.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2836.11 + * Other names may be trademarks of their respective owners.
2836.12 *
2836.13 * The contents of this file are subject to the terms of either the GNU
2836.14 * General Public License Version 2 only ("GPL") or the Common
2836.15 @@ -13,9 +16,9 @@
2836.16 * specific language governing permissions and limitations under the
2836.17 * License. When distributing the software, include this License Header
2836.18 * Notice in each file and include the License file at
2836.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2836.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2836.21 * particular file as subject to the "Classpath" exception as provided
2836.22 - * by Sun in the GPL Version 2 section of the License file that
2836.23 + * by Oracle in the GPL Version 2 section of the License file that
2836.24 * accompanied this code. If applicable, add the following below the
2836.25 * License Header, with the fields enclosed by brackets [] replaced by
2836.26 * your own identifying information:
2837.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/list/ListItem.java Fri Jul 16 11:47:36 2010 -0400
2837.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/list/ListItem.java Fri Jul 16 14:21:50 2010 -0400
2837.3 @@ -1,7 +1,10 @@
2837.4 /*
2837.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2837.6 *
2837.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2837.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2837.9 + *
2837.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2837.11 + * Other names may be trademarks of their respective owners.
2837.12 *
2837.13 * The contents of this file are subject to the terms of either the GNU
2837.14 * General Public License Version 2 only ("GPL") or the Common
2837.15 @@ -13,9 +16,9 @@
2837.16 * specific language governing permissions and limitations under the
2837.17 * License. When distributing the software, include this License Header
2837.18 * Notice in each file and include the License file at
2837.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2837.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2837.21 * particular file as subject to the "Classpath" exception as provided
2837.22 - * by Sun in the GPL Version 2 section of the License file that
2837.23 + * by Oracle in the GPL Version 2 section of the License file that
2837.24 * accompanied this code. If applicable, add the following below the
2837.25 * License Header, with the fields enclosed by brackets [] replaced by
2837.26 * your own identifying information:
2838.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/list/StartGroup.java Fri Jul 16 11:47:36 2010 -0400
2838.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/list/StartGroup.java Fri Jul 16 14:21:50 2010 -0400
2838.3 @@ -1,7 +1,10 @@
2838.4 /*
2838.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2838.6 *
2838.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2838.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2838.9 + *
2838.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2838.11 + * Other names may be trademarks of their respective owners.
2838.12 *
2838.13 * The contents of this file are subject to the terms of either the GNU
2838.14 * General Public License Version 2 only ("GPL") or the Common
2838.15 @@ -13,9 +16,9 @@
2838.16 * specific language governing permissions and limitations under the
2838.17 * License. When distributing the software, include this License Header
2838.18 * Notice in each file and include the License file at
2838.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2838.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2838.21 * particular file as subject to the "Classpath" exception as provided
2838.22 - * by Sun in the GPL Version 2 section of the License file that
2838.23 + * by Oracle in the GPL Version 2 section of the License file that
2838.24 * accompanied this code. If applicable, add the following below the
2838.25 * License Header, with the fields enclosed by brackets [] replaced by
2838.26 * your own identifying information:
2839.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatInterval.java Fri Jul 16 11:47:36 2010 -0400
2839.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatInterval.java Fri Jul 16 14:21:50 2010 -0400
2839.3 @@ -1,7 +1,10 @@
2839.4 /*
2839.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2839.6 *
2839.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2839.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2839.9 + *
2839.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2839.11 + * Other names may be trademarks of their respective owners.
2839.12 *
2839.13 * The contents of this file are subject to the terms of either the GNU
2839.14 * General Public License Version 2 only ("GPL") or the Common
2839.15 @@ -13,9 +16,9 @@
2839.16 * specific language governing permissions and limitations under the
2839.17 * License. When distributing the software, include this License Header
2839.18 * Notice in each file and include the License file at
2839.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2839.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2839.21 * particular file as subject to the "Classpath" exception as provided
2839.22 - * by Sun in the GPL Version 2 section of the License file that
2839.23 + * by Oracle in the GPL Version 2 section of the License file that
2839.24 * accompanied this code. If applicable, add the following below the
2839.25 * License Header, with the fields enclosed by brackets [] replaced by
2839.26 * your own identifying information:
2840.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatIntervalConverter.java Fri Jul 16 11:47:36 2010 -0400
2840.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatIntervalConverter.java Fri Jul 16 14:21:50 2010 -0400
2840.3 @@ -1,7 +1,10 @@
2840.4 /*
2840.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2840.6 *
2840.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2840.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2840.9 + *
2840.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2840.11 + * Other names may be trademarks of their respective owners.
2840.12 *
2840.13 * The contents of this file are subject to the terms of either the GNU
2840.14 * General Public License Version 2 only ("GPL") or the Common
2840.15 @@ -13,9 +16,9 @@
2840.16 * specific language governing permissions and limitations under the
2840.17 * License. When distributing the software, include this License Header
2840.18 * Notice in each file and include the License file at
2840.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2840.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2840.21 * particular file as subject to the "Classpath" exception as provided
2840.22 - * by Sun in the GPL Version 2 section of the License file that
2840.23 + * by Oracle in the GPL Version 2 section of the License file that
2840.24 * accompanied this code. If applicable, add the following below the
2840.25 * License Header, with the fields enclosed by brackets [] replaced by
2840.26 * your own identifying information:
2841.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatIntervalOption.java Fri Jul 16 11:47:36 2010 -0400
2841.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatIntervalOption.java Fri Jul 16 14:21:50 2010 -0400
2841.3 @@ -1,7 +1,10 @@
2841.4 /*
2841.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2841.6 *
2841.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2841.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2841.9 + *
2841.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2841.11 + * Other names may be trademarks of their respective owners.
2841.12 *
2841.13 * The contents of this file are subject to the terms of either the GNU
2841.14 * General Public License Version 2 only ("GPL") or the Common
2841.15 @@ -13,9 +16,9 @@
2841.16 * specific language governing permissions and limitations under the
2841.17 * License. When distributing the software, include this License Header
2841.18 * Notice in each file and include the License file at
2841.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2841.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2841.21 * particular file as subject to the "Classpath" exception as provided
2841.22 - * by Sun in the GPL Version 2 section of the License file that
2841.23 + * by Oracle in the GPL Version 2 section of the License file that
2841.24 * accompanied this code. If applicable, add the following below the
2841.25 * License Header, with the fields enclosed by brackets [] replaced by
2841.26 * your own identifying information:
2842.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatUnit.java Fri Jul 16 11:47:36 2010 -0400
2842.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatUnit.java Fri Jul 16 14:21:50 2010 -0400
2842.3 @@ -1,7 +1,10 @@
2842.4 /*
2842.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2842.6 *
2842.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2842.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2842.9 + *
2842.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2842.11 + * Other names may be trademarks of their respective owners.
2842.12 *
2842.13 * The contents of this file are subject to the terms of either the GNU
2842.14 * General Public License Version 2 only ("GPL") or the Common
2842.15 @@ -13,9 +16,9 @@
2842.16 * specific language governing permissions and limitations under the
2842.17 * License. When distributing the software, include this License Header
2842.18 * Notice in each file and include the License file at
2842.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2842.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2842.21 * particular file as subject to the "Classpath" exception as provided
2842.22 - * by Sun in the GPL Version 2 section of the License file that
2842.23 + * by Oracle in the GPL Version 2 section of the License file that
2842.24 * accompanied this code. If applicable, add the following below the
2842.25 * License Header, with the fields enclosed by brackets [] replaced by
2842.26 * your own identifying information:
2843.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatUnitConverter.java Fri Jul 16 11:47:36 2010 -0400
2843.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatUnitConverter.java Fri Jul 16 14:21:50 2010 -0400
2843.3 @@ -1,7 +1,10 @@
2843.4 /*
2843.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2843.6 *
2843.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2843.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2843.9 + *
2843.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2843.11 + * Other names may be trademarks of their respective owners.
2843.12 *
2843.13 * The contents of this file are subject to the terms of either the GNU
2843.14 * General Public License Version 2 only ("GPL") or the Common
2843.15 @@ -13,9 +16,9 @@
2843.16 * specific language governing permissions and limitations under the
2843.17 * License. When distributing the software, include this License Header
2843.18 * Notice in each file and include the License file at
2843.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2843.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2843.21 * particular file as subject to the "Classpath" exception as provided
2843.22 - * by Sun in the GPL Version 2 section of the License file that
2843.23 + * by Oracle in the GPL Version 2 section of the License file that
2843.24 * accompanied this code. If applicable, add the following below the
2843.25 * License Header, with the fields enclosed by brackets [] replaced by
2843.26 * your own identifying information:
2844.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatUnitOption.java Fri Jul 16 11:47:36 2010 -0400
2844.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/model/scheduler/RepeatUnitOption.java Fri Jul 16 14:21:50 2010 -0400
2844.3 @@ -1,7 +1,10 @@
2844.4 /*
2844.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2844.6 *
2844.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2844.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2844.9 + *
2844.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2844.11 + * Other names may be trademarks of their respective owners.
2844.12 *
2844.13 * The contents of this file are subject to the terms of either the GNU
2844.14 * General Public License Version 2 only ("GPL") or the Common
2844.15 @@ -13,9 +16,9 @@
2844.16 * specific language governing permissions and limitations under the
2844.17 * License. When distributing the software, include this License Header
2844.18 * Notice in each file and include the License file at
2844.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2844.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2844.21 * particular file as subject to the "Classpath" exception as provided
2844.22 - * by Sun in the GPL Version 2 section of the License file that
2844.23 + * by Oracle in the GPL Version 2 section of the License file that
2844.24 * accompanied this code. If applicable, add the following below the
2844.25 * License Header, with the fields enclosed by brackets [] replaced by
2844.26 * your own identifying information:
2845.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AbstractRenderer.java Fri Jul 16 11:47:36 2010 -0400
2845.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AbstractRenderer.java Fri Jul 16 14:21:50 2010 -0400
2845.3 @@ -1,7 +1,10 @@
2845.4 /*
2845.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2845.6 *
2845.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2845.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2845.9 + *
2845.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2845.11 + * Other names may be trademarks of their respective owners.
2845.12 *
2845.13 * The contents of this file are subject to the terms of either the GNU
2845.14 * General Public License Version 2 only ("GPL") or the Common
2845.15 @@ -13,9 +16,9 @@
2845.16 * specific language governing permissions and limitations under the
2845.17 * License. When distributing the software, include this License Header
2845.18 * Notice in each file and include the License file at
2845.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2845.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2845.21 * particular file as subject to the "Classpath" exception as provided
2845.22 - * by Sun in the GPL Version 2 section of the License file that
2845.23 + * by Oracle in the GPL Version 2 section of the License file that
2845.24 * accompanied this code. If applicable, add the following below the
2845.25 * License Header, with the fields enclosed by brackets [] replaced by
2845.26 * your own identifying information:
2846.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AddRemoveRenderer.java Fri Jul 16 11:47:36 2010 -0400
2846.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AddRemoveRenderer.java Fri Jul 16 14:21:50 2010 -0400
2846.3 @@ -1,7 +1,10 @@
2846.4 /*
2846.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2846.6 *
2846.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2846.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2846.9 + *
2846.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2846.11 + * Other names may be trademarks of their respective owners.
2846.12 *
2846.13 * The contents of this file are subject to the terms of either the GNU
2846.14 * General Public License Version 2 only ("GPL") or the Common
2846.15 @@ -13,9 +16,9 @@
2846.16 * specific language governing permissions and limitations under the
2846.17 * License. When distributing the software, include this License Header
2846.18 * Notice in each file and include the License file at
2846.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2846.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2846.21 * particular file as subject to the "Classpath" exception as provided
2846.22 - * by Sun in the GPL Version 2 section of the License file that
2846.23 + * by Oracle in the GPL Version 2 section of the License file that
2846.24 * accompanied this code. If applicable, add the following below the
2846.25 * License Header, with the fields enclosed by brackets [] replaced by
2846.26 * your own identifying information:
2847.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AlarmRenderer.java Fri Jul 16 11:47:36 2010 -0400
2847.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AlarmRenderer.java Fri Jul 16 14:21:50 2010 -0400
2847.3 @@ -1,7 +1,10 @@
2847.4 /*
2847.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2847.6 *
2847.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2847.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2847.9 + *
2847.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2847.11 + * Other names may be trademarks of their respective owners.
2847.12 *
2847.13 * The contents of this file are subject to the terms of either the GNU
2847.14 * General Public License Version 2 only ("GPL") or the Common
2847.15 @@ -13,9 +16,9 @@
2847.16 * specific language governing permissions and limitations under the
2847.17 * License. When distributing the software, include this License Header
2847.18 * Notice in each file and include the License file at
2847.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2847.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2847.21 * particular file as subject to the "Classpath" exception as provided
2847.22 - * by Sun in the GPL Version 2 section of the License file that
2847.23 + * by Oracle in the GPL Version 2 section of the License file that
2847.24 * accompanied this code. If applicable, add the following below the
2847.25 * License Header, with the fields enclosed by brackets [] replaced by
2847.26 * your own identifying information:
2848.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AlertRenderer.java Fri Jul 16 11:47:36 2010 -0400
2848.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AlertRenderer.java Fri Jul 16 14:21:50 2010 -0400
2848.3 @@ -1,7 +1,10 @@
2848.4 /*
2848.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2848.6 *
2848.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2848.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2848.9 + *
2848.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2848.11 + * Other names may be trademarks of their respective owners.
2848.12 *
2848.13 * The contents of this file are subject to the terms of either the GNU
2848.14 * General Public License Version 2 only ("GPL") or the Common
2848.15 @@ -13,9 +16,9 @@
2848.16 * specific language governing permissions and limitations under the
2848.17 * License. When distributing the software, include this License Header
2848.18 * Notice in each file and include the License file at
2848.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2848.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2848.21 * particular file as subject to the "Classpath" exception as provided
2848.22 - * by Sun in the GPL Version 2 section of the License file that
2848.23 + * by Oracle in the GPL Version 2 section of the License file that
2848.24 * accompanied this code. If applicable, add the following below the
2848.25 * License Header, with the fields enclosed by brackets [] replaced by
2848.26 * your own identifying information:
2849.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AnchorRenderer.java Fri Jul 16 11:47:36 2010 -0400
2849.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/AnchorRenderer.java Fri Jul 16 14:21:50 2010 -0400
2849.3 @@ -1,7 +1,10 @@
2849.4 /*
2849.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2849.6 *
2849.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2849.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2849.9 + *
2849.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2849.11 + * Other names may be trademarks of their respective owners.
2849.12 *
2849.13 * The contents of this file are subject to the terms of either the GNU
2849.14 * General Public License Version 2 only ("GPL") or the Common
2849.15 @@ -13,9 +16,9 @@
2849.16 * specific language governing permissions and limitations under the
2849.17 * License. When distributing the software, include this License Header
2849.18 * Notice in each file and include the License file at
2849.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2849.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2849.21 * particular file as subject to the "Classpath" exception as provided
2849.22 - * by Sun in the GPL Version 2 section of the License file that
2849.23 + * by Oracle in the GPL Version 2 section of the License file that
2849.24 * accompanied this code. If applicable, add the following below the
2849.25 * License Header, with the fields enclosed by brackets [] replaced by
2849.26 * your own identifying information:
2850.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/BodyRenderer.java Fri Jul 16 11:47:36 2010 -0400
2850.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/BodyRenderer.java Fri Jul 16 14:21:50 2010 -0400
2850.3 @@ -1,7 +1,10 @@
2850.4 /*
2850.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2850.6 *
2850.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2850.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2850.9 + *
2850.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2850.11 + * Other names may be trademarks of their respective owners.
2850.12 *
2850.13 * The contents of this file are subject to the terms of either the GNU
2850.14 * General Public License Version 2 only ("GPL") or the Common
2850.15 @@ -13,9 +16,9 @@
2850.16 * specific language governing permissions and limitations under the
2850.17 * License. When distributing the software, include this License Header
2850.18 * Notice in each file and include the License file at
2850.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2850.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2850.21 * particular file as subject to the "Classpath" exception as provided
2850.22 - * by Sun in the GPL Version 2 section of the License file that
2850.23 + * by Oracle in the GPL Version 2 section of the License file that
2850.24 * accompanied this code. If applicable, add the following below the
2850.25 * License Header, with the fields enclosed by brackets [] replaced by
2850.26 * your own identifying information:
2851.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/BreadcrumbsRenderer.java Fri Jul 16 11:47:36 2010 -0400
2851.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/BreadcrumbsRenderer.java Fri Jul 16 14:21:50 2010 -0400
2851.3 @@ -1,7 +1,10 @@
2851.4 /*
2851.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2851.6 *
2851.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2851.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2851.9 + *
2851.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2851.11 + * Other names may be trademarks of their respective owners.
2851.12 *
2851.13 * The contents of this file are subject to the terms of either the GNU
2851.14 * General Public License Version 2 only ("GPL") or the Common
2851.15 @@ -13,9 +16,9 @@
2851.16 * specific language governing permissions and limitations under the
2851.17 * License. When distributing the software, include this License Header
2851.18 * Notice in each file and include the License file at
2851.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2851.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2851.21 * particular file as subject to the "Classpath" exception as provided
2851.22 - * by Sun in the GPL Version 2 section of the License file that
2851.23 + * by Oracle in the GPL Version 2 section of the License file that
2851.24 * accompanied this code. If applicable, add the following below the
2851.25 * License Header, with the fields enclosed by brackets [] replaced by
2851.26 * your own identifying information:
2852.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
2852.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
2852.3 @@ -1,7 +1,10 @@
2852.4 # -----------------------------------------------------------------------------
2852.5 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2852.6 #
2852.7 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2852.8 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2852.9 +#
2852.10 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2852.11 +# Other names may be trademarks of their respective owners.
2852.12 #
2852.13 # The contents of this file are subject to the terms of either the GNU
2852.14 # General Public License Version 2 only ("GPL") or the Common
2852.15 @@ -13,9 +16,9 @@
2852.16 # specific language governing permissions and limitations under the
2852.17 # License. When distributing the software, include this License Header
2852.18 # Notice in each file and include the License file at
2852.19 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2852.20 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2852.21 # particular file as subject to the "Classpath" exception as provided
2852.22 -# by Sun in the GPL Version 2 section of the License file that
2852.23 +# by Oracle in the GPL Version 2 section of the License file that
2852.24 # accompanied this code. If applicable, add the following below the
2852.25 # License Header, with the fields enclosed by brackets [] replaced by
2852.26 # your own identifying information:
2853.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ButtonRenderer.java Fri Jul 16 11:47:36 2010 -0400
2853.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ButtonRenderer.java Fri Jul 16 14:21:50 2010 -0400
2853.3 @@ -1,7 +1,10 @@
2853.4 /*
2853.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2853.6 *
2853.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2853.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2853.9 + *
2853.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2853.11 + * Other names may be trademarks of their respective owners.
2853.12 *
2853.13 * The contents of this file are subject to the terms of either the GNU
2853.14 * General Public License Version 2 only ("GPL") or the Common
2853.15 @@ -13,9 +16,9 @@
2853.16 * specific language governing permissions and limitations under the
2853.17 * License. When distributing the software, include this License Header
2853.18 * Notice in each file and include the License file at
2853.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2853.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2853.21 * particular file as subject to the "Classpath" exception as provided
2853.22 - * by Sun in the GPL Version 2 section of the License file that
2853.23 + * by Oracle in the GPL Version 2 section of the License file that
2853.24 * accompanied this code. If applicable, add the following below the
2853.25 * License Header, with the fields enclosed by brackets [] replaced by
2853.26 * your own identifying information:
2854.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/CalendarMonthRenderer.java Fri Jul 16 11:47:36 2010 -0400
2854.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/CalendarMonthRenderer.java Fri Jul 16 14:21:50 2010 -0400
2854.3 @@ -1,7 +1,10 @@
2854.4 /*
2854.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2854.6 *
2854.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2854.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2854.9 + *
2854.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2854.11 + * Other names may be trademarks of their respective owners.
2854.12 *
2854.13 * The contents of this file are subject to the terms of either the GNU
2854.14 * General Public License Version 2 only ("GPL") or the Common
2854.15 @@ -13,9 +16,9 @@
2854.16 * specific language governing permissions and limitations under the
2854.17 * License. When distributing the software, include this License Header
2854.18 * Notice in each file and include the License file at
2854.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2854.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2854.21 * particular file as subject to the "Classpath" exception as provided
2854.22 - * by Sun in the GPL Version 2 section of the License file that
2854.23 + * by Oracle in the GPL Version 2 section of the License file that
2854.24 * accompanied this code. If applicable, add the following below the
2854.25 * License Header, with the fields enclosed by brackets [] replaced by
2854.26 * your own identifying information:
2855.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/CalendarRenderer.java Fri Jul 16 11:47:36 2010 -0400
2855.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/CalendarRenderer.java Fri Jul 16 14:21:50 2010 -0400
2855.3 @@ -1,7 +1,10 @@
2855.4 /*
2855.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2855.6 *
2855.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2855.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2855.9 + *
2855.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2855.11 + * Other names may be trademarks of their respective owners.
2855.12 *
2855.13 * The contents of this file are subject to the terms of either the GNU
2855.14 * General Public License Version 2 only ("GPL") or the Common
2855.15 @@ -13,9 +16,9 @@
2855.16 * specific language governing permissions and limitations under the
2855.17 * License. When distributing the software, include this License Header
2855.18 * Notice in each file and include the License file at
2855.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2855.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2855.21 * particular file as subject to the "Classpath" exception as provided
2855.22 - * by Sun in the GPL Version 2 section of the License file that
2855.23 + * by Oracle in the GPL Version 2 section of the License file that
2855.24 * accompanied this code. If applicable, add the following below the
2855.25 * License Header, with the fields enclosed by brackets [] replaced by
2855.26 * your own identifying information:
2856.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/CheckboxGroupRenderer.java Fri Jul 16 11:47:36 2010 -0400
2856.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/CheckboxGroupRenderer.java Fri Jul 16 14:21:50 2010 -0400
2856.3 @@ -1,7 +1,10 @@
2856.4 /*
2856.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2856.6 *
2856.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2856.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2856.9 + *
2856.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2856.11 + * Other names may be trademarks of their respective owners.
2856.12 *
2856.13 * The contents of this file are subject to the terms of either the GNU
2856.14 * General Public License Version 2 only ("GPL") or the Common
2856.15 @@ -13,9 +16,9 @@
2856.16 * specific language governing permissions and limitations under the
2856.17 * License. When distributing the software, include this License Header
2856.18 * Notice in each file and include the License file at
2856.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2856.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2856.21 * particular file as subject to the "Classpath" exception as provided
2856.22 - * by Sun in the GPL Version 2 section of the License file that
2856.23 + * by Oracle in the GPL Version 2 section of the License file that
2856.24 * accompanied this code. If applicable, add the following below the
2856.25 * License Header, with the fields enclosed by brackets [] replaced by
2856.26 * your own identifying information:
2857.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/CheckboxRenderer.java Fri Jul 16 11:47:36 2010 -0400
2857.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/CheckboxRenderer.java Fri Jul 16 14:21:50 2010 -0400
2857.3 @@ -1,7 +1,10 @@
2857.4 /*
2857.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2857.6 *
2857.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2857.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2857.9 + *
2857.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2857.11 + * Other names may be trademarks of their respective owners.
2857.12 *
2857.13 * The contents of this file are subject to the terms of either the GNU
2857.14 * General Public License Version 2 only ("GPL") or the Common
2857.15 @@ -13,9 +16,9 @@
2857.16 * specific language governing permissions and limitations under the
2857.17 * License. When distributing the software, include this License Header
2857.18 * Notice in each file and include the License file at
2857.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2857.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2857.21 * particular file as subject to the "Classpath" exception as provided
2857.22 - * by Sun in the GPL Version 2 section of the License file that
2857.23 + * by Oracle in the GPL Version 2 section of the License file that
2857.24 * accompanied this code. If applicable, add the following below the
2857.25 * License Header, with the fields enclosed by brackets [] replaced by
2857.26 * your own identifying information:
2858.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/DropDownRenderer.java Fri Jul 16 11:47:36 2010 -0400
2858.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/DropDownRenderer.java Fri Jul 16 14:21:50 2010 -0400
2858.3 @@ -1,7 +1,10 @@
2858.4 /*
2858.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2858.6 *
2858.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2858.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2858.9 + *
2858.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2858.11 + * Other names may be trademarks of their respective owners.
2858.12 *
2858.13 * The contents of this file are subject to the terms of either the GNU
2858.14 * General Public License Version 2 only ("GPL") or the Common
2858.15 @@ -13,9 +16,9 @@
2858.16 * specific language governing permissions and limitations under the
2858.17 * License. When distributing the software, include this License Header
2858.18 * Notice in each file and include the License file at
2858.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2858.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2858.21 * particular file as subject to the "Classpath" exception as provided
2858.22 - * by Sun in the GPL Version 2 section of the License file that
2858.23 + * by Oracle in the GPL Version 2 section of the License file that
2858.24 * accompanied this code. If applicable, add the following below the
2858.25 * License Header, with the fields enclosed by brackets [] replaced by
2858.26 * your own identifying information:
2859.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/EditableListRenderer.java Fri Jul 16 11:47:36 2010 -0400
2859.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/EditableListRenderer.java Fri Jul 16 14:21:50 2010 -0400
2859.3 @@ -1,7 +1,10 @@
2859.4 /*
2859.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2859.6 *
2859.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2859.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2859.9 + *
2859.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2859.11 + * Other names may be trademarks of their respective owners.
2859.12 *
2859.13 * The contents of this file are subject to the terms of either the GNU
2859.14 * General Public License Version 2 only ("GPL") or the Common
2859.15 @@ -13,9 +16,9 @@
2859.16 * specific language governing permissions and limitations under the
2859.17 * License. When distributing the software, include this License Header
2859.18 * Notice in each file and include the License file at
2859.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2859.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2859.21 * particular file as subject to the "Classpath" exception as provided
2859.22 - * by Sun in the GPL Version 2 section of the License file that
2859.23 + * by Oracle in the GPL Version 2 section of the License file that
2859.24 * accompanied this code. If applicable, add the following below the
2859.25 * License Header, with the fields enclosed by brackets [] replaced by
2859.26 * your own identifying information:
2860.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/FieldRenderer.java Fri Jul 16 11:47:36 2010 -0400
2860.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/FieldRenderer.java Fri Jul 16 14:21:50 2010 -0400
2860.3 @@ -1,7 +1,10 @@
2860.4 /*
2860.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2860.6 *
2860.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2860.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2860.9 + *
2860.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2860.11 + * Other names may be trademarks of their respective owners.
2860.12 *
2860.13 * The contents of this file are subject to the terms of either the GNU
2860.14 * General Public License Version 2 only ("GPL") or the Common
2860.15 @@ -13,9 +16,9 @@
2860.16 * specific language governing permissions and limitations under the
2860.17 * License. When distributing the software, include this License Header
2860.18 * Notice in each file and include the License file at
2860.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2860.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2860.21 * particular file as subject to the "Classpath" exception as provided
2860.22 - * by Sun in the GPL Version 2 section of the License file that
2860.23 + * by Oracle in the GPL Version 2 section of the License file that
2860.24 * accompanied this code. If applicable, add the following below the
2860.25 * License Header, with the fields enclosed by brackets [] replaced by
2860.26 * your own identifying information:
2861.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/FormRenderer.java Fri Jul 16 11:47:36 2010 -0400
2861.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/FormRenderer.java Fri Jul 16 14:21:50 2010 -0400
2861.3 @@ -1,7 +1,10 @@
2861.4 /*
2861.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2861.6 *
2861.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2861.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2861.9 + *
2861.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2861.11 + * Other names may be trademarks of their respective owners.
2861.12 *
2861.13 * The contents of this file are subject to the terms of either the GNU
2861.14 * General Public License Version 2 only ("GPL") or the Common
2861.15 @@ -13,9 +16,9 @@
2861.16 * specific language governing permissions and limitations under the
2861.17 * License. When distributing the software, include this License Header
2861.18 * Notice in each file and include the License file at
2861.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2861.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2861.21 * particular file as subject to the "Classpath" exception as provided
2861.22 - * by Sun in the GPL Version 2 section of the License file that
2861.23 + * by Oracle in the GPL Version 2 section of the License file that
2861.24 * accompanied this code. If applicable, add the following below the
2861.25 * License Header, with the fields enclosed by brackets [] replaced by
2861.26 * your own identifying information:
2862.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/FrameRenderer.java Fri Jul 16 11:47:36 2010 -0400
2862.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/FrameRenderer.java Fri Jul 16 14:21:50 2010 -0400
2862.3 @@ -1,7 +1,10 @@
2862.4 /*
2862.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2862.6 *
2862.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2862.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2862.9 + *
2862.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2862.11 + * Other names may be trademarks of their respective owners.
2862.12 *
2862.13 * The contents of this file are subject to the terms of either the GNU
2862.14 * General Public License Version 2 only ("GPL") or the Common
2862.15 @@ -13,9 +16,9 @@
2862.16 * specific language governing permissions and limitations under the
2862.17 * License. When distributing the software, include this License Header
2862.18 * Notice in each file and include the License file at
2862.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2862.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2862.21 * particular file as subject to the "Classpath" exception as provided
2862.22 - * by Sun in the GPL Version 2 section of the License file that
2862.23 + * by Oracle in the GPL Version 2 section of the License file that
2862.24 * accompanied this code. If applicable, add the following below the
2862.25 * License Header, with the fields enclosed by brackets [] replaced by
2862.26 * your own identifying information:
2863.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/FrameSetRenderer.java Fri Jul 16 11:47:36 2010 -0400
2863.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/FrameSetRenderer.java Fri Jul 16 14:21:50 2010 -0400
2863.3 @@ -1,7 +1,10 @@
2863.4 /*
2863.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2863.6 *
2863.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2863.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2863.9 + *
2863.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2863.11 + * Other names may be trademarks of their respective owners.
2863.12 *
2863.13 * The contents of this file are subject to the terms of either the GNU
2863.14 * General Public License Version 2 only ("GPL") or the Common
2863.15 @@ -13,9 +16,9 @@
2863.16 * specific language governing permissions and limitations under the
2863.17 * License. When distributing the software, include this License Header
2863.18 * Notice in each file and include the License file at
2863.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2863.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2863.21 * particular file as subject to the "Classpath" exception as provided
2863.22 - * by Sun in the GPL Version 2 section of the License file that
2863.23 + * by Oracle in the GPL Version 2 section of the License file that
2863.24 * accompanied this code. If applicable, add the following below the
2863.25 * License Header, with the fields enclosed by brackets [] replaced by
2863.26 * your own identifying information:
2864.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HeadRenderer.java Fri Jul 16 11:47:36 2010 -0400
2864.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HeadRenderer.java Fri Jul 16 14:21:50 2010 -0400
2864.3 @@ -1,7 +1,10 @@
2864.4 /*
2864.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2864.6 *
2864.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2864.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2864.9 + *
2864.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2864.11 + * Other names may be trademarks of their respective owners.
2864.12 *
2864.13 * The contents of this file are subject to the terms of either the GNU
2864.14 * General Public License Version 2 only ("GPL") or the Common
2864.15 @@ -13,9 +16,9 @@
2864.16 * specific language governing permissions and limitations under the
2864.17 * License. When distributing the software, include this License Header
2864.18 * Notice in each file and include the License file at
2864.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2864.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2864.21 * particular file as subject to the "Classpath" exception as provided
2864.22 - * by Sun in the GPL Version 2 section of the License file that
2864.23 + * by Oracle in the GPL Version 2 section of the License file that
2864.24 * accompanied this code. If applicable, add the following below the
2864.25 * License Header, with the fields enclosed by brackets [] replaced by
2864.26 * your own identifying information:
2865.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HelpInlineRenderer.java Fri Jul 16 11:47:36 2010 -0400
2865.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HelpInlineRenderer.java Fri Jul 16 14:21:50 2010 -0400
2865.3 @@ -1,7 +1,10 @@
2865.4 /*
2865.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2865.6 *
2865.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2865.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2865.9 + *
2865.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2865.11 + * Other names may be trademarks of their respective owners.
2865.12 *
2865.13 * The contents of this file are subject to the terms of either the GNU
2865.14 * General Public License Version 2 only ("GPL") or the Common
2865.15 @@ -13,9 +16,9 @@
2865.16 * specific language governing permissions and limitations under the
2865.17 * License. When distributing the software, include this License Header
2865.18 * Notice in each file and include the License file at
2865.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2865.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2865.21 * particular file as subject to the "Classpath" exception as provided
2865.22 - * by Sun in the GPL Version 2 section of the License file that
2865.23 + * by Oracle in the GPL Version 2 section of the License file that
2865.24 * accompanied this code. If applicable, add the following below the
2865.25 * License Header, with the fields enclosed by brackets [] replaced by
2865.26 * your own identifying information:
2866.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HiddenFieldRenderer.java Fri Jul 16 11:47:36 2010 -0400
2866.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HiddenFieldRenderer.java Fri Jul 16 14:21:50 2010 -0400
2866.3 @@ -1,7 +1,10 @@
2866.4 /*
2866.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2866.6 *
2866.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2866.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2866.9 + *
2866.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2866.11 + * Other names may be trademarks of their respective owners.
2866.12 *
2866.13 * The contents of this file are subject to the terms of either the GNU
2866.14 * General Public License Version 2 only ("GPL") or the Common
2866.15 @@ -13,9 +16,9 @@
2866.16 * specific language governing permissions and limitations under the
2866.17 * License. When distributing the software, include this License Header
2866.18 * Notice in each file and include the License file at
2866.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2866.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2866.21 * particular file as subject to the "Classpath" exception as provided
2866.22 - * by Sun in the GPL Version 2 section of the License file that
2866.23 + * by Oracle in the GPL Version 2 section of the License file that
2866.24 * accompanied this code. If applicable, add the following below the
2866.25 * License Header, with the fields enclosed by brackets [] replaced by
2866.26 * your own identifying information:
2867.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HtmlRenderer.java Fri Jul 16 11:47:36 2010 -0400
2867.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HtmlRenderer.java Fri Jul 16 14:21:50 2010 -0400
2867.3 @@ -1,7 +1,10 @@
2867.4 /*
2867.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2867.6 *
2867.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2867.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2867.9 + *
2867.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2867.11 + * Other names may be trademarks of their respective owners.
2867.12 *
2867.13 * The contents of this file are subject to the terms of either the GNU
2867.14 * General Public License Version 2 only ("GPL") or the Common
2867.15 @@ -13,9 +16,9 @@
2867.16 * specific language governing permissions and limitations under the
2867.17 * License. When distributing the software, include this License Header
2867.18 * Notice in each file and include the License file at
2867.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2867.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2867.21 * particular file as subject to the "Classpath" exception as provided
2867.22 - * by Sun in the GPL Version 2 section of the License file that
2867.23 + * by Oracle in the GPL Version 2 section of the License file that
2867.24 * accompanied this code. If applicable, add the following below the
2867.25 * License Header, with the fields enclosed by brackets [] replaced by
2867.26 * your own identifying information:
2868.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HyperlinkRenderer.java Fri Jul 16 11:47:36 2010 -0400
2868.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/HyperlinkRenderer.java Fri Jul 16 14:21:50 2010 -0400
2868.3 @@ -1,7 +1,10 @@
2868.4 /*
2868.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2868.6 *
2868.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2868.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2868.9 + *
2868.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2868.11 + * Other names may be trademarks of their respective owners.
2868.12 *
2868.13 * The contents of this file are subject to the terms of either the GNU
2868.14 * General Public License Version 2 only ("GPL") or the Common
2868.15 @@ -13,9 +16,9 @@
2868.16 * specific language governing permissions and limitations under the
2868.17 * License. When distributing the software, include this License Header
2868.18 * Notice in each file and include the License file at
2868.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2868.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2868.21 * particular file as subject to the "Classpath" exception as provided
2868.22 - * by Sun in the GPL Version 2 section of the License file that
2868.23 + * by Oracle in the GPL Version 2 section of the License file that
2868.24 * accompanied this code. If applicable, add the following below the
2868.25 * License Header, with the fields enclosed by brackets [] replaced by
2868.26 * your own identifying information:
2869.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/IFrameRenderer.java Fri Jul 16 11:47:36 2010 -0400
2869.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/IFrameRenderer.java Fri Jul 16 14:21:50 2010 -0400
2869.3 @@ -1,7 +1,10 @@
2869.4 /*
2869.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2869.6 *
2869.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2869.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2869.9 + *
2869.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2869.11 + * Other names may be trademarks of their respective owners.
2869.12 *
2869.13 * The contents of this file are subject to the terms of either the GNU
2869.14 * General Public License Version 2 only ("GPL") or the Common
2869.15 @@ -13,9 +16,9 @@
2869.16 * specific language governing permissions and limitations under the
2869.17 * License. When distributing the software, include this License Header
2869.18 * Notice in each file and include the License file at
2869.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2869.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2869.21 * particular file as subject to the "Classpath" exception as provided
2869.22 - * by Sun in the GPL Version 2 section of the License file that
2869.23 + * by Oracle in the GPL Version 2 section of the License file that
2869.24 * accompanied this code. If applicable, add the following below the
2869.25 * License Header, with the fields enclosed by brackets [] replaced by
2869.26 * your own identifying information:
2870.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/IconHyperlinkRenderer.java Fri Jul 16 11:47:36 2010 -0400
2870.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/IconHyperlinkRenderer.java Fri Jul 16 14:21:50 2010 -0400
2870.3 @@ -1,7 +1,10 @@
2870.4 /*
2870.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2870.6 *
2870.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2870.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2870.9 + *
2870.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2870.11 + * Other names may be trademarks of their respective owners.
2870.12 *
2870.13 * The contents of this file are subject to the terms of either the GNU
2870.14 * General Public License Version 2 only ("GPL") or the Common
2870.15 @@ -13,9 +16,9 @@
2870.16 * specific language governing permissions and limitations under the
2870.17 * License. When distributing the software, include this License Header
2870.18 * Notice in each file and include the License file at
2870.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2870.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2870.21 * particular file as subject to the "Classpath" exception as provided
2870.22 - * by Sun in the GPL Version 2 section of the License file that
2870.23 + * by Oracle in the GPL Version 2 section of the License file that
2870.24 * accompanied this code. If applicable, add the following below the
2870.25 * License Header, with the fields enclosed by brackets [] replaced by
2870.26 * your own identifying information:
2871.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/IconRenderer.java Fri Jul 16 11:47:36 2010 -0400
2871.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/IconRenderer.java Fri Jul 16 14:21:50 2010 -0400
2871.3 @@ -1,7 +1,10 @@
2871.4 /*
2871.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2871.6 *
2871.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2871.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2871.9 + *
2871.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2871.11 + * Other names may be trademarks of their respective owners.
2871.12 *
2871.13 * The contents of this file are subject to the terms of either the GNU
2871.14 * General Public License Version 2 only ("GPL") or the Common
2871.15 @@ -13,9 +16,9 @@
2871.16 * specific language governing permissions and limitations under the
2871.17 * License. When distributing the software, include this License Header
2871.18 * Notice in each file and include the License file at
2871.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2871.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2871.21 * particular file as subject to the "Classpath" exception as provided
2871.22 - * by Sun in the GPL Version 2 section of the License file that
2871.23 + * by Oracle in the GPL Version 2 section of the License file that
2871.24 * accompanied this code. If applicable, add the following below the
2871.25 * License Header, with the fields enclosed by brackets [] replaced by
2871.26 * your own identifying information:
2872.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ImageHyperlinkRenderer.java Fri Jul 16 11:47:36 2010 -0400
2872.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ImageHyperlinkRenderer.java Fri Jul 16 14:21:50 2010 -0400
2872.3 @@ -1,7 +1,10 @@
2872.4 /*
2872.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2872.6 *
2872.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2872.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2872.9 + *
2872.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2872.11 + * Other names may be trademarks of their respective owners.
2872.12 *
2872.13 * The contents of this file are subject to the terms of either the GNU
2872.14 * General Public License Version 2 only ("GPL") or the Common
2872.15 @@ -13,9 +16,9 @@
2872.16 * specific language governing permissions and limitations under the
2872.17 * License. When distributing the software, include this License Header
2872.18 * Notice in each file and include the License file at
2872.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2872.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2872.21 * particular file as subject to the "Classpath" exception as provided
2872.22 - * by Sun in the GPL Version 2 section of the License file that
2872.23 + * by Oracle in the GPL Version 2 section of the License file that
2872.24 * accompanied this code. If applicable, add the following below the
2872.25 * License Header, with the fields enclosed by brackets [] replaced by
2872.26 * your own identifying information:
2873.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ImageRenderer.java Fri Jul 16 11:47:36 2010 -0400
2873.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ImageRenderer.java Fri Jul 16 14:21:50 2010 -0400
2873.3 @@ -1,7 +1,10 @@
2873.4 /*
2873.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2873.6 *
2873.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2873.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2873.9 + *
2873.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2873.11 + * Other names may be trademarks of their respective owners.
2873.12 *
2873.13 * The contents of this file are subject to the terms of either the GNU
2873.14 * General Public License Version 2 only ("GPL") or the Common
2873.15 @@ -13,9 +16,9 @@
2873.16 * specific language governing permissions and limitations under the
2873.17 * License. When distributing the software, include this License Header
2873.18 * Notice in each file and include the License file at
2873.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2873.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2873.21 * particular file as subject to the "Classpath" exception as provided
2873.22 - * by Sun in the GPL Version 2 section of the License file that
2873.23 + * by Oracle in the GPL Version 2 section of the License file that
2873.24 * accompanied this code. If applicable, add the following below the
2873.25 * License Header, with the fields enclosed by brackets [] replaced by
2873.26 * your own identifying information:
2874.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/LabelRenderer.java Fri Jul 16 11:47:36 2010 -0400
2874.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/LabelRenderer.java Fri Jul 16 14:21:50 2010 -0400
2874.3 @@ -1,7 +1,10 @@
2874.4 /*
2874.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2874.6 *
2874.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2874.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2874.9 + *
2874.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2874.11 + * Other names may be trademarks of their respective owners.
2874.12 *
2874.13 * The contents of this file are subject to the terms of either the GNU
2874.14 * General Public License Version 2 only ("GPL") or the Common
2874.15 @@ -13,9 +16,9 @@
2874.16 * specific language governing permissions and limitations under the
2874.17 * License. When distributing the software, include this License Header
2874.18 * Notice in each file and include the License file at
2874.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2874.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2874.21 * particular file as subject to the "Classpath" exception as provided
2874.22 - * by Sun in the GPL Version 2 section of the License file that
2874.23 + * by Oracle in the GPL Version 2 section of the License file that
2874.24 * accompanied this code. If applicable, add the following below the
2874.25 * License Header, with the fields enclosed by brackets [] replaced by
2874.26 * your own identifying information:
2875.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/LegendRenderer.java Fri Jul 16 11:47:36 2010 -0400
2875.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/LegendRenderer.java Fri Jul 16 14:21:50 2010 -0400
2875.3 @@ -1,7 +1,10 @@
2875.4 /*
2875.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2875.6 *
2875.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2875.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2875.9 + *
2875.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2875.11 + * Other names may be trademarks of their respective owners.
2875.12 *
2875.13 * The contents of this file are subject to the terms of either the GNU
2875.14 * General Public License Version 2 only ("GPL") or the Common
2875.15 @@ -13,9 +16,9 @@
2875.16 * specific language governing permissions and limitations under the
2875.17 * License. When distributing the software, include this License Header
2875.18 * Notice in each file and include the License file at
2875.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2875.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2875.21 * particular file as subject to the "Classpath" exception as provided
2875.22 - * by Sun in the GPL Version 2 section of the License file that
2875.23 + * by Oracle in the GPL Version 2 section of the License file that
2875.24 * accompanied this code. If applicable, add the following below the
2875.25 * License Header, with the fields enclosed by brackets [] replaced by
2875.26 * your own identifying information:
2876.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/LinkRenderer.java Fri Jul 16 11:47:36 2010 -0400
2876.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/LinkRenderer.java Fri Jul 16 14:21:50 2010 -0400
2876.3 @@ -1,7 +1,10 @@
2876.4 /*
2876.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2876.6 *
2876.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2876.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2876.9 + *
2876.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2876.11 + * Other names may be trademarks of their respective owners.
2876.12 *
2876.13 * The contents of this file are subject to the terms of either the GNU
2876.14 * General Public License Version 2 only ("GPL") or the Common
2876.15 @@ -13,9 +16,9 @@
2876.16 * specific language governing permissions and limitations under the
2876.17 * License. When distributing the software, include this License Header
2876.18 * Notice in each file and include the License file at
2876.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2876.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2876.21 * particular file as subject to the "Classpath" exception as provided
2876.22 - * by Sun in the GPL Version 2 section of the License file that
2876.23 + * by Oracle in the GPL Version 2 section of the License file that
2876.24 * accompanied this code. If applicable, add the following below the
2876.25 * License Header, with the fields enclosed by brackets [] replaced by
2876.26 * your own identifying information:
2877.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ListRendererBase.java Fri Jul 16 11:47:36 2010 -0400
2877.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ListRendererBase.java Fri Jul 16 14:21:50 2010 -0400
2877.3 @@ -1,7 +1,10 @@
2877.4 /*
2877.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2877.6 *
2877.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2877.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2877.9 + *
2877.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2877.11 + * Other names may be trademarks of their respective owners.
2877.12 *
2877.13 * The contents of this file are subject to the terms of either the GNU
2877.14 * General Public License Version 2 only ("GPL") or the Common
2877.15 @@ -13,9 +16,9 @@
2877.16 * specific language governing permissions and limitations under the
2877.17 * License. When distributing the software, include this License Header
2877.18 * Notice in each file and include the License file at
2877.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2877.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2877.21 * particular file as subject to the "Classpath" exception as provided
2877.22 - * by Sun in the GPL Version 2 section of the License file that
2877.23 + * by Oracle in the GPL Version 2 section of the License file that
2877.24 * accompanied this code. If applicable, add the following below the
2877.25 * License Header, with the fields enclosed by brackets [] replaced by
2877.26 * your own identifying information:
2878.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ListboxRenderer.java Fri Jul 16 11:47:36 2010 -0400
2878.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ListboxRenderer.java Fri Jul 16 14:21:50 2010 -0400
2878.3 @@ -1,7 +1,10 @@
2878.4 /*
2878.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2878.6 *
2878.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2878.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2878.9 + *
2878.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2878.11 + * Other names may be trademarks of their respective owners.
2878.12 *
2878.13 * The contents of this file are subject to the terms of either the GNU
2878.14 * General Public License Version 2 only ("GPL") or the Common
2878.15 @@ -13,9 +16,9 @@
2878.16 * specific language governing permissions and limitations under the
2878.17 * License. When distributing the software, include this License Header
2878.18 * Notice in each file and include the License file at
2878.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2878.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2878.21 * particular file as subject to the "Classpath" exception as provided
2878.22 - * by Sun in the GPL Version 2 section of the License file that
2878.23 + * by Oracle in the GPL Version 2 section of the License file that
2878.24 * accompanied this code. If applicable, add the following below the
2878.25 * License Header, with the fields enclosed by brackets [] replaced by
2878.26 * your own identifying information:
2879.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/MarkupRenderer.java Fri Jul 16 11:47:36 2010 -0400
2879.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/MarkupRenderer.java Fri Jul 16 14:21:50 2010 -0400
2879.3 @@ -1,7 +1,10 @@
2879.4 /*
2879.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2879.6 *
2879.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2879.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2879.9 + *
2879.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2879.11 + * Other names may be trademarks of their respective owners.
2879.12 *
2879.13 * The contents of this file are subject to the terms of either the GNU
2879.14 * General Public License Version 2 only ("GPL") or the Common
2879.15 @@ -13,9 +16,9 @@
2879.16 * specific language governing permissions and limitations under the
2879.17 * License. When distributing the software, include this License Header
2879.18 * Notice in each file and include the License file at
2879.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2879.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2879.21 * particular file as subject to the "Classpath" exception as provided
2879.22 - * by Sun in the GPL Version 2 section of the License file that
2879.23 + * by Oracle in the GPL Version 2 section of the License file that
2879.24 * accompanied this code. If applicable, add the following below the
2879.25 * License Header, with the fields enclosed by brackets [] replaced by
2879.26 * your own identifying information:
2880.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/MessageGroupRenderer.java Fri Jul 16 11:47:36 2010 -0400
2880.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/MessageGroupRenderer.java Fri Jul 16 14:21:50 2010 -0400
2880.3 @@ -1,7 +1,10 @@
2880.4 /*
2880.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2880.6 *
2880.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2880.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2880.9 + *
2880.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2880.11 + * Other names may be trademarks of their respective owners.
2880.12 *
2880.13 * The contents of this file are subject to the terms of either the GNU
2880.14 * General Public License Version 2 only ("GPL") or the Common
2880.15 @@ -13,9 +16,9 @@
2880.16 * specific language governing permissions and limitations under the
2880.17 * License. When distributing the software, include this License Header
2880.18 * Notice in each file and include the License file at
2880.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2880.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2880.21 * particular file as subject to the "Classpath" exception as provided
2880.22 - * by Sun in the GPL Version 2 section of the License file that
2880.23 + * by Oracle in the GPL Version 2 section of the License file that
2880.24 * accompanied this code. If applicable, add the following below the
2880.25 * License Header, with the fields enclosed by brackets [] replaced by
2880.26 * your own identifying information:
2881.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/MessageRenderer.java Fri Jul 16 11:47:36 2010 -0400
2881.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/MessageRenderer.java Fri Jul 16 14:21:50 2010 -0400
2881.3 @@ -1,7 +1,10 @@
2881.4 /*
2881.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2881.6 *
2881.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2881.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2881.9 + *
2881.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2881.11 + * Other names may be trademarks of their respective owners.
2881.12 *
2881.13 * The contents of this file are subject to the terms of either the GNU
2881.14 * General Public License Version 2 only ("GPL") or the Common
2881.15 @@ -13,9 +16,9 @@
2881.16 * specific language governing permissions and limitations under the
2881.17 * License. When distributing the software, include this License Header
2881.18 * Notice in each file and include the License file at
2881.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2881.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2881.21 * particular file as subject to the "Classpath" exception as provided
2881.22 - * by Sun in the GPL Version 2 section of the License file that
2881.23 + * by Oracle in the GPL Version 2 section of the License file that
2881.24 * accompanied this code. If applicable, add the following below the
2881.25 * License Header, with the fields enclosed by brackets [] replaced by
2881.26 * your own identifying information:
2882.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/MetaRenderer.java Fri Jul 16 11:47:36 2010 -0400
2882.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/MetaRenderer.java Fri Jul 16 14:21:50 2010 -0400
2882.3 @@ -1,7 +1,10 @@
2882.4 /*
2882.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2882.6 *
2882.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2882.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2882.9 + *
2882.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2882.11 + * Other names may be trademarks of their respective owners.
2882.12 *
2882.13 * The contents of this file are subject to the terms of either the GNU
2882.14 * General Public License Version 2 only ("GPL") or the Common
2882.15 @@ -13,9 +16,9 @@
2882.16 * specific language governing permissions and limitations under the
2882.17 * License. When distributing the software, include this License Header
2882.18 * Notice in each file and include the License file at
2882.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2882.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2882.21 * particular file as subject to the "Classpath" exception as provided
2882.22 - * by Sun in the GPL Version 2 section of the License file that
2882.23 + * by Oracle in the GPL Version 2 section of the License file that
2882.24 * accompanied this code. If applicable, add the following below the
2882.25 * License Header, with the fields enclosed by brackets [] replaced by
2882.26 * your own identifying information:
2883.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/OrderableListRenderer.java Fri Jul 16 11:47:36 2010 -0400
2883.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/OrderableListRenderer.java Fri Jul 16 14:21:50 2010 -0400
2883.3 @@ -1,7 +1,10 @@
2883.4 /*
2883.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2883.6 *
2883.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2883.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2883.9 + *
2883.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2883.11 + * Other names may be trademarks of their respective owners.
2883.12 *
2883.13 * The contents of this file are subject to the terms of either the GNU
2883.14 * General Public License Version 2 only ("GPL") or the Common
2883.15 @@ -13,9 +16,9 @@
2883.16 * specific language governing permissions and limitations under the
2883.17 * License. When distributing the software, include this License Header
2883.18 * Notice in each file and include the License file at
2883.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2883.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2883.21 * particular file as subject to the "Classpath" exception as provided
2883.22 - * by Sun in the GPL Version 2 section of the License file that
2883.23 + * by Oracle in the GPL Version 2 section of the License file that
2883.24 * accompanied this code. If applicable, add the following below the
2883.25 * License Header, with the fields enclosed by brackets [] replaced by
2883.26 * your own identifying information:
2884.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PageAlertRenderer.java Fri Jul 16 11:47:36 2010 -0400
2884.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PageAlertRenderer.java Fri Jul 16 14:21:50 2010 -0400
2884.3 @@ -1,7 +1,10 @@
2884.4 /*
2884.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2884.6 *
2884.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2884.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2884.9 + *
2884.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2884.11 + * Other names may be trademarks of their respective owners.
2884.12 *
2884.13 * The contents of this file are subject to the terms of either the GNU
2884.14 * General Public License Version 2 only ("GPL") or the Common
2884.15 @@ -13,9 +16,9 @@
2884.16 * specific language governing permissions and limitations under the
2884.17 * License. When distributing the software, include this License Header
2884.18 * Notice in each file and include the License file at
2884.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2884.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2884.21 * particular file as subject to the "Classpath" exception as provided
2884.22 - * by Sun in the GPL Version 2 section of the License file that
2884.23 + * by Oracle in the GPL Version 2 section of the License file that
2884.24 * accompanied this code. If applicable, add the following below the
2884.25 * License Header, with the fields enclosed by brackets [] replaced by
2884.26 * your own identifying information:
2885.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PageRenderer.java Fri Jul 16 11:47:36 2010 -0400
2885.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PageRenderer.java Fri Jul 16 14:21:50 2010 -0400
2885.3 @@ -1,7 +1,10 @@
2885.4 /*
2885.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2885.6 *
2885.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2885.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2885.9 + *
2885.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2885.11 + * Other names may be trademarks of their respective owners.
2885.12 *
2885.13 * The contents of this file are subject to the terms of either the GNU
2885.14 * General Public License Version 2 only ("GPL") or the Common
2885.15 @@ -13,9 +16,9 @@
2885.16 * specific language governing permissions and limitations under the
2885.17 * License. When distributing the software, include this License Header
2885.18 * Notice in each file and include the License file at
2885.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2885.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2885.21 * particular file as subject to the "Classpath" exception as provided
2885.22 - * by Sun in the GPL Version 2 section of the License file that
2885.23 + * by Oracle in the GPL Version 2 section of the License file that
2885.24 * accompanied this code. If applicable, add the following below the
2885.25 * License Header, with the fields enclosed by brackets [] replaced by
2885.26 * your own identifying information:
2886.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PageSeparatorRenderer.java Fri Jul 16 11:47:36 2010 -0400
2886.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PageSeparatorRenderer.java Fri Jul 16 14:21:50 2010 -0400
2886.3 @@ -1,7 +1,10 @@
2886.4 /*
2886.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2886.6 *
2886.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2886.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2886.9 + *
2886.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2886.11 + * Other names may be trademarks of their respective owners.
2886.12 *
2886.13 * The contents of this file are subject to the terms of either the GNU
2886.14 * General Public License Version 2 only ("GPL") or the Common
2886.15 @@ -13,9 +16,9 @@
2886.16 * specific language governing permissions and limitations under the
2886.17 * License. When distributing the software, include this License Header
2886.18 * Notice in each file and include the License file at
2886.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2886.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2886.21 * particular file as subject to the "Classpath" exception as provided
2886.22 - * by Sun in the GPL Version 2 section of the License file that
2886.23 + * by Oracle in the GPL Version 2 section of the License file that
2886.24 * accompanied this code. If applicable, add the following below the
2886.25 * License Header, with the fields enclosed by brackets [] replaced by
2886.26 * your own identifying information:
2887.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PanelGroupRenderer.java Fri Jul 16 11:47:36 2010 -0400
2887.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PanelGroupRenderer.java Fri Jul 16 14:21:50 2010 -0400
2887.3 @@ -1,7 +1,10 @@
2887.4 /*
2887.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2887.6 *
2887.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2887.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2887.9 + *
2887.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2887.11 + * Other names may be trademarks of their respective owners.
2887.12 *
2887.13 * The contents of this file are subject to the terms of either the GNU
2887.14 * General Public License Version 2 only ("GPL") or the Common
2887.15 @@ -13,9 +16,9 @@
2887.16 * specific language governing permissions and limitations under the
2887.17 * License. When distributing the software, include this License Header
2887.18 * Notice in each file and include the License file at
2887.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2887.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2887.21 * particular file as subject to the "Classpath" exception as provided
2887.22 - * by Sun in the GPL Version 2 section of the License file that
2887.23 + * by Oracle in the GPL Version 2 section of the License file that
2887.24 * accompanied this code. If applicable, add the following below the
2887.25 * License Header, with the fields enclosed by brackets [] replaced by
2887.26 * your own identifying information:
2888.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PanelLayoutRenderer.java Fri Jul 16 11:47:36 2010 -0400
2888.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PanelLayoutRenderer.java Fri Jul 16 14:21:50 2010 -0400
2888.3 @@ -1,7 +1,10 @@
2888.4 /*
2888.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2888.6 *
2888.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2888.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2888.9 + *
2888.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2888.11 + * Other names may be trademarks of their respective owners.
2888.12 *
2888.13 * The contents of this file are subject to the terms of either the GNU
2888.14 * General Public License Version 2 only ("GPL") or the Common
2888.15 @@ -13,9 +16,9 @@
2888.16 * specific language governing permissions and limitations under the
2888.17 * License. When distributing the software, include this License Header
2888.18 * Notice in each file and include the License file at
2888.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2888.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2888.21 * particular file as subject to the "Classpath" exception as provided
2888.22 - * by Sun in the GPL Version 2 section of the License file that
2888.23 + * by Oracle in the GPL Version 2 section of the License file that
2888.24 * accompanied this code. If applicable, add the following below the
2888.25 * License Header, with the fields enclosed by brackets [] replaced by
2888.26 * your own identifying information:
2889.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PasswordFieldRenderer.java Fri Jul 16 11:47:36 2010 -0400
2889.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PasswordFieldRenderer.java Fri Jul 16 14:21:50 2010 -0400
2889.3 @@ -1,7 +1,10 @@
2889.4 /*
2889.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2889.6 *
2889.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2889.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2889.9 + *
2889.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2889.11 + * Other names may be trademarks of their respective owners.
2889.12 *
2889.13 * The contents of this file are subject to the terms of either the GNU
2889.14 * General Public License Version 2 only ("GPL") or the Common
2889.15 @@ -13,9 +16,9 @@
2889.16 * specific language governing permissions and limitations under the
2889.17 * License. When distributing the software, include this License Header
2889.18 * Notice in each file and include the License file at
2889.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2889.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2889.21 * particular file as subject to the "Classpath" exception as provided
2889.22 - * by Sun in the GPL Version 2 section of the License file that
2889.23 + * by Oracle in the GPL Version 2 section of the License file that
2889.24 * accompanied this code. If applicable, add the following below the
2889.25 * License Header, with the fields enclosed by brackets [] replaced by
2889.26 * your own identifying information:
2890.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PropertyRenderer.java Fri Jul 16 11:47:36 2010 -0400
2890.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PropertyRenderer.java Fri Jul 16 14:21:50 2010 -0400
2890.3 @@ -1,7 +1,10 @@
2890.4 /*
2890.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2890.6 *
2890.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2890.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2890.9 + *
2890.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2890.11 + * Other names may be trademarks of their respective owners.
2890.12 *
2890.13 * The contents of this file are subject to the terms of either the GNU
2890.14 * General Public License Version 2 only ("GPL") or the Common
2890.15 @@ -13,9 +16,9 @@
2890.16 * specific language governing permissions and limitations under the
2890.17 * License. When distributing the software, include this License Header
2890.18 * Notice in each file and include the License file at
2890.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2890.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2890.21 * particular file as subject to the "Classpath" exception as provided
2890.22 - * by Sun in the GPL Version 2 section of the License file that
2890.23 + * by Oracle in the GPL Version 2 section of the License file that
2890.24 * accompanied this code. If applicable, add the following below the
2890.25 * License Header, with the fields enclosed by brackets [] replaced by
2890.26 * your own identifying information:
2891.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PropertySheetRenderer.java Fri Jul 16 11:47:36 2010 -0400
2891.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PropertySheetRenderer.java Fri Jul 16 14:21:50 2010 -0400
2891.3 @@ -1,7 +1,10 @@
2891.4 /*
2891.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2891.6 *
2891.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2891.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2891.9 + *
2891.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2891.11 + * Other names may be trademarks of their respective owners.
2891.12 *
2891.13 * The contents of this file are subject to the terms of either the GNU
2891.14 * General Public License Version 2 only ("GPL") or the Common
2891.15 @@ -13,9 +16,9 @@
2891.16 * specific language governing permissions and limitations under the
2891.17 * License. When distributing the software, include this License Header
2891.18 * Notice in each file and include the License file at
2891.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2891.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2891.21 * particular file as subject to the "Classpath" exception as provided
2891.22 - * by Sun in the GPL Version 2 section of the License file that
2891.23 + * by Oracle in the GPL Version 2 section of the License file that
2891.24 * accompanied this code. If applicable, add the following below the
2891.25 * License Header, with the fields enclosed by brackets [] replaced by
2891.26 * your own identifying information:
2892.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PropertySheetSectionRenderer.java Fri Jul 16 11:47:36 2010 -0400
2892.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/PropertySheetSectionRenderer.java Fri Jul 16 14:21:50 2010 -0400
2892.3 @@ -1,7 +1,10 @@
2892.4 /*
2892.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2892.6 *
2892.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2892.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2892.9 + *
2892.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2892.11 + * Other names may be trademarks of their respective owners.
2892.12 *
2892.13 * The contents of this file are subject to the terms of either the GNU
2892.14 * General Public License Version 2 only ("GPL") or the Common
2892.15 @@ -13,9 +16,9 @@
2892.16 * specific language governing permissions and limitations under the
2892.17 * License. When distributing the software, include this License Header
2892.18 * Notice in each file and include the License file at
2892.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2892.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2892.21 * particular file as subject to the "Classpath" exception as provided
2892.22 - * by Sun in the GPL Version 2 section of the License file that
2892.23 + * by Oracle in the GPL Version 2 section of the License file that
2892.24 * accompanied this code. If applicable, add the following below the
2892.25 * License Header, with the fields enclosed by brackets [] replaced by
2892.26 * your own identifying information:
2893.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/RadioButtonGroupRenderer.java Fri Jul 16 11:47:36 2010 -0400
2893.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/RadioButtonGroupRenderer.java Fri Jul 16 14:21:50 2010 -0400
2893.3 @@ -1,7 +1,10 @@
2893.4 /*
2893.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2893.6 *
2893.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2893.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2893.9 + *
2893.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2893.11 + * Other names may be trademarks of their respective owners.
2893.12 *
2893.13 * The contents of this file are subject to the terms of either the GNU
2893.14 * General Public License Version 2 only ("GPL") or the Common
2893.15 @@ -13,9 +16,9 @@
2893.16 * specific language governing permissions and limitations under the
2893.17 * License. When distributing the software, include this License Header
2893.18 * Notice in each file and include the License file at
2893.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2893.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2893.21 * particular file as subject to the "Classpath" exception as provided
2893.22 - * by Sun in the GPL Version 2 section of the License file that
2893.23 + * by Oracle in the GPL Version 2 section of the License file that
2893.24 * accompanied this code. If applicable, add the following below the
2893.25 * License Header, with the fields enclosed by brackets [] replaced by
2893.26 * your own identifying information:
2894.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/RadioButtonRenderer.java Fri Jul 16 11:47:36 2010 -0400
2894.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/RadioButtonRenderer.java Fri Jul 16 14:21:50 2010 -0400
2894.3 @@ -1,7 +1,10 @@
2894.4 /*
2894.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2894.6 *
2894.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2894.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2894.9 + *
2894.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2894.11 + * Other names may be trademarks of their respective owners.
2894.12 *
2894.13 * The contents of this file are subject to the terms of either the GNU
2894.14 * General Public License Version 2 only ("GPL") or the Common
2894.15 @@ -13,9 +16,9 @@
2894.16 * specific language governing permissions and limitations under the
2894.17 * License. When distributing the software, include this License Header
2894.18 * Notice in each file and include the License file at
2894.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2894.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2894.21 * particular file as subject to the "Classpath" exception as provided
2894.22 - * by Sun in the GPL Version 2 section of the License file that
2894.23 + * by Oracle in the GPL Version 2 section of the License file that
2894.24 * accompanied this code. If applicable, add the following below the
2894.25 * License Header, with the fields enclosed by brackets [] replaced by
2894.26 * your own identifying information:
2895.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/RbCbRendererBase.java Fri Jul 16 11:47:36 2010 -0400
2895.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/RbCbRendererBase.java Fri Jul 16 14:21:50 2010 -0400
2895.3 @@ -1,7 +1,10 @@
2895.4 /*
2895.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2895.6 *
2895.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2895.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2895.9 + *
2895.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2895.11 + * Other names may be trademarks of their respective owners.
2895.12 *
2895.13 * The contents of this file are subject to the terms of either the GNU
2895.14 * General Public License Version 2 only ("GPL") or the Common
2895.15 @@ -13,9 +16,9 @@
2895.16 * specific language governing permissions and limitations under the
2895.17 * License. When distributing the software, include this License Header
2895.18 * Notice in each file and include the License file at
2895.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2895.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2895.21 * particular file as subject to the "Classpath" exception as provided
2895.22 - * by Sun in the GPL Version 2 section of the License file that
2895.23 + * by Oracle in the GPL Version 2 section of the License file that
2895.24 * accompanied this code. If applicable, add the following below the
2895.25 * License Header, with the fields enclosed by brackets [] replaced by
2895.26 * your own identifying information:
2896.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/RowColumnRenderer.java Fri Jul 16 11:47:36 2010 -0400
2896.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/RowColumnRenderer.java Fri Jul 16 14:21:50 2010 -0400
2896.3 @@ -1,7 +1,10 @@
2896.4 /*
2896.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2896.6 *
2896.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2896.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2896.9 + *
2896.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2896.11 + * Other names may be trademarks of their respective owners.
2896.12 *
2896.13 * The contents of this file are subject to the terms of either the GNU
2896.14 * General Public License Version 2 only ("GPL") or the Common
2896.15 @@ -13,9 +16,9 @@
2896.16 * specific language governing permissions and limitations under the
2896.17 * License. When distributing the software, include this License Header
2896.18 * Notice in each file and include the License file at
2896.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2896.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2896.21 * particular file as subject to the "Classpath" exception as provided
2896.22 - * by Sun in the GPL Version 2 section of the License file that
2896.23 + * by Oracle in the GPL Version 2 section of the License file that
2896.24 * accompanied this code. If applicable, add the following below the
2896.25 * License Header, with the fields enclosed by brackets [] replaced by
2896.26 * your own identifying information:
2897.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ScriptRenderer.java Fri Jul 16 11:47:36 2010 -0400
2897.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ScriptRenderer.java Fri Jul 16 14:21:50 2010 -0400
2897.3 @@ -1,7 +1,10 @@
2897.4 /*
2897.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2897.6 *
2897.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2897.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2897.9 + *
2897.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2897.11 + * Other names may be trademarks of their respective owners.
2897.12 *
2897.13 * The contents of this file are subject to the terms of either the GNU
2897.14 * General Public License Version 2 only ("GPL") or the Common
2897.15 @@ -13,9 +16,9 @@
2897.16 * specific language governing permissions and limitations under the
2897.17 * License. When distributing the software, include this License Header
2897.18 * Notice in each file and include the License file at
2897.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2897.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2897.21 * particular file as subject to the "Classpath" exception as provided
2897.22 - * by Sun in the GPL Version 2 section of the License file that
2897.23 + * by Oracle in the GPL Version 2 section of the License file that
2897.24 * accompanied this code. If applicable, add the following below the
2897.25 * License Header, with the fields enclosed by brackets [] replaced by
2897.26 * your own identifying information:
2898.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/SelectRenderer.java Fri Jul 16 11:47:36 2010 -0400
2898.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/SelectRenderer.java Fri Jul 16 14:21:50 2010 -0400
2898.3 @@ -1,7 +1,10 @@
2898.4 /*
2898.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2898.6 *
2898.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2898.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2898.9 + *
2898.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2898.11 + * Other names may be trademarks of their respective owners.
2898.12 *
2898.13 * The contents of this file are subject to the terms of either the GNU
2898.14 * General Public License Version 2 only ("GPL") or the Common
2898.15 @@ -13,9 +16,9 @@
2898.16 * specific language governing permissions and limitations under the
2898.17 * License. When distributing the software, include this License Header
2898.18 * Notice in each file and include the License file at
2898.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2898.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2898.21 * particular file as subject to the "Classpath" exception as provided
2898.22 - * by Sun in the GPL Version 2 section of the License file that
2898.23 + * by Oracle in the GPL Version 2 section of the License file that
2898.24 * accompanied this code. If applicable, add the following below the
2898.25 * License Header, with the fields enclosed by brackets [] replaced by
2898.26 * your own identifying information:
2899.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/SelectorGroupRenderer.java Fri Jul 16 11:47:36 2010 -0400
2899.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/SelectorGroupRenderer.java Fri Jul 16 14:21:50 2010 -0400
2899.3 @@ -1,7 +1,10 @@
2899.4 /*
2899.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2899.6 *
2899.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2899.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2899.9 + *
2899.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2899.11 + * Other names may be trademarks of their respective owners.
2899.12 *
2899.13 * The contents of this file are subject to the terms of either the GNU
2899.14 * General Public License Version 2 only ("GPL") or the Common
2899.15 @@ -13,9 +16,9 @@
2899.16 * specific language governing permissions and limitations under the
2899.17 * License. When distributing the software, include this License Header
2899.18 * Notice in each file and include the License file at
2899.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2899.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2899.21 * particular file as subject to the "Classpath" exception as provided
2899.22 - * by Sun in the GPL Version 2 section of the License file that
2899.23 + * by Oracle in the GPL Version 2 section of the License file that
2899.24 * accompanied this code. If applicable, add the following below the
2899.25 * License Header, with the fields enclosed by brackets [] replaced by
2899.26 * your own identifying information:
2900.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/SkipHyperlinkRenderer.java Fri Jul 16 11:47:36 2010 -0400
2900.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/SkipHyperlinkRenderer.java Fri Jul 16 14:21:50 2010 -0400
2900.3 @@ -1,7 +1,10 @@
2900.4 /*
2900.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2900.6 *
2900.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2900.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2900.9 + *
2900.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2900.11 + * Other names may be trademarks of their respective owners.
2900.12 *
2900.13 * The contents of this file are subject to the terms of either the GNU
2900.14 * General Public License Version 2 only ("GPL") or the Common
2900.15 @@ -13,9 +16,9 @@
2900.16 * specific language governing permissions and limitations under the
2900.17 * License. When distributing the software, include this License Header
2900.18 * Notice in each file and include the License file at
2900.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2900.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2900.21 * particular file as subject to the "Classpath" exception as provided
2900.22 - * by Sun in the GPL Version 2 section of the License file that
2900.23 + * by Oracle in the GPL Version 2 section of the License file that
2900.24 * accompanied this code. If applicable, add the following below the
2900.25 * License Header, with the fields enclosed by brackets [] replaced by
2900.26 * your own identifying information:
2901.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/StaticTextRenderer.java Fri Jul 16 11:47:36 2010 -0400
2901.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/StaticTextRenderer.java Fri Jul 16 14:21:50 2010 -0400
2901.3 @@ -1,7 +1,10 @@
2901.4 /*
2901.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2901.6 *
2901.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2901.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2901.9 + *
2901.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2901.11 + * Other names may be trademarks of their respective owners.
2901.12 *
2901.13 * The contents of this file are subject to the terms of either the GNU
2901.14 * General Public License Version 2 only ("GPL") or the Common
2901.15 @@ -13,9 +16,9 @@
2901.16 * specific language governing permissions and limitations under the
2901.17 * License. When distributing the software, include this License Header
2901.18 * Notice in each file and include the License file at
2901.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2901.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2901.21 * particular file as subject to the "Classpath" exception as provided
2901.22 - * by Sun in the GPL Version 2 section of the License file that
2901.23 + * by Oracle in the GPL Version 2 section of the License file that
2901.24 * accompanied this code. If applicable, add the following below the
2901.25 * License Header, with the fields enclosed by brackets [] replaced by
2901.26 * your own identifying information:
2902.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TabRenderer.java Fri Jul 16 11:47:36 2010 -0400
2902.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TabRenderer.java Fri Jul 16 14:21:50 2010 -0400
2902.3 @@ -1,7 +1,10 @@
2902.4 /*
2902.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2902.6 *
2902.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2902.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2902.9 + *
2902.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2902.11 + * Other names may be trademarks of their respective owners.
2902.12 *
2902.13 * The contents of this file are subject to the terms of either the GNU
2902.14 * General Public License Version 2 only ("GPL") or the Common
2902.15 @@ -13,9 +16,9 @@
2902.16 * specific language governing permissions and limitations under the
2902.17 * License. When distributing the software, include this License Header
2902.18 * Notice in each file and include the License file at
2902.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2902.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2902.21 * particular file as subject to the "Classpath" exception as provided
2902.22 - * by Sun in the GPL Version 2 section of the License file that
2902.23 + * by Oracle in the GPL Version 2 section of the License file that
2902.24 * accompanied this code. If applicable, add the following below the
2902.25 * License Header, with the fields enclosed by brackets [] replaced by
2902.26 * your own identifying information:
2903.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TabSetRenderer.java Fri Jul 16 11:47:36 2010 -0400
2903.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TabSetRenderer.java Fri Jul 16 14:21:50 2010 -0400
2903.3 @@ -1,7 +1,10 @@
2903.4 /*
2903.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2903.6 *
2903.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2903.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2903.9 + *
2903.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2903.11 + * Other names may be trademarks of their respective owners.
2903.12 *
2903.13 * The contents of this file are subject to the terms of either the GNU
2903.14 * General Public License Version 2 only ("GPL") or the Common
2903.15 @@ -13,9 +16,9 @@
2903.16 * specific language governing permissions and limitations under the
2903.17 * License. When distributing the software, include this License Header
2903.18 * Notice in each file and include the License file at
2903.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2903.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2903.21 * particular file as subject to the "Classpath" exception as provided
2903.22 - * by Sun in the GPL Version 2 section of the License file that
2903.23 + * by Oracle in the GPL Version 2 section of the License file that
2903.24 * accompanied this code. If applicable, add the following below the
2903.25 * License Header, with the fields enclosed by brackets [] replaced by
2903.26 * your own identifying information:
2904.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableActionsRenderer.java Fri Jul 16 11:47:36 2010 -0400
2904.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableActionsRenderer.java Fri Jul 16 14:21:50 2010 -0400
2904.3 @@ -1,7 +1,10 @@
2904.4 /*
2904.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2904.6 *
2904.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2904.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2904.9 + *
2904.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2904.11 + * Other names may be trademarks of their respective owners.
2904.12 *
2904.13 * The contents of this file are subject to the terms of either the GNU
2904.14 * General Public License Version 2 only ("GPL") or the Common
2904.15 @@ -13,9 +16,9 @@
2904.16 * specific language governing permissions and limitations under the
2904.17 * License. When distributing the software, include this License Header
2904.18 * Notice in each file and include the License file at
2904.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2904.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2904.21 * particular file as subject to the "Classpath" exception as provided
2904.22 - * by Sun in the GPL Version 2 section of the License file that
2904.23 + * by Oracle in the GPL Version 2 section of the License file that
2904.24 * accompanied this code. If applicable, add the following below the
2904.25 * License Header, with the fields enclosed by brackets [] replaced by
2904.26 * your own identifying information:
2905.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableColumnRenderer.java Fri Jul 16 11:47:36 2010 -0400
2905.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableColumnRenderer.java Fri Jul 16 14:21:50 2010 -0400
2905.3 @@ -1,7 +1,10 @@
2905.4 /*
2905.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2905.6 *
2905.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2905.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2905.9 + *
2905.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2905.11 + * Other names may be trademarks of their respective owners.
2905.12 *
2905.13 * The contents of this file are subject to the terms of either the GNU
2905.14 * General Public License Version 2 only ("GPL") or the Common
2905.15 @@ -13,9 +16,9 @@
2905.16 * specific language governing permissions and limitations under the
2905.17 * License. When distributing the software, include this License Header
2905.18 * Notice in each file and include the License file at
2905.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2905.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2905.21 * particular file as subject to the "Classpath" exception as provided
2905.22 - * by Sun in the GPL Version 2 section of the License file that
2905.23 + * by Oracle in the GPL Version 2 section of the License file that
2905.24 * accompanied this code. If applicable, add the following below the
2905.25 * License Header, with the fields enclosed by brackets [] replaced by
2905.26 * your own identifying information:
2906.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableFooterRenderer.java Fri Jul 16 11:47:36 2010 -0400
2906.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableFooterRenderer.java Fri Jul 16 14:21:50 2010 -0400
2906.3 @@ -1,7 +1,10 @@
2906.4 /*
2906.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2906.6 *
2906.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2906.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2906.9 + *
2906.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2906.11 + * Other names may be trademarks of their respective owners.
2906.12 *
2906.13 * The contents of this file are subject to the terms of either the GNU
2906.14 * General Public License Version 2 only ("GPL") or the Common
2906.15 @@ -13,9 +16,9 @@
2906.16 * specific language governing permissions and limitations under the
2906.17 * License. When distributing the software, include this License Header
2906.18 * Notice in each file and include the License file at
2906.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2906.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2906.21 * particular file as subject to the "Classpath" exception as provided
2906.22 - * by Sun in the GPL Version 2 section of the License file that
2906.23 + * by Oracle in the GPL Version 2 section of the License file that
2906.24 * accompanied this code. If applicable, add the following below the
2906.25 * License Header, with the fields enclosed by brackets [] replaced by
2906.26 * your own identifying information:
2907.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableHeaderRenderer.java Fri Jul 16 11:47:36 2010 -0400
2907.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableHeaderRenderer.java Fri Jul 16 14:21:50 2010 -0400
2907.3 @@ -1,7 +1,10 @@
2907.4 /*
2907.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2907.6 *
2907.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2907.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2907.9 + *
2907.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2907.11 + * Other names may be trademarks of their respective owners.
2907.12 *
2907.13 * The contents of this file are subject to the terms of either the GNU
2907.14 * General Public License Version 2 only ("GPL") or the Common
2907.15 @@ -13,9 +16,9 @@
2907.16 * specific language governing permissions and limitations under the
2907.17 * License. When distributing the software, include this License Header
2907.18 * Notice in each file and include the License file at
2907.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2907.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2907.21 * particular file as subject to the "Classpath" exception as provided
2907.22 - * by Sun in the GPL Version 2 section of the License file that
2907.23 + * by Oracle in the GPL Version 2 section of the License file that
2907.24 * accompanied this code. If applicable, add the following below the
2907.25 * License Header, with the fields enclosed by brackets [] replaced by
2907.26 * your own identifying information:
2908.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TablePanelsRenderer.java Fri Jul 16 11:47:36 2010 -0400
2908.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TablePanelsRenderer.java Fri Jul 16 14:21:50 2010 -0400
2908.3 @@ -1,7 +1,10 @@
2908.4 /*
2908.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2908.6 *
2908.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2908.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2908.9 + *
2908.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2908.11 + * Other names may be trademarks of their respective owners.
2908.12 *
2908.13 * The contents of this file are subject to the terms of either the GNU
2908.14 * General Public License Version 2 only ("GPL") or the Common
2908.15 @@ -13,9 +16,9 @@
2908.16 * specific language governing permissions and limitations under the
2908.17 * License. When distributing the software, include this License Header
2908.18 * Notice in each file and include the License file at
2908.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2908.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2908.21 * particular file as subject to the "Classpath" exception as provided
2908.22 - * by Sun in the GPL Version 2 section of the License file that
2908.23 + * by Oracle in the GPL Version 2 section of the License file that
2908.24 * accompanied this code. If applicable, add the following below the
2908.25 * License Header, with the fields enclosed by brackets [] replaced by
2908.26 * your own identifying information:
2909.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableRenderer.java Fri Jul 16 11:47:36 2010 -0400
2909.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableRenderer.java Fri Jul 16 14:21:50 2010 -0400
2909.3 @@ -1,7 +1,10 @@
2909.4 /*
2909.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2909.6 *
2909.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2909.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2909.9 + *
2909.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2909.11 + * Other names may be trademarks of their respective owners.
2909.12 *
2909.13 * The contents of this file are subject to the terms of either the GNU
2909.14 * General Public License Version 2 only ("GPL") or the Common
2909.15 @@ -13,9 +16,9 @@
2909.16 * specific language governing permissions and limitations under the
2909.17 * License. When distributing the software, include this License Header
2909.18 * Notice in each file and include the License file at
2909.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2909.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2909.21 * particular file as subject to the "Classpath" exception as provided
2909.22 - * by Sun in the GPL Version 2 section of the License file that
2909.23 + * by Oracle in the GPL Version 2 section of the License file that
2909.24 * accompanied this code. If applicable, add the following below the
2909.25 * License Header, with the fields enclosed by brackets [] replaced by
2909.26 * your own identifying information:
2910.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableRowGroupRenderer.java Fri Jul 16 11:47:36 2010 -0400
2910.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TableRowGroupRenderer.java Fri Jul 16 14:21:50 2010 -0400
2910.3 @@ -1,7 +1,10 @@
2910.4 /*
2910.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2910.6 *
2910.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2910.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2910.9 + *
2910.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2910.11 + * Other names may be trademarks of their respective owners.
2910.12 *
2910.13 * The contents of this file are subject to the terms of either the GNU
2910.14 * General Public License Version 2 only ("GPL") or the Common
2910.15 @@ -13,9 +16,9 @@
2910.16 * specific language governing permissions and limitations under the
2910.17 * License. When distributing the software, include this License Header
2910.18 * Notice in each file and include the License file at
2910.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2910.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2910.21 * particular file as subject to the "Classpath" exception as provided
2910.22 - * by Sun in the GPL Version 2 section of the License file that
2910.23 + * by Oracle in the GPL Version 2 section of the License file that
2910.24 * accompanied this code. If applicable, add the following below the
2910.25 * License Header, with the fields enclosed by brackets [] replaced by
2910.26 * your own identifying information:
2911.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TextAreaRenderer.java Fri Jul 16 11:47:36 2010 -0400
2911.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TextAreaRenderer.java Fri Jul 16 14:21:50 2010 -0400
2911.3 @@ -1,7 +1,10 @@
2911.4 /*
2911.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2911.6 *
2911.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2911.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2911.9 + *
2911.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2911.11 + * Other names may be trademarks of their respective owners.
2911.12 *
2911.13 * The contents of this file are subject to the terms of either the GNU
2911.14 * General Public License Version 2 only ("GPL") or the Common
2911.15 @@ -13,9 +16,9 @@
2911.16 * specific language governing permissions and limitations under the
2911.17 * License. When distributing the software, include this License Header
2911.18 * Notice in each file and include the License file at
2911.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2911.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2911.21 * particular file as subject to the "Classpath" exception as provided
2911.22 - * by Sun in the GPL Version 2 section of the License file that
2911.23 + * by Oracle in the GPL Version 2 section of the License file that
2911.24 * accompanied this code. If applicable, add the following below the
2911.25 * License Header, with the fields enclosed by brackets [] replaced by
2911.26 * your own identifying information:
2912.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TextFieldRenderer.java Fri Jul 16 11:47:36 2010 -0400
2912.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TextFieldRenderer.java Fri Jul 16 14:21:50 2010 -0400
2912.3 @@ -1,7 +1,10 @@
2912.4 /*
2912.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2912.6 *
2912.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2912.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2912.9 + *
2912.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2912.11 + * Other names may be trademarks of their respective owners.
2912.12 *
2912.13 * The contents of this file are subject to the terms of either the GNU
2912.14 * General Public License Version 2 only ("GPL") or the Common
2912.15 @@ -13,9 +16,9 @@
2912.16 * specific language governing permissions and limitations under the
2912.17 * License. When distributing the software, include this License Header
2912.18 * Notice in each file and include the License file at
2912.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2912.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2912.21 * particular file as subject to the "Classpath" exception as provided
2912.22 - * by Sun in the GPL Version 2 section of the License file that
2912.23 + * by Oracle in the GPL Version 2 section of the License file that
2912.24 * accompanied this code. If applicable, add the following below the
2912.25 * License Header, with the fields enclosed by brackets [] replaced by
2912.26 * your own identifying information:
2913.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ThemeLinksRenderer.java Fri Jul 16 11:47:36 2010 -0400
2913.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/ThemeLinksRenderer.java Fri Jul 16 14:21:50 2010 -0400
2913.3 @@ -1,7 +1,10 @@
2913.4 /*
2913.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2913.6 *
2913.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2913.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2913.9 + *
2913.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2913.11 + * Other names may be trademarks of their respective owners.
2913.12 *
2913.13 * The contents of this file are subject to the terms of either the GNU
2913.14 * General Public License Version 2 only ("GPL") or the Common
2913.15 @@ -13,9 +16,9 @@
2913.16 * specific language governing permissions and limitations under the
2913.17 * License. When distributing the software, include this License Header
2913.18 * Notice in each file and include the License file at
2913.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2913.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2913.21 * particular file as subject to the "Classpath" exception as provided
2913.22 - * by Sun in the GPL Version 2 section of the License file that
2913.23 + * by Oracle in the GPL Version 2 section of the License file that
2913.24 * accompanied this code. If applicable, add the following below the
2913.25 * License Header, with the fields enclosed by brackets [] replaced by
2913.26 * your own identifying information:
2914.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TimeRenderer.java Fri Jul 16 11:47:36 2010 -0400
2914.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/TimeRenderer.java Fri Jul 16 14:21:50 2010 -0400
2914.3 @@ -1,7 +1,10 @@
2914.4 /*
2914.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2914.6 *
2914.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2914.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2914.9 + *
2914.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2914.11 + * Other names may be trademarks of their respective owners.
2914.12 *
2914.13 * The contents of this file are subject to the terms of either the GNU
2914.14 * General Public License Version 2 only ("GPL") or the Common
2914.15 @@ -13,9 +16,9 @@
2914.16 * specific language governing permissions and limitations under the
2914.17 * License. When distributing the software, include this License Header
2914.18 * Notice in each file and include the License file at
2914.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2914.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2914.21 * particular file as subject to the "Classpath" exception as provided
2914.22 - * by Sun in the GPL Version 2 section of the License file that
2914.23 + * by Oracle in the GPL Version 2 section of the License file that
2914.24 * accompanied this code. If applicable, add the following below the
2914.25 * License Header, with the fields enclosed by brackets [] replaced by
2914.26 * your own identifying information:
2915.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/UploadRenderer.java Fri Jul 16 11:47:36 2010 -0400
2915.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/UploadRenderer.java Fri Jul 16 14:21:50 2010 -0400
2915.3 @@ -1,7 +1,10 @@
2915.4 /*
2915.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2915.6 *
2915.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2915.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2915.9 + *
2915.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2915.11 + * Other names may be trademarks of their respective owners.
2915.12 *
2915.13 * The contents of this file are subject to the terms of either the GNU
2915.14 * General Public License Version 2 only ("GPL") or the Common
2915.15 @@ -13,9 +16,9 @@
2915.16 * specific language governing permissions and limitations under the
2915.17 * License. When distributing the software, include this License Header
2915.18 * Notice in each file and include the License file at
2915.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2915.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2915.21 * particular file as subject to the "Classpath" exception as provided
2915.22 - * by Sun in the GPL Version 2 section of the License file that
2915.23 + * by Oracle in the GPL Version 2 section of the License file that
2915.24 * accompanied this code. If applicable, add the following below the
2915.25 * License Header, with the fields enclosed by brackets [] replaced by
2915.26 * your own identifying information:
2916.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/template/LayoutDefinitionManager.java Fri Jul 16 11:47:36 2010 -0400
2916.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/template/LayoutDefinitionManager.java Fri Jul 16 14:21:50 2010 -0400
2916.3 @@ -1,7 +1,10 @@
2916.4 /*
2916.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2916.6 *
2916.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2916.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2916.9 + *
2916.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2916.11 + * Other names may be trademarks of their respective owners.
2916.12 *
2916.13 * The contents of this file are subject to the terms of either the GNU
2916.14 * General Public License Version 2 only ("GPL") or the Common
2916.15 @@ -13,9 +16,9 @@
2916.16 * specific language governing permissions and limitations under the
2916.17 * License. When distributing the software, include this License Header
2916.18 * Notice in each file and include the License file at
2916.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2916.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2916.21 * particular file as subject to the "Classpath" exception as provided
2916.22 - * by Sun in the GPL Version 2 section of the License file that
2916.23 + * by Oracle in the GPL Version 2 section of the License file that
2916.24 * accompanied this code. If applicable, add the following below the
2916.25 * License Header, with the fields enclosed by brackets [] replaced by
2916.26 * your own identifying information:
2917.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/template/TemplateRenderer.java Fri Jul 16 11:47:36 2010 -0400
2917.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/template/TemplateRenderer.java Fri Jul 16 14:21:50 2010 -0400
2917.3 @@ -1,7 +1,10 @@
2917.4 /*
2917.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2917.6 *
2917.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2917.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2917.9 + *
2917.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2917.11 + * Other names may be trademarks of their respective owners.
2917.12 *
2917.13 * The contents of this file are subject to the terms of either the GNU
2917.14 * General Public License Version 2 only ("GPL") or the Common
2917.15 @@ -13,9 +16,9 @@
2917.16 * specific language governing permissions and limitations under the
2917.17 * License. When distributing the software, include this License Header
2917.18 * Notice in each file and include the License file at
2917.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2917.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2917.21 * particular file as subject to the "Classpath" exception as provided
2917.22 - * by Sun in the GPL Version 2 section of the License file that
2917.23 + * by Oracle in the GPL Version 2 section of the License file that
2917.24 * accompanied this code. If applicable, add the following below the
2917.25 * License Header, with the fields enclosed by brackets [] replaced by
2917.26 * your own identifying information:
2918.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/template/xml/XMLLayoutDefinitionManager.java Fri Jul 16 11:47:36 2010 -0400
2918.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/template/xml/XMLLayoutDefinitionManager.java Fri Jul 16 14:21:50 2010 -0400
2918.3 @@ -1,7 +1,10 @@
2918.4 /*
2918.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2918.6 *
2918.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2918.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2918.9 + *
2918.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2918.11 + * Other names may be trademarks of their respective owners.
2918.12 *
2918.13 * The contents of this file are subject to the terms of either the GNU
2918.14 * General Public License Version 2 only ("GPL") or the Common
2918.15 @@ -13,9 +16,9 @@
2918.16 * specific language governing permissions and limitations under the
2918.17 * License. When distributing the software, include this License Header
2918.18 * Notice in each file and include the License file at
2918.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2918.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2918.21 * particular file as subject to the "Classpath" exception as provided
2918.22 - * by Sun in the GPL Version 2 section of the License file that
2918.23 + * by Oracle in the GPL Version 2 section of the License file that
2918.24 * accompanied this code. If applicable, add the following below the
2918.25 * License Header, with the fields enclosed by brackets [] replaced by
2918.26 * your own identifying information:
2919.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/template/xml/XMLLayoutDefinitionReader.java Fri Jul 16 11:47:36 2010 -0400
2919.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/renderer/template/xml/XMLLayoutDefinitionReader.java Fri Jul 16 14:21:50 2010 -0400
2919.3 @@ -1,7 +1,10 @@
2919.4 /*
2919.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2919.6 *
2919.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2919.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2919.9 + *
2919.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2919.11 + * Other names may be trademarks of their respective owners.
2919.12 *
2919.13 * The contents of this file are subject to the terms of either the GNU
2919.14 * General Public License Version 2 only ("GPL") or the Common
2919.15 @@ -13,9 +16,9 @@
2919.16 * specific language governing permissions and limitations under the
2919.17 * License. When distributing the software, include this License Header
2919.18 * Notice in each file and include the License file at
2919.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2919.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2919.21 * particular file as subject to the "Classpath" exception as provided
2919.22 - * by Sun in the GPL Version 2 section of the License file that
2919.23 + * by Oracle in the GPL Version 2 section of the License file that
2919.24 * accompanied this code. If applicable, add the following below the
2919.25 * License Header, with the fields enclosed by brackets [] replaced by
2919.26 * your own identifying information:
2920.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/resources/LogMessages.properties Fri Jul 16 11:47:36 2010 -0400
2920.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/resources/LogMessages.properties Fri Jul 16 14:21:50 2010 -0400
2920.3 @@ -1,6 +1,9 @@
2920.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2920.5 #
2920.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2920.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2920.8 +#
2920.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2920.10 +# Other names may be trademarks of their respective owners.
2920.11 #
2920.12 # The contents of this file are subject to the terms of either the GNU
2920.13 # General Public License Version 2 only ("GPL") or the Common
2920.14 @@ -12,9 +15,9 @@
2920.15 # specific language governing permissions and limitations under the
2920.16 # License. When distributing the software, include this License Header
2920.17 # Notice in each file and include the License file at
2920.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2920.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2920.20 # particular file as subject to the "Classpath" exception as provided
2920.21 -# by Sun in the GPL Version 2 section of the License file that
2920.22 +# by Oracle in the GPL Version 2 section of the License file that
2920.23 # accompanied this code. If applicable, add the following below the
2920.24 # License Header, with the fields enclosed by brackets [] replaced by
2920.25 # your own identifying information:
2921.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/AddRemoveTag.java Fri Jul 16 11:47:36 2010 -0400
2921.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/AddRemoveTag.java Fri Jul 16 14:21:50 2010 -0400
2921.3 @@ -1,7 +1,10 @@
2921.4 /*
2921.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2921.6 *
2921.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2921.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2921.9 + *
2921.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2921.11 + * Other names may be trademarks of their respective owners.
2921.12 *
2921.13 * The contents of this file are subject to the terms of either the GNU
2921.14 * General Public License Version 2 only ("GPL") or the Common
2921.15 @@ -13,9 +16,9 @@
2921.16 * specific language governing permissions and limitations under the
2921.17 * License. When distributing the software, include this License Header
2921.18 * Notice in each file and include the License file at
2921.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2921.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2921.21 * particular file as subject to the "Classpath" exception as provided
2921.22 - * by Sun in the GPL Version 2 section of the License file that
2921.23 + * by Oracle in the GPL Version 2 section of the License file that
2921.24 * accompanied this code. If applicable, add the following below the
2921.25 * License Header, with the fields enclosed by brackets [] replaced by
2921.26 * your own identifying information:
2922.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/AlarmTag.java Fri Jul 16 11:47:36 2010 -0400
2922.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/AlarmTag.java Fri Jul 16 14:21:50 2010 -0400
2922.3 @@ -1,7 +1,10 @@
2922.4 /*
2922.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2922.6 *
2922.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2922.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2922.9 + *
2922.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2922.11 + * Other names may be trademarks of their respective owners.
2922.12 *
2922.13 * The contents of this file are subject to the terms of either the GNU
2922.14 * General Public License Version 2 only ("GPL") or the Common
2922.15 @@ -13,9 +16,9 @@
2922.16 * specific language governing permissions and limitations under the
2922.17 * License. When distributing the software, include this License Header
2922.18 * Notice in each file and include the License file at
2922.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2922.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2922.21 * particular file as subject to the "Classpath" exception as provided
2922.22 - * by Sun in the GPL Version 2 section of the License file that
2922.23 + * by Oracle in the GPL Version 2 section of the License file that
2922.24 * accompanied this code. If applicable, add the following below the
2922.25 * License Header, with the fields enclosed by brackets [] replaced by
2922.26 * your own identifying information:
2923.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/AlertTag.java Fri Jul 16 11:47:36 2010 -0400
2923.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/AlertTag.java Fri Jul 16 14:21:50 2010 -0400
2923.3 @@ -1,7 +1,10 @@
2923.4 /*
2923.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2923.6 *
2923.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2923.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2923.9 + *
2923.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2923.11 + * Other names may be trademarks of their respective owners.
2923.12 *
2923.13 * The contents of this file are subject to the terms of either the GNU
2923.14 * General Public License Version 2 only ("GPL") or the Common
2923.15 @@ -13,9 +16,9 @@
2923.16 * specific language governing permissions and limitations under the
2923.17 * License. When distributing the software, include this License Header
2923.18 * Notice in each file and include the License file at
2923.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2923.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2923.21 * particular file as subject to the "Classpath" exception as provided
2923.22 - * by Sun in the GPL Version 2 section of the License file that
2923.23 + * by Oracle in the GPL Version 2 section of the License file that
2923.24 * accompanied this code. If applicable, add the following below the
2923.25 * License Header, with the fields enclosed by brackets [] replaced by
2923.26 * your own identifying information:
2924.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/AnchorTag.java Fri Jul 16 11:47:36 2010 -0400
2924.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/AnchorTag.java Fri Jul 16 14:21:50 2010 -0400
2924.3 @@ -1,7 +1,10 @@
2924.4 /*
2924.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2924.6 *
2924.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2924.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2924.9 + *
2924.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2924.11 + * Other names may be trademarks of their respective owners.
2924.12 *
2924.13 * The contents of this file are subject to the terms of either the GNU
2924.14 * General Public License Version 2 only ("GPL") or the Common
2924.15 @@ -13,9 +16,9 @@
2924.16 * specific language governing permissions and limitations under the
2924.17 * License. When distributing the software, include this License Header
2924.18 * Notice in each file and include the License file at
2924.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2924.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2924.21 * particular file as subject to the "Classpath" exception as provided
2924.22 - * by Sun in the GPL Version 2 section of the License file that
2924.23 + * by Oracle in the GPL Version 2 section of the License file that
2924.24 * accompanied this code. If applicable, add the following below the
2924.25 * License Header, with the fields enclosed by brackets [] replaced by
2924.26 * your own identifying information:
2925.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/BodyTag.java Fri Jul 16 11:47:36 2010 -0400
2925.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/BodyTag.java Fri Jul 16 14:21:50 2010 -0400
2925.3 @@ -1,7 +1,10 @@
2925.4 /*
2925.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2925.6 *
2925.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2925.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2925.9 + *
2925.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2925.11 + * Other names may be trademarks of their respective owners.
2925.12 *
2925.13 * The contents of this file are subject to the terms of either the GNU
2925.14 * General Public License Version 2 only ("GPL") or the Common
2925.15 @@ -13,9 +16,9 @@
2925.16 * specific language governing permissions and limitations under the
2925.17 * License. When distributing the software, include this License Header
2925.18 * Notice in each file and include the License file at
2925.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2925.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2925.21 * particular file as subject to the "Classpath" exception as provided
2925.22 - * by Sun in the GPL Version 2 section of the License file that
2925.23 + * by Oracle in the GPL Version 2 section of the License file that
2925.24 * accompanied this code. If applicable, add the following below the
2925.25 * License Header, with the fields enclosed by brackets [] replaced by
2925.26 * your own identifying information:
2926.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/BreadcrumbsTag.java Fri Jul 16 11:47:36 2010 -0400
2926.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/BreadcrumbsTag.java Fri Jul 16 14:21:50 2010 -0400
2926.3 @@ -1,7 +1,10 @@
2926.4 /*
2926.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2926.6 *
2926.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2926.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2926.9 + *
2926.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2926.11 + * Other names may be trademarks of their respective owners.
2926.12 *
2926.13 * The contents of this file are subject to the terms of either the GNU
2926.14 * General Public License Version 2 only ("GPL") or the Common
2926.15 @@ -13,9 +16,9 @@
2926.16 * specific language governing permissions and limitations under the
2926.17 * License. When distributing the software, include this License Header
2926.18 * Notice in each file and include the License file at
2926.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2926.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2926.21 * particular file as subject to the "Classpath" exception as provided
2926.22 - * by Sun in the GPL Version 2 section of the License file that
2926.23 + * by Oracle in the GPL Version 2 section of the License file that
2926.24 * accompanied this code. If applicable, add the following below the
2926.25 * License Header, with the fields enclosed by brackets [] replaced by
2926.26 * your own identifying information:
2927.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ButtonTag.java Fri Jul 16 11:47:36 2010 -0400
2927.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ButtonTag.java Fri Jul 16 14:21:50 2010 -0400
2927.3 @@ -1,7 +1,10 @@
2927.4 /*
2927.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2927.6 *
2927.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2927.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2927.9 + *
2927.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2927.11 + * Other names may be trademarks of their respective owners.
2927.12 *
2927.13 * The contents of this file are subject to the terms of either the GNU
2927.14 * General Public License Version 2 only ("GPL") or the Common
2927.15 @@ -13,9 +16,9 @@
2927.16 * specific language governing permissions and limitations under the
2927.17 * License. When distributing the software, include this License Header
2927.18 * Notice in each file and include the License file at
2927.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2927.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2927.21 * particular file as subject to the "Classpath" exception as provided
2927.22 - * by Sun in the GPL Version 2 section of the License file that
2927.23 + * by Oracle in the GPL Version 2 section of the License file that
2927.24 * accompanied this code. If applicable, add the following below the
2927.25 * License Header, with the fields enclosed by brackets [] replaced by
2927.26 * your own identifying information:
2928.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/CalendarTag.java Fri Jul 16 11:47:36 2010 -0400
2928.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/CalendarTag.java Fri Jul 16 14:21:50 2010 -0400
2928.3 @@ -1,7 +1,10 @@
2928.4 /*
2928.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2928.6 *
2928.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2928.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2928.9 + *
2928.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2928.11 + * Other names may be trademarks of their respective owners.
2928.12 *
2928.13 * The contents of this file are subject to the terms of either the GNU
2928.14 * General Public License Version 2 only ("GPL") or the Common
2928.15 @@ -13,9 +16,9 @@
2928.16 * specific language governing permissions and limitations under the
2928.17 * License. When distributing the software, include this License Header
2928.18 * Notice in each file and include the License file at
2928.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2928.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2928.21 * particular file as subject to the "Classpath" exception as provided
2928.22 - * by Sun in the GPL Version 2 section of the License file that
2928.23 + * by Oracle in the GPL Version 2 section of the License file that
2928.24 * accompanied this code. If applicable, add the following below the
2928.25 * License Header, with the fields enclosed by brackets [] replaced by
2928.26 * your own identifying information:
2929.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/CheckboxGroupTag.java Fri Jul 16 11:47:36 2010 -0400
2929.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/CheckboxGroupTag.java Fri Jul 16 14:21:50 2010 -0400
2929.3 @@ -1,7 +1,10 @@
2929.4 /*
2929.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2929.6 *
2929.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2929.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2929.9 + *
2929.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2929.11 + * Other names may be trademarks of their respective owners.
2929.12 *
2929.13 * The contents of this file are subject to the terms of either the GNU
2929.14 * General Public License Version 2 only ("GPL") or the Common
2929.15 @@ -13,9 +16,9 @@
2929.16 * specific language governing permissions and limitations under the
2929.17 * License. When distributing the software, include this License Header
2929.18 * Notice in each file and include the License file at
2929.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2929.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2929.21 * particular file as subject to the "Classpath" exception as provided
2929.22 - * by Sun in the GPL Version 2 section of the License file that
2929.23 + * by Oracle in the GPL Version 2 section of the License file that
2929.24 * accompanied this code. If applicable, add the following below the
2929.25 * License Header, with the fields enclosed by brackets [] replaced by
2929.26 * your own identifying information:
2930.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/CheckboxTag.java Fri Jul 16 11:47:36 2010 -0400
2930.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/CheckboxTag.java Fri Jul 16 14:21:50 2010 -0400
2930.3 @@ -1,7 +1,10 @@
2930.4 /*
2930.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2930.6 *
2930.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2930.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2930.9 + *
2930.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2930.11 + * Other names may be trademarks of their respective owners.
2930.12 *
2930.13 * The contents of this file are subject to the terms of either the GNU
2930.14 * General Public License Version 2 only ("GPL") or the Common
2930.15 @@ -13,9 +16,9 @@
2930.16 * specific language governing permissions and limitations under the
2930.17 * License. When distributing the software, include this License Header
2930.18 * Notice in each file and include the License file at
2930.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2930.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2930.21 * particular file as subject to the "Classpath" exception as provided
2930.22 - * by Sun in the GPL Version 2 section of the License file that
2930.23 + * by Oracle in the GPL Version 2 section of the License file that
2930.24 * accompanied this code. If applicable, add the following below the
2930.25 * License Header, with the fields enclosed by brackets [] replaced by
2930.26 * your own identifying information:
2931.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/DropDownTag.java Fri Jul 16 11:47:36 2010 -0400
2931.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/DropDownTag.java Fri Jul 16 14:21:50 2010 -0400
2931.3 @@ -1,7 +1,10 @@
2931.4 /*
2931.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2931.6 *
2931.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2931.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2931.9 + *
2931.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2931.11 + * Other names may be trademarks of their respective owners.
2931.12 *
2931.13 * The contents of this file are subject to the terms of either the GNU
2931.14 * General Public License Version 2 only ("GPL") or the Common
2931.15 @@ -13,9 +16,9 @@
2931.16 * specific language governing permissions and limitations under the
2931.17 * License. When distributing the software, include this License Header
2931.18 * Notice in each file and include the License file at
2931.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2931.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2931.21 * particular file as subject to the "Classpath" exception as provided
2931.22 - * by Sun in the GPL Version 2 section of the License file that
2931.23 + * by Oracle in the GPL Version 2 section of the License file that
2931.24 * accompanied this code. If applicable, add the following below the
2931.25 * License Header, with the fields enclosed by brackets [] replaced by
2931.26 * your own identifying information:
2932.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/EditableListTag.java Fri Jul 16 11:47:36 2010 -0400
2932.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/EditableListTag.java Fri Jul 16 14:21:50 2010 -0400
2932.3 @@ -1,7 +1,10 @@
2932.4 /*
2932.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2932.6 *
2932.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2932.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2932.9 + *
2932.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2932.11 + * Other names may be trademarks of their respective owners.
2932.12 *
2932.13 * The contents of this file are subject to the terms of either the GNU
2932.14 * General Public License Version 2 only ("GPL") or the Common
2932.15 @@ -13,9 +16,9 @@
2932.16 * specific language governing permissions and limitations under the
2932.17 * License. When distributing the software, include this License Header
2932.18 * Notice in each file and include the License file at
2932.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2932.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2932.21 * particular file as subject to the "Classpath" exception as provided
2932.22 - * by Sun in the GPL Version 2 section of the License file that
2932.23 + * by Oracle in the GPL Version 2 section of the License file that
2932.24 * accompanied this code. If applicable, add the following below the
2932.25 * License Header, with the fields enclosed by brackets [] replaced by
2932.26 * your own identifying information:
2933.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/FormTag.java Fri Jul 16 11:47:36 2010 -0400
2933.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/FormTag.java Fri Jul 16 14:21:50 2010 -0400
2933.3 @@ -1,7 +1,10 @@
2933.4 /*
2933.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2933.6 *
2933.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2933.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2933.9 + *
2933.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2933.11 + * Other names may be trademarks of their respective owners.
2933.12 *
2933.13 * The contents of this file are subject to the terms of either the GNU
2933.14 * General Public License Version 2 only ("GPL") or the Common
2933.15 @@ -13,9 +16,9 @@
2933.16 * specific language governing permissions and limitations under the
2933.17 * License. When distributing the software, include this License Header
2933.18 * Notice in each file and include the License file at
2933.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2933.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2933.21 * particular file as subject to the "Classpath" exception as provided
2933.22 - * by Sun in the GPL Version 2 section of the License file that
2933.23 + * by Oracle in the GPL Version 2 section of the License file that
2933.24 * accompanied this code. If applicable, add the following below the
2933.25 * License Header, with the fields enclosed by brackets [] replaced by
2933.26 * your own identifying information:
2934.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/FrameSetTag.java Fri Jul 16 11:47:36 2010 -0400
2934.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/FrameSetTag.java Fri Jul 16 14:21:50 2010 -0400
2934.3 @@ -1,7 +1,10 @@
2934.4 /*
2934.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2934.6 *
2934.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2934.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2934.9 + *
2934.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2934.11 + * Other names may be trademarks of their respective owners.
2934.12 *
2934.13 * The contents of this file are subject to the terms of either the GNU
2934.14 * General Public License Version 2 only ("GPL") or the Common
2934.15 @@ -13,9 +16,9 @@
2934.16 * specific language governing permissions and limitations under the
2934.17 * License. When distributing the software, include this License Header
2934.18 * Notice in each file and include the License file at
2934.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2934.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2934.21 * particular file as subject to the "Classpath" exception as provided
2934.22 - * by Sun in the GPL Version 2 section of the License file that
2934.23 + * by Oracle in the GPL Version 2 section of the License file that
2934.24 * accompanied this code. If applicable, add the following below the
2934.25 * License Header, with the fields enclosed by brackets [] replaced by
2934.26 * your own identifying information:
2935.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/FrameTag.java Fri Jul 16 11:47:36 2010 -0400
2935.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/FrameTag.java Fri Jul 16 14:21:50 2010 -0400
2935.3 @@ -1,7 +1,10 @@
2935.4 /*
2935.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2935.6 *
2935.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2935.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2935.9 + *
2935.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2935.11 + * Other names may be trademarks of their respective owners.
2935.12 *
2935.13 * The contents of this file are subject to the terms of either the GNU
2935.14 * General Public License Version 2 only ("GPL") or the Common
2935.15 @@ -13,9 +16,9 @@
2935.16 * specific language governing permissions and limitations under the
2935.17 * License. When distributing the software, include this License Header
2935.18 * Notice in each file and include the License file at
2935.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2935.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2935.21 * particular file as subject to the "Classpath" exception as provided
2935.22 - * by Sun in the GPL Version 2 section of the License file that
2935.23 + * by Oracle in the GPL Version 2 section of the License file that
2935.24 * accompanied this code. If applicable, add the following below the
2935.25 * License Header, with the fields enclosed by brackets [] replaced by
2935.26 * your own identifying information:
2936.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HeadTag.java Fri Jul 16 11:47:36 2010 -0400
2936.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HeadTag.java Fri Jul 16 14:21:50 2010 -0400
2936.3 @@ -1,7 +1,10 @@
2936.4 /*
2936.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2936.6 *
2936.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2936.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2936.9 + *
2936.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2936.11 + * Other names may be trademarks of their respective owners.
2936.12 *
2936.13 * The contents of this file are subject to the terms of either the GNU
2936.14 * General Public License Version 2 only ("GPL") or the Common
2936.15 @@ -13,9 +16,9 @@
2936.16 * specific language governing permissions and limitations under the
2936.17 * License. When distributing the software, include this License Header
2936.18 * Notice in each file and include the License file at
2936.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2936.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2936.21 * particular file as subject to the "Classpath" exception as provided
2936.22 - * by Sun in the GPL Version 2 section of the License file that
2936.23 + * by Oracle in the GPL Version 2 section of the License file that
2936.24 * accompanied this code. If applicable, add the following below the
2936.25 * License Header, with the fields enclosed by brackets [] replaced by
2936.26 * your own identifying information:
2937.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HelpInlineTag.java Fri Jul 16 11:47:36 2010 -0400
2937.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HelpInlineTag.java Fri Jul 16 14:21:50 2010 -0400
2937.3 @@ -1,7 +1,10 @@
2937.4 /*
2937.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2937.6 *
2937.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2937.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2937.9 + *
2937.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2937.11 + * Other names may be trademarks of their respective owners.
2937.12 *
2937.13 * The contents of this file are subject to the terms of either the GNU
2937.14 * General Public License Version 2 only ("GPL") or the Common
2937.15 @@ -13,9 +16,9 @@
2937.16 * specific language governing permissions and limitations under the
2937.17 * License. When distributing the software, include this License Header
2937.18 * Notice in each file and include the License file at
2937.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2937.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2937.21 * particular file as subject to the "Classpath" exception as provided
2937.22 - * by Sun in the GPL Version 2 section of the License file that
2937.23 + * by Oracle in the GPL Version 2 section of the License file that
2937.24 * accompanied this code. If applicable, add the following below the
2937.25 * License Header, with the fields enclosed by brackets [] replaced by
2937.26 * your own identifying information:
2938.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HiddenFieldTag.java Fri Jul 16 11:47:36 2010 -0400
2938.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HiddenFieldTag.java Fri Jul 16 14:21:50 2010 -0400
2938.3 @@ -1,7 +1,10 @@
2938.4 /*
2938.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2938.6 *
2938.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2938.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2938.9 + *
2938.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2938.11 + * Other names may be trademarks of their respective owners.
2938.12 *
2938.13 * The contents of this file are subject to the terms of either the GNU
2938.14 * General Public License Version 2 only ("GPL") or the Common
2938.15 @@ -13,9 +16,9 @@
2938.16 * specific language governing permissions and limitations under the
2938.17 * License. When distributing the software, include this License Header
2938.18 * Notice in each file and include the License file at
2938.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2938.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2938.21 * particular file as subject to the "Classpath" exception as provided
2938.22 - * by Sun in the GPL Version 2 section of the License file that
2938.23 + * by Oracle in the GPL Version 2 section of the License file that
2938.24 * accompanied this code. If applicable, add the following below the
2938.25 * License Header, with the fields enclosed by brackets [] replaced by
2938.26 * your own identifying information:
2939.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HtmlTag.java Fri Jul 16 11:47:36 2010 -0400
2939.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HtmlTag.java Fri Jul 16 14:21:50 2010 -0400
2939.3 @@ -1,7 +1,10 @@
2939.4 /*
2939.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2939.6 *
2939.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2939.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2939.9 + *
2939.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2939.11 + * Other names may be trademarks of their respective owners.
2939.12 *
2939.13 * The contents of this file are subject to the terms of either the GNU
2939.14 * General Public License Version 2 only ("GPL") or the Common
2939.15 @@ -13,9 +16,9 @@
2939.16 * specific language governing permissions and limitations under the
2939.17 * License. When distributing the software, include this License Header
2939.18 * Notice in each file and include the License file at
2939.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2939.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2939.21 * particular file as subject to the "Classpath" exception as provided
2939.22 - * by Sun in the GPL Version 2 section of the License file that
2939.23 + * by Oracle in the GPL Version 2 section of the License file that
2939.24 * accompanied this code. If applicable, add the following below the
2939.25 * License Header, with the fields enclosed by brackets [] replaced by
2939.26 * your own identifying information:
2940.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HyperlinkTag.java Fri Jul 16 11:47:36 2010 -0400
2940.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/HyperlinkTag.java Fri Jul 16 14:21:50 2010 -0400
2940.3 @@ -1,7 +1,10 @@
2940.4 /*
2940.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2940.6 *
2940.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2940.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2940.9 + *
2940.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2940.11 + * Other names may be trademarks of their respective owners.
2940.12 *
2940.13 * The contents of this file are subject to the terms of either the GNU
2940.14 * General Public License Version 2 only ("GPL") or the Common
2940.15 @@ -13,9 +16,9 @@
2940.16 * specific language governing permissions and limitations under the
2940.17 * License. When distributing the software, include this License Header
2940.18 * Notice in each file and include the License file at
2940.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2940.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2940.21 * particular file as subject to the "Classpath" exception as provided
2940.22 - * by Sun in the GPL Version 2 section of the License file that
2940.23 + * by Oracle in the GPL Version 2 section of the License file that
2940.24 * accompanied this code. If applicable, add the following below the
2940.25 * License Header, with the fields enclosed by brackets [] replaced by
2940.26 * your own identifying information:
2941.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/IFrameTag.java Fri Jul 16 11:47:36 2010 -0400
2941.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/IFrameTag.java Fri Jul 16 14:21:50 2010 -0400
2941.3 @@ -1,7 +1,10 @@
2941.4 /*
2941.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2941.6 *
2941.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2941.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2941.9 + *
2941.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2941.11 + * Other names may be trademarks of their respective owners.
2941.12 *
2941.13 * The contents of this file are subject to the terms of either the GNU
2941.14 * General Public License Version 2 only ("GPL") or the Common
2941.15 @@ -13,9 +16,9 @@
2941.16 * specific language governing permissions and limitations under the
2941.17 * License. When distributing the software, include this License Header
2941.18 * Notice in each file and include the License file at
2941.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2941.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2941.21 * particular file as subject to the "Classpath" exception as provided
2941.22 - * by Sun in the GPL Version 2 section of the License file that
2941.23 + * by Oracle in the GPL Version 2 section of the License file that
2941.24 * accompanied this code. If applicable, add the following below the
2941.25 * License Header, with the fields enclosed by brackets [] replaced by
2941.26 * your own identifying information:
2942.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ImageComponentTag.java Fri Jul 16 11:47:36 2010 -0400
2942.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ImageComponentTag.java Fri Jul 16 14:21:50 2010 -0400
2942.3 @@ -1,7 +1,10 @@
2942.4 /*
2942.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2942.6 *
2942.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2942.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2942.9 + *
2942.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2942.11 + * Other names may be trademarks of their respective owners.
2942.12 *
2942.13 * The contents of this file are subject to the terms of either the GNU
2942.14 * General Public License Version 2 only ("GPL") or the Common
2942.15 @@ -13,9 +16,9 @@
2942.16 * specific language governing permissions and limitations under the
2942.17 * License. When distributing the software, include this License Header
2942.18 * Notice in each file and include the License file at
2942.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2942.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2942.21 * particular file as subject to the "Classpath" exception as provided
2942.22 - * by Sun in the GPL Version 2 section of the License file that
2942.23 + * by Oracle in the GPL Version 2 section of the License file that
2942.24 * accompanied this code. If applicable, add the following below the
2942.25 * License Header, with the fields enclosed by brackets [] replaced by
2942.26 * your own identifying information:
2943.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ImageHyperlinkTag.java Fri Jul 16 11:47:36 2010 -0400
2943.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ImageHyperlinkTag.java Fri Jul 16 14:21:50 2010 -0400
2943.3 @@ -1,7 +1,10 @@
2943.4 /*
2943.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2943.6 *
2943.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2943.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2943.9 + *
2943.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2943.11 + * Other names may be trademarks of their respective owners.
2943.12 *
2943.13 * The contents of this file are subject to the terms of either the GNU
2943.14 * General Public License Version 2 only ("GPL") or the Common
2943.15 @@ -13,9 +16,9 @@
2943.16 * specific language governing permissions and limitations under the
2943.17 * License. When distributing the software, include this License Header
2943.18 * Notice in each file and include the License file at
2943.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2943.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2943.21 * particular file as subject to the "Classpath" exception as provided
2943.22 - * by Sun in the GPL Version 2 section of the License file that
2943.23 + * by Oracle in the GPL Version 2 section of the License file that
2943.24 * accompanied this code. If applicable, add the following below the
2943.25 * License Header, with the fields enclosed by brackets [] replaced by
2943.26 * your own identifying information:
2944.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/LabelTag.java Fri Jul 16 11:47:36 2010 -0400
2944.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/LabelTag.java Fri Jul 16 14:21:50 2010 -0400
2944.3 @@ -1,7 +1,10 @@
2944.4 /*
2944.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2944.6 *
2944.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2944.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2944.9 + *
2944.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2944.11 + * Other names may be trademarks of their respective owners.
2944.12 *
2944.13 * The contents of this file are subject to the terms of either the GNU
2944.14 * General Public License Version 2 only ("GPL") or the Common
2944.15 @@ -13,9 +16,9 @@
2944.16 * specific language governing permissions and limitations under the
2944.17 * License. When distributing the software, include this License Header
2944.18 * Notice in each file and include the License file at
2944.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2944.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2944.21 * particular file as subject to the "Classpath" exception as provided
2944.22 - * by Sun in the GPL Version 2 section of the License file that
2944.23 + * by Oracle in the GPL Version 2 section of the License file that
2944.24 * accompanied this code. If applicable, add the following below the
2944.25 * License Header, with the fields enclosed by brackets [] replaced by
2944.26 * your own identifying information:
2945.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/LegendTag.java Fri Jul 16 11:47:36 2010 -0400
2945.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/LegendTag.java Fri Jul 16 14:21:50 2010 -0400
2945.3 @@ -1,7 +1,10 @@
2945.4 /*
2945.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2945.6 *
2945.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2945.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2945.9 + *
2945.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2945.11 + * Other names may be trademarks of their respective owners.
2945.12 *
2945.13 * The contents of this file are subject to the terms of either the GNU
2945.14 * General Public License Version 2 only ("GPL") or the Common
2945.15 @@ -13,9 +16,9 @@
2945.16 * specific language governing permissions and limitations under the
2945.17 * License. When distributing the software, include this License Header
2945.18 * Notice in each file and include the License file at
2945.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2945.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2945.21 * particular file as subject to the "Classpath" exception as provided
2945.22 - * by Sun in the GPL Version 2 section of the License file that
2945.23 + * by Oracle in the GPL Version 2 section of the License file that
2945.24 * accompanied this code. If applicable, add the following below the
2945.25 * License Header, with the fields enclosed by brackets [] replaced by
2945.26 * your own identifying information:
2946.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/LinkTag.java Fri Jul 16 11:47:36 2010 -0400
2946.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/LinkTag.java Fri Jul 16 14:21:50 2010 -0400
2946.3 @@ -1,7 +1,10 @@
2946.4 /*
2946.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2946.6 *
2946.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2946.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2946.9 + *
2946.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2946.11 + * Other names may be trademarks of their respective owners.
2946.12 *
2946.13 * The contents of this file are subject to the terms of either the GNU
2946.14 * General Public License Version 2 only ("GPL") or the Common
2946.15 @@ -13,9 +16,9 @@
2946.16 * specific language governing permissions and limitations under the
2946.17 * License. When distributing the software, include this License Header
2946.18 * Notice in each file and include the License file at
2946.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2946.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2946.21 * particular file as subject to the "Classpath" exception as provided
2946.22 - * by Sun in the GPL Version 2 section of the License file that
2946.23 + * by Oracle in the GPL Version 2 section of the License file that
2946.24 * accompanied this code. If applicable, add the following below the
2946.25 * License Header, with the fields enclosed by brackets [] replaced by
2946.26 * your own identifying information:
2947.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ListboxTag.java Fri Jul 16 11:47:36 2010 -0400
2947.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ListboxTag.java Fri Jul 16 14:21:50 2010 -0400
2947.3 @@ -1,7 +1,10 @@
2947.4 /*
2947.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2947.6 *
2947.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2947.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2947.9 + *
2947.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2947.11 + * Other names may be trademarks of their respective owners.
2947.12 *
2947.13 * The contents of this file are subject to the terms of either the GNU
2947.14 * General Public License Version 2 only ("GPL") or the Common
2947.15 @@ -13,9 +16,9 @@
2947.16 * specific language governing permissions and limitations under the
2947.17 * License. When distributing the software, include this License Header
2947.18 * Notice in each file and include the License file at
2947.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2947.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2947.21 * particular file as subject to the "Classpath" exception as provided
2947.22 - * by Sun in the GPL Version 2 section of the License file that
2947.23 + * by Oracle in the GPL Version 2 section of the License file that
2947.24 * accompanied this code. If applicable, add the following below the
2947.25 * License Header, with the fields enclosed by brackets [] replaced by
2947.26 * your own identifying information:
2948.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/MarkupTag.java Fri Jul 16 11:47:36 2010 -0400
2948.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/MarkupTag.java Fri Jul 16 14:21:50 2010 -0400
2948.3 @@ -1,7 +1,10 @@
2948.4 /*
2948.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2948.6 *
2948.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2948.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2948.9 + *
2948.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2948.11 + * Other names may be trademarks of their respective owners.
2948.12 *
2948.13 * The contents of this file are subject to the terms of either the GNU
2948.14 * General Public License Version 2 only ("GPL") or the Common
2948.15 @@ -13,9 +16,9 @@
2948.16 * specific language governing permissions and limitations under the
2948.17 * License. When distributing the software, include this License Header
2948.18 * Notice in each file and include the License file at
2948.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2948.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2948.21 * particular file as subject to the "Classpath" exception as provided
2948.22 - * by Sun in the GPL Version 2 section of the License file that
2948.23 + * by Oracle in the GPL Version 2 section of the License file that
2948.24 * accompanied this code. If applicable, add the following below the
2948.25 * License Header, with the fields enclosed by brackets [] replaced by
2948.26 * your own identifying information:
2949.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/MessageGroupTag.java Fri Jul 16 11:47:36 2010 -0400
2949.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/MessageGroupTag.java Fri Jul 16 14:21:50 2010 -0400
2949.3 @@ -1,7 +1,10 @@
2949.4 /*
2949.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2949.6 *
2949.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2949.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2949.9 + *
2949.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2949.11 + * Other names may be trademarks of their respective owners.
2949.12 *
2949.13 * The contents of this file are subject to the terms of either the GNU
2949.14 * General Public License Version 2 only ("GPL") or the Common
2949.15 @@ -13,9 +16,9 @@
2949.16 * specific language governing permissions and limitations under the
2949.17 * License. When distributing the software, include this License Header
2949.18 * Notice in each file and include the License file at
2949.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2949.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2949.21 * particular file as subject to the "Classpath" exception as provided
2949.22 - * by Sun in the GPL Version 2 section of the License file that
2949.23 + * by Oracle in the GPL Version 2 section of the License file that
2949.24 * accompanied this code. If applicable, add the following below the
2949.25 * License Header, with the fields enclosed by brackets [] replaced by
2949.26 * your own identifying information:
2950.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/MessageTag.java Fri Jul 16 11:47:36 2010 -0400
2950.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/MessageTag.java Fri Jul 16 14:21:50 2010 -0400
2950.3 @@ -1,7 +1,10 @@
2950.4 /*
2950.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2950.6 *
2950.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2950.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2950.9 + *
2950.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2950.11 + * Other names may be trademarks of their respective owners.
2950.12 *
2950.13 * The contents of this file are subject to the terms of either the GNU
2950.14 * General Public License Version 2 only ("GPL") or the Common
2950.15 @@ -13,9 +16,9 @@
2950.16 * specific language governing permissions and limitations under the
2950.17 * License. When distributing the software, include this License Header
2950.18 * Notice in each file and include the License file at
2950.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2950.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2950.21 * particular file as subject to the "Classpath" exception as provided
2950.22 - * by Sun in the GPL Version 2 section of the License file that
2950.23 + * by Oracle in the GPL Version 2 section of the License file that
2950.24 * accompanied this code. If applicable, add the following below the
2950.25 * License Header, with the fields enclosed by brackets [] replaced by
2950.26 * your own identifying information:
2951.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/MetaTag.java Fri Jul 16 11:47:36 2010 -0400
2951.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/MetaTag.java Fri Jul 16 14:21:50 2010 -0400
2951.3 @@ -1,7 +1,10 @@
2951.4 /*
2951.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2951.6 *
2951.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2951.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2951.9 + *
2951.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2951.11 + * Other names may be trademarks of their respective owners.
2951.12 *
2951.13 * The contents of this file are subject to the terms of either the GNU
2951.14 * General Public License Version 2 only ("GPL") or the Common
2951.15 @@ -13,9 +16,9 @@
2951.16 * specific language governing permissions and limitations under the
2951.17 * License. When distributing the software, include this License Header
2951.18 * Notice in each file and include the License file at
2951.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2951.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2951.21 * particular file as subject to the "Classpath" exception as provided
2951.22 - * by Sun in the GPL Version 2 section of the License file that
2951.23 + * by Oracle in the GPL Version 2 section of the License file that
2951.24 * accompanied this code. If applicable, add the following below the
2951.25 * License Header, with the fields enclosed by brackets [] replaced by
2951.26 * your own identifying information:
2952.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/OrderableListTag.java Fri Jul 16 11:47:36 2010 -0400
2952.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/OrderableListTag.java Fri Jul 16 14:21:50 2010 -0400
2952.3 @@ -1,7 +1,10 @@
2952.4 /*
2952.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2952.6 *
2952.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2952.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2952.9 + *
2952.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2952.11 + * Other names may be trademarks of their respective owners.
2952.12 *
2952.13 * The contents of this file are subject to the terms of either the GNU
2952.14 * General Public License Version 2 only ("GPL") or the Common
2952.15 @@ -13,9 +16,9 @@
2952.16 * specific language governing permissions and limitations under the
2952.17 * License. When distributing the software, include this License Header
2952.18 * Notice in each file and include the License file at
2952.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2952.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2952.21 * particular file as subject to the "Classpath" exception as provided
2952.22 - * by Sun in the GPL Version 2 section of the License file that
2952.23 + * by Oracle in the GPL Version 2 section of the License file that
2952.24 * accompanied this code. If applicable, add the following below the
2952.25 * License Header, with the fields enclosed by brackets [] replaced by
2952.26 * your own identifying information:
2953.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PageAlertTag.java Fri Jul 16 11:47:36 2010 -0400
2953.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PageAlertTag.java Fri Jul 16 14:21:50 2010 -0400
2953.3 @@ -1,7 +1,10 @@
2953.4 /*
2953.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2953.6 *
2953.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2953.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2953.9 + *
2953.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2953.11 + * Other names may be trademarks of their respective owners.
2953.12 *
2953.13 * The contents of this file are subject to the terms of either the GNU
2953.14 * General Public License Version 2 only ("GPL") or the Common
2953.15 @@ -13,9 +16,9 @@
2953.16 * specific language governing permissions and limitations under the
2953.17 * License. When distributing the software, include this License Header
2953.18 * Notice in each file and include the License file at
2953.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2953.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2953.21 * particular file as subject to the "Classpath" exception as provided
2953.22 - * by Sun in the GPL Version 2 section of the License file that
2953.23 + * by Oracle in the GPL Version 2 section of the License file that
2953.24 * accompanied this code. If applicable, add the following below the
2953.25 * License Header, with the fields enclosed by brackets [] replaced by
2953.26 * your own identifying information:
2954.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PageSeparatorTag.java Fri Jul 16 11:47:36 2010 -0400
2954.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PageSeparatorTag.java Fri Jul 16 14:21:50 2010 -0400
2954.3 @@ -1,7 +1,10 @@
2954.4 /*
2954.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2954.6 *
2954.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2954.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2954.9 + *
2954.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2954.11 + * Other names may be trademarks of their respective owners.
2954.12 *
2954.13 * The contents of this file are subject to the terms of either the GNU
2954.14 * General Public License Version 2 only ("GPL") or the Common
2954.15 @@ -13,9 +16,9 @@
2954.16 * specific language governing permissions and limitations under the
2954.17 * License. When distributing the software, include this License Header
2954.18 * Notice in each file and include the License file at
2954.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2954.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2954.21 * particular file as subject to the "Classpath" exception as provided
2954.22 - * by Sun in the GPL Version 2 section of the License file that
2954.23 + * by Oracle in the GPL Version 2 section of the License file that
2954.24 * accompanied this code. If applicable, add the following below the
2954.25 * License Header, with the fields enclosed by brackets [] replaced by
2954.26 * your own identifying information:
2955.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PageTag.java Fri Jul 16 11:47:36 2010 -0400
2955.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PageTag.java Fri Jul 16 14:21:50 2010 -0400
2955.3 @@ -1,7 +1,10 @@
2955.4 /*
2955.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2955.6 *
2955.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2955.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2955.9 + *
2955.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2955.11 + * Other names may be trademarks of their respective owners.
2955.12 *
2955.13 * The contents of this file are subject to the terms of either the GNU
2955.14 * General Public License Version 2 only ("GPL") or the Common
2955.15 @@ -13,9 +16,9 @@
2955.16 * specific language governing permissions and limitations under the
2955.17 * License. When distributing the software, include this License Header
2955.18 * Notice in each file and include the License file at
2955.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2955.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2955.21 * particular file as subject to the "Classpath" exception as provided
2955.22 - * by Sun in the GPL Version 2 section of the License file that
2955.23 + * by Oracle in the GPL Version 2 section of the License file that
2955.24 * accompanied this code. If applicable, add the following below the
2955.25 * License Header, with the fields enclosed by brackets [] replaced by
2955.26 * your own identifying information:
2956.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PanelGroupTag.java Fri Jul 16 11:47:36 2010 -0400
2956.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PanelGroupTag.java Fri Jul 16 14:21:50 2010 -0400
2956.3 @@ -1,7 +1,10 @@
2956.4 /*
2956.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2956.6 *
2956.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2956.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2956.9 + *
2956.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2956.11 + * Other names may be trademarks of their respective owners.
2956.12 *
2956.13 * The contents of this file are subject to the terms of either the GNU
2956.14 * General Public License Version 2 only ("GPL") or the Common
2956.15 @@ -13,9 +16,9 @@
2956.16 * specific language governing permissions and limitations under the
2956.17 * License. When distributing the software, include this License Header
2956.18 * Notice in each file and include the License file at
2956.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2956.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2956.21 * particular file as subject to the "Classpath" exception as provided
2956.22 - * by Sun in the GPL Version 2 section of the License file that
2956.23 + * by Oracle in the GPL Version 2 section of the License file that
2956.24 * accompanied this code. If applicable, add the following below the
2956.25 * License Header, with the fields enclosed by brackets [] replaced by
2956.26 * your own identifying information:
2957.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PanelLayoutTag.java Fri Jul 16 11:47:36 2010 -0400
2957.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PanelLayoutTag.java Fri Jul 16 14:21:50 2010 -0400
2957.3 @@ -1,7 +1,10 @@
2957.4 /*
2957.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2957.6 *
2957.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2957.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2957.9 + *
2957.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2957.11 + * Other names may be trademarks of their respective owners.
2957.12 *
2957.13 * The contents of this file are subject to the terms of either the GNU
2957.14 * General Public License Version 2 only ("GPL") or the Common
2957.15 @@ -13,9 +16,9 @@
2957.16 * specific language governing permissions and limitations under the
2957.17 * License. When distributing the software, include this License Header
2957.18 * Notice in each file and include the License file at
2957.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2957.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2957.21 * particular file as subject to the "Classpath" exception as provided
2957.22 - * by Sun in the GPL Version 2 section of the License file that
2957.23 + * by Oracle in the GPL Version 2 section of the License file that
2957.24 * accompanied this code. If applicable, add the following below the
2957.25 * License Header, with the fields enclosed by brackets [] replaced by
2957.26 * your own identifying information:
2958.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PasswordFieldTag.java Fri Jul 16 11:47:36 2010 -0400
2958.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PasswordFieldTag.java Fri Jul 16 14:21:50 2010 -0400
2958.3 @@ -1,7 +1,10 @@
2958.4 /*
2958.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2958.6 *
2958.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2958.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2958.9 + *
2958.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2958.11 + * Other names may be trademarks of their respective owners.
2958.12 *
2958.13 * The contents of this file are subject to the terms of either the GNU
2958.14 * General Public License Version 2 only ("GPL") or the Common
2958.15 @@ -13,9 +16,9 @@
2958.16 * specific language governing permissions and limitations under the
2958.17 * License. When distributing the software, include this License Header
2958.18 * Notice in each file and include the License file at
2958.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2958.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2958.21 * particular file as subject to the "Classpath" exception as provided
2958.22 - * by Sun in the GPL Version 2 section of the License file that
2958.23 + * by Oracle in the GPL Version 2 section of the License file that
2958.24 * accompanied this code. If applicable, add the following below the
2958.25 * License Header, with the fields enclosed by brackets [] replaced by
2958.26 * your own identifying information:
2959.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PropertySheetSectionTag.java Fri Jul 16 11:47:36 2010 -0400
2959.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PropertySheetSectionTag.java Fri Jul 16 14:21:50 2010 -0400
2959.3 @@ -1,7 +1,10 @@
2959.4 /*
2959.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2959.6 *
2959.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2959.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2959.9 + *
2959.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2959.11 + * Other names may be trademarks of their respective owners.
2959.12 *
2959.13 * The contents of this file are subject to the terms of either the GNU
2959.14 * General Public License Version 2 only ("GPL") or the Common
2959.15 @@ -13,9 +16,9 @@
2959.16 * specific language governing permissions and limitations under the
2959.17 * License. When distributing the software, include this License Header
2959.18 * Notice in each file and include the License file at
2959.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2959.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2959.21 * particular file as subject to the "Classpath" exception as provided
2959.22 - * by Sun in the GPL Version 2 section of the License file that
2959.23 + * by Oracle in the GPL Version 2 section of the License file that
2959.24 * accompanied this code. If applicable, add the following below the
2959.25 * License Header, with the fields enclosed by brackets [] replaced by
2959.26 * your own identifying information:
2960.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PropertySheetTag.java Fri Jul 16 11:47:36 2010 -0400
2960.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PropertySheetTag.java Fri Jul 16 14:21:50 2010 -0400
2960.3 @@ -1,7 +1,10 @@
2960.4 /*
2960.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2960.6 *
2960.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2960.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2960.9 + *
2960.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2960.11 + * Other names may be trademarks of their respective owners.
2960.12 *
2960.13 * The contents of this file are subject to the terms of either the GNU
2960.14 * General Public License Version 2 only ("GPL") or the Common
2960.15 @@ -13,9 +16,9 @@
2960.16 * specific language governing permissions and limitations under the
2960.17 * License. When distributing the software, include this License Header
2960.18 * Notice in each file and include the License file at
2960.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2960.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2960.21 * particular file as subject to the "Classpath" exception as provided
2960.22 - * by Sun in the GPL Version 2 section of the License file that
2960.23 + * by Oracle in the GPL Version 2 section of the License file that
2960.24 * accompanied this code. If applicable, add the following below the
2960.25 * License Header, with the fields enclosed by brackets [] replaced by
2960.26 * your own identifying information:
2961.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PropertyTag.java Fri Jul 16 11:47:36 2010 -0400
2961.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/PropertyTag.java Fri Jul 16 14:21:50 2010 -0400
2961.3 @@ -1,7 +1,10 @@
2961.4 /*
2961.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2961.6 *
2961.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2961.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2961.9 + *
2961.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2961.11 + * Other names may be trademarks of their respective owners.
2961.12 *
2961.13 * The contents of this file are subject to the terms of either the GNU
2961.14 * General Public License Version 2 only ("GPL") or the Common
2961.15 @@ -13,9 +16,9 @@
2961.16 * specific language governing permissions and limitations under the
2961.17 * License. When distributing the software, include this License Header
2961.18 * Notice in each file and include the License file at
2961.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2961.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2961.21 * particular file as subject to the "Classpath" exception as provided
2961.22 - * by Sun in the GPL Version 2 section of the License file that
2961.23 + * by Oracle in the GPL Version 2 section of the License file that
2961.24 * accompanied this code. If applicable, add the following below the
2961.25 * License Header, with the fields enclosed by brackets [] replaced by
2961.26 * your own identifying information:
2962.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/RadioButtonGroupTag.java Fri Jul 16 11:47:36 2010 -0400
2962.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/RadioButtonGroupTag.java Fri Jul 16 14:21:50 2010 -0400
2962.3 @@ -1,7 +1,10 @@
2962.4 /*
2962.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2962.6 *
2962.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2962.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2962.9 + *
2962.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2962.11 + * Other names may be trademarks of their respective owners.
2962.12 *
2962.13 * The contents of this file are subject to the terms of either the GNU
2962.14 * General Public License Version 2 only ("GPL") or the Common
2962.15 @@ -13,9 +16,9 @@
2962.16 * specific language governing permissions and limitations under the
2962.17 * License. When distributing the software, include this License Header
2962.18 * Notice in each file and include the License file at
2962.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2962.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2962.21 * particular file as subject to the "Classpath" exception as provided
2962.22 - * by Sun in the GPL Version 2 section of the License file that
2962.23 + * by Oracle in the GPL Version 2 section of the License file that
2962.24 * accompanied this code. If applicable, add the following below the
2962.25 * License Header, with the fields enclosed by brackets [] replaced by
2962.26 * your own identifying information:
2963.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/RadioButtonTag.java Fri Jul 16 11:47:36 2010 -0400
2963.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/RadioButtonTag.java Fri Jul 16 14:21:50 2010 -0400
2963.3 @@ -1,7 +1,10 @@
2963.4 /*
2963.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2963.6 *
2963.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2963.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2963.9 + *
2963.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2963.11 + * Other names may be trademarks of their respective owners.
2963.12 *
2963.13 * The contents of this file are subject to the terms of either the GNU
2963.14 * General Public License Version 2 only ("GPL") or the Common
2963.15 @@ -13,9 +16,9 @@
2963.16 * specific language governing permissions and limitations under the
2963.17 * License. When distributing the software, include this License Header
2963.18 * Notice in each file and include the License file at
2963.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2963.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2963.21 * particular file as subject to the "Classpath" exception as provided
2963.22 - * by Sun in the GPL Version 2 section of the License file that
2963.23 + * by Oracle in the GPL Version 2 section of the License file that
2963.24 * accompanied this code. If applicable, add the following below the
2963.25 * License Header, with the fields enclosed by brackets [] replaced by
2963.26 * your own identifying information:
2964.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ScriptTag.java Fri Jul 16 11:47:36 2010 -0400
2964.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ScriptTag.java Fri Jul 16 14:21:50 2010 -0400
2964.3 @@ -1,7 +1,10 @@
2964.4 /*
2964.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2964.6 *
2964.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2964.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2964.9 + *
2964.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2964.11 + * Other names may be trademarks of their respective owners.
2964.12 *
2964.13 * The contents of this file are subject to the terms of either the GNU
2964.14 * General Public License Version 2 only ("GPL") or the Common
2964.15 @@ -13,9 +16,9 @@
2964.16 * specific language governing permissions and limitations under the
2964.17 * License. When distributing the software, include this License Header
2964.18 * Notice in each file and include the License file at
2964.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2964.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2964.21 * particular file as subject to the "Classpath" exception as provided
2964.22 - * by Sun in the GPL Version 2 section of the License file that
2964.23 + * by Oracle in the GPL Version 2 section of the License file that
2964.24 * accompanied this code. If applicable, add the following below the
2964.25 * License Header, with the fields enclosed by brackets [] replaced by
2964.26 * your own identifying information:
2965.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/SkipHyperlinkTag.java Fri Jul 16 11:47:36 2010 -0400
2965.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/SkipHyperlinkTag.java Fri Jul 16 14:21:50 2010 -0400
2965.3 @@ -1,7 +1,10 @@
2965.4 /*
2965.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2965.6 *
2965.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2965.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2965.9 + *
2965.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2965.11 + * Other names may be trademarks of their respective owners.
2965.12 *
2965.13 * The contents of this file are subject to the terms of either the GNU
2965.14 * General Public License Version 2 only ("GPL") or the Common
2965.15 @@ -13,9 +16,9 @@
2965.16 * specific language governing permissions and limitations under the
2965.17 * License. When distributing the software, include this License Header
2965.18 * Notice in each file and include the License file at
2965.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2965.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2965.21 * particular file as subject to the "Classpath" exception as provided
2965.22 - * by Sun in the GPL Version 2 section of the License file that
2965.23 + * by Oracle in the GPL Version 2 section of the License file that
2965.24 * accompanied this code. If applicable, add the following below the
2965.25 * License Header, with the fields enclosed by brackets [] replaced by
2965.26 * your own identifying information:
2966.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/StaticTextTag.java Fri Jul 16 11:47:36 2010 -0400
2966.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/StaticTextTag.java Fri Jul 16 14:21:50 2010 -0400
2966.3 @@ -1,7 +1,10 @@
2966.4 /*
2966.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2966.6 *
2966.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2966.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2966.9 + *
2966.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2966.11 + * Other names may be trademarks of their respective owners.
2966.12 *
2966.13 * The contents of this file are subject to the terms of either the GNU
2966.14 * General Public License Version 2 only ("GPL") or the Common
2966.15 @@ -13,9 +16,9 @@
2966.16 * specific language governing permissions and limitations under the
2966.17 * License. When distributing the software, include this License Header
2966.18 * Notice in each file and include the License file at
2966.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2966.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2966.21 * particular file as subject to the "Classpath" exception as provided
2966.22 - * by Sun in the GPL Version 2 section of the License file that
2966.23 + * by Oracle in the GPL Version 2 section of the License file that
2966.24 * accompanied this code. If applicable, add the following below the
2966.25 * License Header, with the fields enclosed by brackets [] replaced by
2966.26 * your own identifying information:
2967.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TabSetTag.java Fri Jul 16 11:47:36 2010 -0400
2967.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TabSetTag.java Fri Jul 16 14:21:50 2010 -0400
2967.3 @@ -1,7 +1,10 @@
2967.4 /*
2967.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2967.6 *
2967.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2967.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2967.9 + *
2967.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2967.11 + * Other names may be trademarks of their respective owners.
2967.12 *
2967.13 * The contents of this file are subject to the terms of either the GNU
2967.14 * General Public License Version 2 only ("GPL") or the Common
2967.15 @@ -13,9 +16,9 @@
2967.16 * specific language governing permissions and limitations under the
2967.17 * License. When distributing the software, include this License Header
2967.18 * Notice in each file and include the License file at
2967.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2967.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2967.21 * particular file as subject to the "Classpath" exception as provided
2967.22 - * by Sun in the GPL Version 2 section of the License file that
2967.23 + * by Oracle in the GPL Version 2 section of the License file that
2967.24 * accompanied this code. If applicable, add the following below the
2967.25 * License Header, with the fields enclosed by brackets [] replaced by
2967.26 * your own identifying information:
2968.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TabTag.java Fri Jul 16 11:47:36 2010 -0400
2968.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TabTag.java Fri Jul 16 14:21:50 2010 -0400
2968.3 @@ -1,7 +1,10 @@
2968.4 /*
2968.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2968.6 *
2968.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2968.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2968.9 + *
2968.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2968.11 + * Other names may be trademarks of their respective owners.
2968.12 *
2968.13 * The contents of this file are subject to the terms of either the GNU
2968.14 * General Public License Version 2 only ("GPL") or the Common
2968.15 @@ -13,9 +16,9 @@
2968.16 * specific language governing permissions and limitations under the
2968.17 * License. When distributing the software, include this License Header
2968.18 * Notice in each file and include the License file at
2968.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2968.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2968.21 * particular file as subject to the "Classpath" exception as provided
2968.22 - * by Sun in the GPL Version 2 section of the License file that
2968.23 + * by Oracle in the GPL Version 2 section of the License file that
2968.24 * accompanied this code. If applicable, add the following below the
2968.25 * License Header, with the fields enclosed by brackets [] replaced by
2968.26 * your own identifying information:
2969.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TableColumnTag.java Fri Jul 16 11:47:36 2010 -0400
2969.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TableColumnTag.java Fri Jul 16 14:21:50 2010 -0400
2969.3 @@ -1,7 +1,10 @@
2969.4 /*
2969.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2969.6 *
2969.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2969.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2969.9 + *
2969.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2969.11 + * Other names may be trademarks of their respective owners.
2969.12 *
2969.13 * The contents of this file are subject to the terms of either the GNU
2969.14 * General Public License Version 2 only ("GPL") or the Common
2969.15 @@ -13,9 +16,9 @@
2969.16 * specific language governing permissions and limitations under the
2969.17 * License. When distributing the software, include this License Header
2969.18 * Notice in each file and include the License file at
2969.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2969.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2969.21 * particular file as subject to the "Classpath" exception as provided
2969.22 - * by Sun in the GPL Version 2 section of the License file that
2969.23 + * by Oracle in the GPL Version 2 section of the License file that
2969.24 * accompanied this code. If applicable, add the following below the
2969.25 * License Header, with the fields enclosed by brackets [] replaced by
2969.26 * your own identifying information:
2970.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TableRowGroupTag.java Fri Jul 16 11:47:36 2010 -0400
2970.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TableRowGroupTag.java Fri Jul 16 14:21:50 2010 -0400
2970.3 @@ -1,7 +1,10 @@
2970.4 /*
2970.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2970.6 *
2970.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2970.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2970.9 + *
2970.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2970.11 + * Other names may be trademarks of their respective owners.
2970.12 *
2970.13 * The contents of this file are subject to the terms of either the GNU
2970.14 * General Public License Version 2 only ("GPL") or the Common
2970.15 @@ -13,9 +16,9 @@
2970.16 * specific language governing permissions and limitations under the
2970.17 * License. When distributing the software, include this License Header
2970.18 * Notice in each file and include the License file at
2970.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2970.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2970.21 * particular file as subject to the "Classpath" exception as provided
2970.22 - * by Sun in the GPL Version 2 section of the License file that
2970.23 + * by Oracle in the GPL Version 2 section of the License file that
2970.24 * accompanied this code. If applicable, add the following below the
2970.25 * License Header, with the fields enclosed by brackets [] replaced by
2970.26 * your own identifying information:
2971.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TableTag.java Fri Jul 16 11:47:36 2010 -0400
2971.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TableTag.java Fri Jul 16 14:21:50 2010 -0400
2971.3 @@ -1,7 +1,10 @@
2971.4 /*
2971.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2971.6 *
2971.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2971.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2971.9 + *
2971.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2971.11 + * Other names may be trademarks of their respective owners.
2971.12 *
2971.13 * The contents of this file are subject to the terms of either the GNU
2971.14 * General Public License Version 2 only ("GPL") or the Common
2971.15 @@ -13,9 +16,9 @@
2971.16 * specific language governing permissions and limitations under the
2971.17 * License. When distributing the software, include this License Header
2971.18 * Notice in each file and include the License file at
2971.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2971.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2971.21 * particular file as subject to the "Classpath" exception as provided
2971.22 - * by Sun in the GPL Version 2 section of the License file that
2971.23 + * by Oracle in the GPL Version 2 section of the License file that
2971.24 * accompanied this code. If applicable, add the following below the
2971.25 * License Header, with the fields enclosed by brackets [] replaced by
2971.26 * your own identifying information:
2972.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TextAreaTag.java Fri Jul 16 11:47:36 2010 -0400
2972.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TextAreaTag.java Fri Jul 16 14:21:50 2010 -0400
2972.3 @@ -1,7 +1,10 @@
2972.4 /*
2972.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2972.6 *
2972.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2972.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2972.9 + *
2972.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2972.11 + * Other names may be trademarks of their respective owners.
2972.12 *
2972.13 * The contents of this file are subject to the terms of either the GNU
2972.14 * General Public License Version 2 only ("GPL") or the Common
2972.15 @@ -13,9 +16,9 @@
2972.16 * specific language governing permissions and limitations under the
2972.17 * License. When distributing the software, include this License Header
2972.18 * Notice in each file and include the License file at
2972.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2972.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2972.21 * particular file as subject to the "Classpath" exception as provided
2972.22 - * by Sun in the GPL Version 2 section of the License file that
2972.23 + * by Oracle in the GPL Version 2 section of the License file that
2972.24 * accompanied this code. If applicable, add the following below the
2972.25 * License Header, with the fields enclosed by brackets [] replaced by
2972.26 * your own identifying information:
2973.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TextFieldTag.java Fri Jul 16 11:47:36 2010 -0400
2973.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TextFieldTag.java Fri Jul 16 14:21:50 2010 -0400
2973.3 @@ -1,7 +1,10 @@
2973.4 /*
2973.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2973.6 *
2973.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2973.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2973.9 + *
2973.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2973.11 + * Other names may be trademarks of their respective owners.
2973.12 *
2973.13 * The contents of this file are subject to the terms of either the GNU
2973.14 * General Public License Version 2 only ("GPL") or the Common
2973.15 @@ -13,9 +16,9 @@
2973.16 * specific language governing permissions and limitations under the
2973.17 * License. When distributing the software, include this License Header
2973.18 * Notice in each file and include the License file at
2973.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2973.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2973.21 * particular file as subject to the "Classpath" exception as provided
2973.22 - * by Sun in the GPL Version 2 section of the License file that
2973.23 + * by Oracle in the GPL Version 2 section of the License file that
2973.24 * accompanied this code. If applicable, add the following below the
2973.25 * License Header, with the fields enclosed by brackets [] replaced by
2973.26 * your own identifying information:
2974.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ThemeLinksTag.java Fri Jul 16 11:47:36 2010 -0400
2974.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/ThemeLinksTag.java Fri Jul 16 14:21:50 2010 -0400
2974.3 @@ -1,7 +1,10 @@
2974.4 /*
2974.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2974.6 *
2974.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2974.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2974.9 + *
2974.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2974.11 + * Other names may be trademarks of their respective owners.
2974.12 *
2974.13 * The contents of this file are subject to the terms of either the GNU
2974.14 * General Public License Version 2 only ("GPL") or the Common
2974.15 @@ -13,9 +16,9 @@
2974.16 * specific language governing permissions and limitations under the
2974.17 * License. When distributing the software, include this License Header
2974.18 * Notice in each file and include the License file at
2974.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2974.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2974.21 * particular file as subject to the "Classpath" exception as provided
2974.22 - * by Sun in the GPL Version 2 section of the License file that
2974.23 + * by Oracle in the GPL Version 2 section of the License file that
2974.24 * accompanied this code. If applicable, add the following below the
2974.25 * License Header, with the fields enclosed by brackets [] replaced by
2974.26 * your own identifying information:
2975.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TreeNodeTag.java Fri Jul 16 11:47:36 2010 -0400
2975.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TreeNodeTag.java Fri Jul 16 14:21:50 2010 -0400
2975.3 @@ -1,7 +1,10 @@
2975.4 /*
2975.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2975.6 *
2975.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2975.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2975.9 + *
2975.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2975.11 + * Other names may be trademarks of their respective owners.
2975.12 *
2975.13 * The contents of this file are subject to the terms of either the GNU
2975.14 * General Public License Version 2 only ("GPL") or the Common
2975.15 @@ -13,9 +16,9 @@
2975.16 * specific language governing permissions and limitations under the
2975.17 * License. When distributing the software, include this License Header
2975.18 * Notice in each file and include the License file at
2975.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2975.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2975.21 * particular file as subject to the "Classpath" exception as provided
2975.22 - * by Sun in the GPL Version 2 section of the License file that
2975.23 + * by Oracle in the GPL Version 2 section of the License file that
2975.24 * accompanied this code. If applicable, add the following below the
2975.25 * License Header, with the fields enclosed by brackets [] replaced by
2975.26 * your own identifying information:
2976.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TreeTag.java Fri Jul 16 11:47:36 2010 -0400
2976.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/TreeTag.java Fri Jul 16 14:21:50 2010 -0400
2976.3 @@ -1,7 +1,10 @@
2976.4 /*
2976.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2976.6 *
2976.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2976.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2976.9 + *
2976.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2976.11 + * Other names may be trademarks of their respective owners.
2976.12 *
2976.13 * The contents of this file are subject to the terms of either the GNU
2976.14 * General Public License Version 2 only ("GPL") or the Common
2976.15 @@ -13,9 +16,9 @@
2976.16 * specific language governing permissions and limitations under the
2976.17 * License. When distributing the software, include this License Header
2976.18 * Notice in each file and include the License file at
2976.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2976.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2976.21 * particular file as subject to the "Classpath" exception as provided
2976.22 - * by Sun in the GPL Version 2 section of the License file that
2976.23 + * by Oracle in the GPL Version 2 section of the License file that
2976.24 * accompanied this code. If applicable, add the following below the
2976.25 * License Header, with the fields enclosed by brackets [] replaced by
2976.26 * your own identifying information:
2977.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/UploadTag.java Fri Jul 16 11:47:36 2010 -0400
2977.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/taglib/UploadTag.java Fri Jul 16 14:21:50 2010 -0400
2977.3 @@ -1,7 +1,10 @@
2977.4 /*
2977.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2977.6 *
2977.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2977.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2977.9 + *
2977.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2977.11 + * Other names may be trademarks of their respective owners.
2977.12 *
2977.13 * The contents of this file are subject to the terms of either the GNU
2977.14 * General Public License Version 2 only ("GPL") or the Common
2977.15 @@ -13,9 +16,9 @@
2977.16 * specific language governing permissions and limitations under the
2977.17 * License. When distributing the software, include this License Header
2977.18 * Notice in each file and include the License file at
2977.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2977.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2977.21 * particular file as subject to the "Classpath" exception as provided
2977.22 - * by Sun in the GPL Version 2 section of the License file that
2977.23 + * by Oracle in the GPL Version 2 section of the License file that
2977.24 * accompanied this code. If applicable, add the following below the
2977.25 * License Header, with the fields enclosed by brackets [] replaced by
2977.26 * your own identifying information:
2978.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/theme/Theme.java Fri Jul 16 11:47:36 2010 -0400
2978.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/theme/Theme.java Fri Jul 16 14:21:50 2010 -0400
2978.3 @@ -1,7 +1,10 @@
2978.4 /*
2978.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2978.6 *
2978.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2978.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2978.9 + *
2978.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2978.11 + * Other names may be trademarks of their respective owners.
2978.12 *
2978.13 * The contents of this file are subject to the terms of either the GNU
2978.14 * General Public License Version 2 only ("GPL") or the Common
2978.15 @@ -13,9 +16,9 @@
2978.16 * specific language governing permissions and limitations under the
2978.17 * License. When distributing the software, include this License Header
2978.18 * Notice in each file and include the License file at
2978.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2978.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2978.21 * particular file as subject to the "Classpath" exception as provided
2978.22 - * by Sun in the GPL Version 2 section of the License file that
2978.23 + * by Oracle in the GPL Version 2 section of the License file that
2978.24 * accompanied this code. If applicable, add the following below the
2978.25 * License Header, with the fields enclosed by brackets [] replaced by
2978.26 * your own identifying information:
2979.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeConfigurationException.java Fri Jul 16 11:47:36 2010 -0400
2979.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeConfigurationException.java Fri Jul 16 14:21:50 2010 -0400
2979.3 @@ -1,7 +1,10 @@
2979.4 /*
2979.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2979.6 *
2979.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2979.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2979.9 + *
2979.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2979.11 + * Other names may be trademarks of their respective owners.
2979.12 *
2979.13 * The contents of this file are subject to the terms of either the GNU
2979.14 * General Public License Version 2 only ("GPL") or the Common
2979.15 @@ -13,9 +16,9 @@
2979.16 * specific language governing permissions and limitations under the
2979.17 * License. When distributing the software, include this License Header
2979.18 * Notice in each file and include the License file at
2979.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2979.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2979.21 * particular file as subject to the "Classpath" exception as provided
2979.22 - * by Sun in the GPL Version 2 section of the License file that
2979.23 + * by Oracle in the GPL Version 2 section of the License file that
2979.24 * accompanied this code. If applicable, add the following below the
2979.25 * License Header, with the fields enclosed by brackets [] replaced by
2979.26 * your own identifying information:
2980.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeFactory.java Fri Jul 16 11:47:36 2010 -0400
2980.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeFactory.java Fri Jul 16 14:21:50 2010 -0400
2980.3 @@ -1,7 +1,10 @@
2980.4 /*
2980.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2980.6 *
2980.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2980.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2980.9 + *
2980.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2980.11 + * Other names may be trademarks of their respective owners.
2980.12 *
2980.13 * The contents of this file are subject to the terms of either the GNU
2980.14 * General Public License Version 2 only ("GPL") or the Common
2980.15 @@ -13,9 +16,9 @@
2980.16 * specific language governing permissions and limitations under the
2980.17 * License. When distributing the software, include this License Header
2980.18 * Notice in each file and include the License file at
2980.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2980.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2980.21 * particular file as subject to the "Classpath" exception as provided
2980.22 - * by Sun in the GPL Version 2 section of the License file that
2980.23 + * by Oracle in the GPL Version 2 section of the License file that
2980.24 * accompanied this code. If applicable, add the following below the
2980.25 * License Header, with the fields enclosed by brackets [] replaced by
2980.26 * your own identifying information:
2981.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeImages.java Fri Jul 16 11:47:36 2010 -0400
2981.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeImages.java Fri Jul 16 14:21:50 2010 -0400
2981.3 @@ -1,7 +1,10 @@
2981.4 /*
2981.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2981.6 *
2981.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2981.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2981.9 + *
2981.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2981.11 + * Other names may be trademarks of their respective owners.
2981.12 *
2981.13 * The contents of this file are subject to the terms of either the GNU
2981.14 * General Public License Version 2 only ("GPL") or the Common
2981.15 @@ -13,9 +16,9 @@
2981.16 * specific language governing permissions and limitations under the
2981.17 * License. When distributing the software, include this License Header
2981.18 * Notice in each file and include the License file at
2981.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2981.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2981.21 * particular file as subject to the "Classpath" exception as provided
2981.22 - * by Sun in the GPL Version 2 section of the License file that
2981.23 + * by Oracle in the GPL Version 2 section of the License file that
2981.24 * accompanied this code. If applicable, add the following below the
2981.25 * License Header, with the fields enclosed by brackets [] replaced by
2981.26 * your own identifying information:
2982.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeJavascript.java Fri Jul 16 11:47:36 2010 -0400
2982.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeJavascript.java Fri Jul 16 14:21:50 2010 -0400
2982.3 @@ -1,7 +1,10 @@
2982.4 /*
2982.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2982.6 *
2982.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2982.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2982.9 + *
2982.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2982.11 + * Other names may be trademarks of their respective owners.
2982.12 *
2982.13 * The contents of this file are subject to the terms of either the GNU
2982.14 * General Public License Version 2 only ("GPL") or the Common
2982.15 @@ -13,9 +16,9 @@
2982.16 * specific language governing permissions and limitations under the
2982.17 * License. When distributing the software, include this License Header
2982.18 * Notice in each file and include the License file at
2982.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2982.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2982.21 * particular file as subject to the "Classpath" exception as provided
2982.22 - * by Sun in the GPL Version 2 section of the License file that
2982.23 + * by Oracle in the GPL Version 2 section of the License file that
2982.24 * accompanied this code. If applicable, add the following below the
2982.25 * License Header, with the fields enclosed by brackets [] replaced by
2982.26 * your own identifying information:
2983.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeManager.java Fri Jul 16 11:47:36 2010 -0400
2983.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeManager.java Fri Jul 16 14:21:50 2010 -0400
2983.3 @@ -1,7 +1,10 @@
2983.4 /*
2983.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2983.6 *
2983.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2983.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2983.9 + *
2983.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2983.11 + * Other names may be trademarks of their respective owners.
2983.12 *
2983.13 * The contents of this file are subject to the terms of either the GNU
2983.14 * General Public License Version 2 only ("GPL") or the Common
2983.15 @@ -13,9 +16,9 @@
2983.16 * specific language governing permissions and limitations under the
2983.17 * License. When distributing the software, include this License Header
2983.18 * Notice in each file and include the License file at
2983.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2983.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2983.21 * particular file as subject to the "Classpath" exception as provided
2983.22 - * by Sun in the GPL Version 2 section of the License file that
2983.23 + * by Oracle in the GPL Version 2 section of the License file that
2983.24 * accompanied this code. If applicable, add the following below the
2983.25 * License Header, with the fields enclosed by brackets [] replaced by
2983.26 * your own identifying information:
2984.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeServlet.java Fri Jul 16 11:47:36 2010 -0400
2984.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeServlet.java Fri Jul 16 14:21:50 2010 -0400
2984.3 @@ -1,7 +1,10 @@
2984.4 /*
2984.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2984.6 *
2984.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2984.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2984.9 + *
2984.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2984.11 + * Other names may be trademarks of their respective owners.
2984.12 *
2984.13 * The contents of this file are subject to the terms of either the GNU
2984.14 * General Public License Version 2 only ("GPL") or the Common
2984.15 @@ -13,9 +16,9 @@
2984.16 * specific language governing permissions and limitations under the
2984.17 * License. When distributing the software, include this License Header
2984.18 * Notice in each file and include the License file at
2984.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2984.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2984.21 * particular file as subject to the "Classpath" exception as provided
2984.22 - * by Sun in the GPL Version 2 section of the License file that
2984.23 + * by Oracle in the GPL Version 2 section of the License file that
2984.24 * accompanied this code. If applicable, add the following below the
2984.25 * License Header, with the fields enclosed by brackets [] replaced by
2984.26 * your own identifying information:
2985.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeStyles.java Fri Jul 16 11:47:36 2010 -0400
2985.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/theme/ThemeStyles.java Fri Jul 16 14:21:50 2010 -0400
2985.3 @@ -1,7 +1,10 @@
2985.4 /*
2985.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2985.6 *
2985.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2985.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2985.9 + *
2985.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2985.11 + * Other names may be trademarks of their respective owners.
2985.12 *
2985.13 * The contents of this file are subject to the terms of either the GNU
2985.14 * General Public License Version 2 only ("GPL") or the Common
2985.15 @@ -13,9 +16,9 @@
2985.16 * specific language governing permissions and limitations under the
2985.17 * License. When distributing the software, include this License Header
2985.18 * Notice in each file and include the License file at
2985.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2985.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2985.21 * particular file as subject to the "Classpath" exception as provided
2985.22 - * by Sun in the GPL Version 2 section of the License file that
2985.23 + * by Oracle in the GPL Version 2 section of the License file that
2985.24 * accompanied this code. If applicable, add the following below the
2985.25 * License Header, with the fields enclosed by brackets [] replaced by
2985.26 * your own identifying information:
2986.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/Bundle.java Fri Jul 16 11:47:36 2010 -0400
2986.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/Bundle.java Fri Jul 16 14:21:50 2010 -0400
2986.3 @@ -1,7 +1,10 @@
2986.4 /*
2986.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2986.6 *
2986.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2986.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2986.9 + *
2986.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2986.11 + * Other names may be trademarks of their respective owners.
2986.12 *
2986.13 * The contents of this file are subject to the terms of either the GNU
2986.14 * General Public License Version 2 only ("GPL") or the Common
2986.15 @@ -13,9 +16,9 @@
2986.16 * specific language governing permissions and limitations under the
2986.17 * License. When distributing the software, include this License Header
2986.18 * Notice in each file and include the License file at
2986.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2986.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2986.21 * particular file as subject to the "Classpath" exception as provided
2986.22 - * by Sun in the GPL Version 2 section of the License file that
2986.23 + * by Oracle in the GPL Version 2 section of the License file that
2986.24 * accompanied this code. If applicable, add the following below the
2986.25 * License Header, with the fields enclosed by brackets [] replaced by
2986.26 * your own identifying information:
2987.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ClassLoaderFinder.java Fri Jul 16 11:47:36 2010 -0400
2987.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ClassLoaderFinder.java Fri Jul 16 14:21:50 2010 -0400
2987.3 @@ -1,7 +1,10 @@
2987.4 /*
2987.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2987.6 *
2987.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2987.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2987.9 + *
2987.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2987.11 + * Other names may be trademarks of their respective owners.
2987.12 *
2987.13 * The contents of this file are subject to the terms of either the GNU
2987.14 * General Public License Version 2 only ("GPL") or the Common
2987.15 @@ -13,9 +16,9 @@
2987.16 * specific language governing permissions and limitations under the
2987.17 * License. When distributing the software, include this License Header
2987.18 * Notice in each file and include the License file at
2987.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2987.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2987.21 * particular file as subject to the "Classpath" exception as provided
2987.22 - * by Sun in the GPL Version 2 section of the License file that
2987.23 + * by Oracle in the GPL Version 2 section of the License file that
2987.24 * accompanied this code. If applicable, add the following below the
2987.25 * License Header, with the fields enclosed by brackets [] replaced by
2987.26 * your own identifying information:
2988.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ClientSniffer.java Fri Jul 16 11:47:36 2010 -0400
2988.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ClientSniffer.java Fri Jul 16 14:21:50 2010 -0400
2988.3 @@ -1,7 +1,10 @@
2988.4 /*
2988.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2988.6 *
2988.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2988.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2988.9 + *
2988.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2988.11 + * Other names may be trademarks of their respective owners.
2988.12 *
2988.13 * The contents of this file are subject to the terms of either the GNU
2988.14 * General Public License Version 2 only ("GPL") or the Common
2988.15 @@ -13,9 +16,9 @@
2988.16 * specific language governing permissions and limitations under the
2988.17 * License. When distributing the software, include this License Header
2988.18 * Notice in each file and include the License file at
2988.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2988.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2988.21 * particular file as subject to the "Classpath" exception as provided
2988.22 - * by Sun in the GPL Version 2 section of the License file that
2988.23 + * by Oracle in the GPL Version 2 section of the License file that
2988.24 * accompanied this code. If applicable, add the following below the
2988.25 * License Header, with the fields enclosed by brackets [] replaced by
2988.26 * your own identifying information:
2989.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ClientType.java Fri Jul 16 11:47:36 2010 -0400
2989.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ClientType.java Fri Jul 16 14:21:50 2010 -0400
2989.3 @@ -1,7 +1,10 @@
2989.4 /*
2989.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2989.6 *
2989.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2989.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2989.9 + *
2989.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2989.11 + * Other names may be trademarks of their respective owners.
2989.12 *
2989.13 * The contents of this file are subject to the terms of either the GNU
2989.14 * General Public License Version 2 only ("GPL") or the Common
2989.15 @@ -13,9 +16,9 @@
2989.16 * specific language governing permissions and limitations under the
2989.17 * License. When distributing the software, include this License Header
2989.18 * Notice in each file and include the License file at
2989.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2989.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2989.21 * particular file as subject to the "Classpath" exception as provided
2989.22 - * by Sun in the GPL Version 2 section of the License file that
2989.23 + * by Oracle in the GPL Version 2 section of the License file that
2989.24 * accompanied this code. If applicable, add the following below the
2989.25 * License Header, with the fields enclosed by brackets [] replaced by
2989.26 * your own identifying information:
2990.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ComponentUtilities.java Fri Jul 16 11:47:36 2010 -0400
2990.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ComponentUtilities.java Fri Jul 16 14:21:50 2010 -0400
2990.3 @@ -1,7 +1,10 @@
2990.4 /*
2990.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2990.6 *
2990.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2990.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2990.9 + *
2990.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2990.11 + * Other names may be trademarks of their respective owners.
2990.12 *
2990.13 * The contents of this file are subject to the terms of either the GNU
2990.14 * General Public License Version 2 only ("GPL") or the Common
2990.15 @@ -13,9 +16,9 @@
2990.16 * specific language governing permissions and limitations under the
2990.17 * License. When distributing the software, include this License Header
2990.18 * Notice in each file and include the License file at
2990.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2990.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2990.21 * particular file as subject to the "Classpath" exception as provided
2990.22 - * by Sun in the GPL Version 2 section of the License file that
2990.23 + * by Oracle in the GPL Version 2 section of the License file that
2990.24 * accompanied this code. If applicable, add the following below the
2990.25 * License Header, with the fields enclosed by brackets [] replaced by
2990.26 * your own identifying information:
2991.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ConversionUtilities.java Fri Jul 16 11:47:36 2010 -0400
2991.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ConversionUtilities.java Fri Jul 16 14:21:50 2010 -0400
2991.3 @@ -1,7 +1,10 @@
2991.4 /*
2991.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2991.6 *
2991.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2991.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2991.9 + *
2991.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2991.11 + * Other names may be trademarks of their respective owners.
2991.12 *
2991.13 * The contents of this file are subject to the terms of either the GNU
2991.14 * General Public License Version 2 only ("GPL") or the Common
2991.15 @@ -13,9 +16,9 @@
2991.16 * specific language governing permissions and limitations under the
2991.17 * License. When distributing the software, include this License Header
2991.18 * Notice in each file and include the License file at
2991.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2991.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2991.21 * particular file as subject to the "Classpath" exception as provided
2991.22 - * by Sun in the GPL Version 2 section of the License file that
2991.23 + * by Oracle in the GPL Version 2 section of the License file that
2991.24 * accompanied this code. If applicable, add the following below the
2991.25 * License Header, with the fields enclosed by brackets [] replaced by
2991.26 * your own identifying information:
2992.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/FacesMessageUtils.java Fri Jul 16 11:47:36 2010 -0400
2992.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/FacesMessageUtils.java Fri Jul 16 14:21:50 2010 -0400
2992.3 @@ -1,7 +1,10 @@
2992.4 /*
2992.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2992.6 *
2992.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2992.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2992.9 + *
2992.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2992.11 + * Other names may be trademarks of their respective owners.
2992.12 *
2992.13 * The contents of this file are subject to the terms of either the GNU
2992.14 * General Public License Version 2 only ("GPL") or the Common
2992.15 @@ -13,9 +16,9 @@
2992.16 * specific language governing permissions and limitations under the
2992.17 * License. When distributing the software, include this License Header
2992.18 * Notice in each file and include the License file at
2992.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2992.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2992.21 * particular file as subject to the "Classpath" exception as provided
2992.22 - * by Sun in the GPL Version 2 section of the License file that
2992.23 + * by Oracle in the GPL Version 2 section of the License file that
2992.24 * accompanied this code. If applicable, add the following below the
2992.25 * License Header, with the fields enclosed by brackets [] replaced by
2992.26 * your own identifying information:
2993.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/FilterUtil.java Fri Jul 16 11:47:36 2010 -0400
2993.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/FilterUtil.java Fri Jul 16 14:21:50 2010 -0400
2993.3 @@ -1,7 +1,10 @@
2993.4 /*
2993.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2993.6 *
2993.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2993.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2993.9 + *
2993.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2993.11 + * Other names may be trademarks of their respective owners.
2993.12 *
2993.13 * The contents of this file are subject to the terms of either the GNU
2993.14 * General Public License Version 2 only ("GPL") or the Common
2993.15 @@ -13,9 +16,9 @@
2993.16 * specific language governing permissions and limitations under the
2993.17 * License. When distributing the software, include this License Header
2993.18 * Notice in each file and include the License file at
2993.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2993.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2993.21 * particular file as subject to the "Classpath" exception as provided
2993.22 - * by Sun in the GPL Version 2 section of the License file that
2993.23 + * by Oracle in the GPL Version 2 section of the License file that
2993.24 * accompanied this code. If applicable, add the following below the
2993.25 * License Header, with the fields enclosed by brackets [] replaced by
2993.26 * your own identifying information:
2994.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/HelpUtils.java Fri Jul 16 11:47:36 2010 -0400
2994.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/HelpUtils.java Fri Jul 16 14:21:50 2010 -0400
2994.3 @@ -1,7 +1,10 @@
2994.4 /*
2994.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2994.6 *
2994.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2994.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2994.9 + *
2994.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2994.11 + * Other names may be trademarks of their respective owners.
2994.12 *
2994.13 * The contents of this file are subject to the terms of either the GNU
2994.14 * General Public License Version 2 only ("GPL") or the Common
2994.15 @@ -13,9 +16,9 @@
2994.16 * specific language governing permissions and limitations under the
2994.17 * License. When distributing the software, include this License Header
2994.18 * Notice in each file and include the License file at
2994.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2994.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2994.21 * particular file as subject to the "Classpath" exception as provided
2994.22 - * by Sun in the GPL Version 2 section of the License file that
2994.23 + * by Oracle in the GPL Version 2 section of the License file that
2994.24 * accompanied this code. If applicable, add the following below the
2994.25 * License Header, with the fields enclosed by brackets [] replaced by
2994.26 * your own identifying information:
2995.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/IncludeInputStream.java Fri Jul 16 11:47:36 2010 -0400
2995.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/IncludeInputStream.java Fri Jul 16 14:21:50 2010 -0400
2995.3 @@ -1,7 +1,10 @@
2995.4 /*
2995.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2995.6 *
2995.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2995.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2995.9 + *
2995.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2995.11 + * Other names may be trademarks of their respective owners.
2995.12 *
2995.13 * The contents of this file are subject to the terms of either the GNU
2995.14 * General Public License Version 2 only ("GPL") or the Common
2995.15 @@ -13,9 +16,9 @@
2995.16 * specific language governing permissions and limitations under the
2995.17 * License. When distributing the software, include this License Header
2995.18 * Notice in each file and include the License file at
2995.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2995.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2995.21 * particular file as subject to the "Classpath" exception as provided
2995.22 - * by Sun in the GPL Version 2 section of the License file that
2995.23 + * by Oracle in the GPL Version 2 section of the License file that
2995.24 * accompanied this code. If applicable, add the following below the
2995.25 * License Header, with the fields enclosed by brackets [] replaced by
2995.26 * your own identifying information:
2996.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/LogUtil.java Fri Jul 16 11:47:36 2010 -0400
2996.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/LogUtil.java Fri Jul 16 14:21:50 2010 -0400
2996.3 @@ -1,7 +1,10 @@
2996.4 /*
2996.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2996.6 *
2996.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2996.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2996.9 + *
2996.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2996.11 + * Other names may be trademarks of their respective owners.
2996.12 *
2996.13 * The contents of this file are subject to the terms of either the GNU
2996.14 * General Public License Version 2 only ("GPL") or the Common
2996.15 @@ -13,9 +16,9 @@
2996.16 * specific language governing permissions and limitations under the
2996.17 * License. When distributing the software, include this License Header
2996.18 * Notice in each file and include the License file at
2996.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2996.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2996.21 * particular file as subject to the "Classpath" exception as provided
2996.22 - * by Sun in the GPL Version 2 section of the License file that
2996.23 + * by Oracle in the GPL Version 2 section of the License file that
2996.24 * accompanied this code. If applicable, add the following below the
2996.25 * License Header, with the fields enclosed by brackets [] replaced by
2996.26 * your own identifying information:
2997.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/MessageUtil.java Fri Jul 16 11:47:36 2010 -0400
2997.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/MessageUtil.java Fri Jul 16 14:21:50 2010 -0400
2997.3 @@ -1,7 +1,10 @@
2997.4 /*
2997.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2997.6 *
2997.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2997.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2997.9 + *
2997.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2997.11 + * Other names may be trademarks of their respective owners.
2997.12 *
2997.13 * The contents of this file are subject to the terms of either the GNU
2997.14 * General Public License Version 2 only ("GPL") or the Common
2997.15 @@ -13,9 +16,9 @@
2997.16 * specific language governing permissions and limitations under the
2997.17 * License. When distributing the software, include this License Header
2997.18 * Notice in each file and include the License file at
2997.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2997.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2997.21 * particular file as subject to the "Classpath" exception as provided
2997.22 - * by Sun in the GPL Version 2 section of the License file that
2997.23 + * by Oracle in the GPL Version 2 section of the License file that
2997.24 * accompanied this code. If applicable, add the following below the
2997.25 * License Header, with the fields enclosed by brackets [] replaced by
2997.26 * your own identifying information:
2998.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/PermissionChecker.java Fri Jul 16 11:47:36 2010 -0400
2998.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/PermissionChecker.java Fri Jul 16 14:21:50 2010 -0400
2998.3 @@ -1,7 +1,10 @@
2998.4 /*
2998.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2998.6 *
2998.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2998.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2998.9 + *
2998.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2998.11 + * Other names may be trademarks of their respective owners.
2998.12 *
2998.13 * The contents of this file are subject to the terms of either the GNU
2998.14 * General Public License Version 2 only ("GPL") or the Common
2998.15 @@ -13,9 +16,9 @@
2998.16 * specific language governing permissions and limitations under the
2998.17 * License. When distributing the software, include this License Header
2998.18 * Notice in each file and include the License file at
2998.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2998.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2998.21 * particular file as subject to the "Classpath" exception as provided
2998.22 - * by Sun in the GPL Version 2 section of the License file that
2998.23 + * by Oracle in the GPL Version 2 section of the License file that
2998.24 * accompanied this code. If applicable, add the following below the
2998.25 * License Header, with the fields enclosed by brackets [] replaced by
2998.26 * your own identifying information:
2999.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/RenderingUtilities.java Fri Jul 16 11:47:36 2010 -0400
2999.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/RenderingUtilities.java Fri Jul 16 14:21:50 2010 -0400
2999.3 @@ -1,7 +1,10 @@
2999.4 /*
2999.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2999.6 *
2999.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
2999.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2999.9 + *
2999.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2999.11 + * Other names may be trademarks of their respective owners.
2999.12 *
2999.13 * The contents of this file are subject to the terms of either the GNU
2999.14 * General Public License Version 2 only ("GPL") or the Common
2999.15 @@ -13,9 +16,9 @@
2999.16 * specific language governing permissions and limitations under the
2999.17 * License. When distributing the software, include this License Header
2999.18 * Notice in each file and include the License file at
2999.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2999.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2999.21 * particular file as subject to the "Classpath" exception as provided
2999.22 - * by Sun in the GPL Version 2 section of the License file that
2999.23 + * by Oracle in the GPL Version 2 section of the License file that
2999.24 * accompanied this code. If applicable, add the following below the
2999.25 * License Header, with the fields enclosed by brackets [] replaced by
2999.26 * your own identifying information:
3000.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ResourceBundleFactory.java Fri Jul 16 11:47:36 2010 -0400
3000.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ResourceBundleFactory.java Fri Jul 16 14:21:50 2010 -0400
3000.3 @@ -1,7 +1,10 @@
3000.4 /*
3000.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3000.6 *
3000.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3000.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3000.9 + *
3000.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3000.11 + * Other names may be trademarks of their respective owners.
3000.12 *
3000.13 * The contents of this file are subject to the terms of either the GNU
3000.14 * General Public License Version 2 only ("GPL") or the Common
3000.15 @@ -13,9 +16,9 @@
3000.16 * specific language governing permissions and limitations under the
3000.17 * License. When distributing the software, include this License Header
3000.18 * Notice in each file and include the License file at
3000.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3000.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3000.21 * particular file as subject to the "Classpath" exception as provided
3000.22 - * by Sun in the GPL Version 2 section of the License file that
3000.23 + * by Oracle in the GPL Version 2 section of the License file that
3000.24 * accompanied this code. If applicable, add the following below the
3000.25 * License Header, with the fields enclosed by brackets [] replaced by
3000.26 * your own identifying information:
3001.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ResourceBundleManager.java Fri Jul 16 11:47:36 2010 -0400
3001.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ResourceBundleManager.java Fri Jul 16 14:21:50 2010 -0400
3001.3 @@ -1,7 +1,10 @@
3001.4 /*
3001.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3001.6 *
3001.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3001.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3001.9 + *
3001.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3001.11 + * Other names may be trademarks of their respective owners.
3001.12 *
3001.13 * The contents of this file are subject to the terms of either the GNU
3001.14 * General Public License Version 2 only ("GPL") or the Common
3001.15 @@ -13,9 +16,9 @@
3001.16 * specific language governing permissions and limitations under the
3001.17 * License. When distributing the software, include this License Header
3001.18 * Notice in each file and include the License file at
3001.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3001.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3001.21 * particular file as subject to the "Classpath" exception as provided
3001.22 - * by Sun in the GPL Version 2 section of the License file that
3001.23 + * by Oracle in the GPL Version 2 section of the License file that
3001.24 * accompanied this code. If applicable, add the following below the
3001.25 * License Header, with the fields enclosed by brackets [] replaced by
3001.26 * your own identifying information:
3002.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ResourceFactory.java Fri Jul 16 11:47:36 2010 -0400
3002.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ResourceFactory.java Fri Jul 16 14:21:50 2010 -0400
3002.3 @@ -1,7 +1,10 @@
3002.4 /*
3002.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3002.6 *
3002.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3002.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3002.9 + *
3002.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3002.11 + * Other names may be trademarks of their respective owners.
3002.12 *
3002.13 * The contents of this file are subject to the terms of either the GNU
3002.14 * General Public License Version 2 only ("GPL") or the Common
3002.15 @@ -13,9 +16,9 @@
3002.16 * specific language governing permissions and limitations under the
3002.17 * License. When distributing the software, include this License Header
3002.18 * Notice in each file and include the License file at
3002.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3002.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3002.21 * particular file as subject to the "Classpath" exception as provided
3002.22 - * by Sun in the GPL Version 2 section of the License file that
3002.23 + * by Oracle in the GPL Version 2 section of the License file that
3002.24 * accompanied this code. If applicable, add the following below the
3002.25 * License Header, with the fields enclosed by brackets [] replaced by
3002.26 * your own identifying information:
3003.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ThemeUtilities.java Fri Jul 16 11:47:36 2010 -0400
3003.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ThemeUtilities.java Fri Jul 16 14:21:50 2010 -0400
3003.3 @@ -1,7 +1,10 @@
3003.4 /*
3003.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3003.6 *
3003.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3003.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3003.9 + *
3003.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3003.11 + * Other names may be trademarks of their respective owners.
3003.12 *
3003.13 * The contents of this file are subject to the terms of either the GNU
3003.14 * General Public License Version 2 only ("GPL") or the Common
3003.15 @@ -13,9 +16,9 @@
3003.16 * specific language governing permissions and limitations under the
3003.17 * License. When distributing the software, include this License Header
3003.18 * Notice in each file and include the License file at
3003.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3003.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3003.21 * particular file as subject to the "Classpath" exception as provided
3003.22 - * by Sun in the GPL Version 2 section of the License file that
3003.23 + * by Oracle in the GPL Version 2 section of the License file that
3003.24 * accompanied this code. If applicable, add the following below the
3003.25 * License Header, with the fields enclosed by brackets [] replaced by
3003.26 * your own identifying information:
3004.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/TypeConversion.java Fri Jul 16 11:47:36 2010 -0400
3004.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/TypeConversion.java Fri Jul 16 14:21:50 2010 -0400
3004.3 @@ -1,7 +1,10 @@
3004.4 /*
3004.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3004.6 *
3004.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3004.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3004.9 + *
3004.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3004.11 + * Other names may be trademarks of their respective owners.
3004.12 *
3004.13 * The contents of this file are subject to the terms of either the GNU
3004.14 * General Public License Version 2 only ("GPL") or the Common
3004.15 @@ -13,9 +16,9 @@
3004.16 * specific language governing permissions and limitations under the
3004.17 * License. When distributing the software, include this License Header
3004.18 * Notice in each file and include the License file at
3004.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3004.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3004.21 * particular file as subject to the "Classpath" exception as provided
3004.22 - * by Sun in the GPL Version 2 section of the License file that
3004.23 + * by Oracle in the GPL Version 2 section of the License file that
3004.24 * accompanied this code. If applicable, add the following below the
3004.25 * License Header, with the fields enclosed by brackets [] replaced by
3004.26 * your own identifying information:
3005.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/TypeConverter.java Fri Jul 16 11:47:36 2010 -0400
3005.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/TypeConverter.java Fri Jul 16 14:21:50 2010 -0400
3005.3 @@ -1,7 +1,10 @@
3005.4 /*
3005.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3005.6 *
3005.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3005.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3005.9 + *
3005.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3005.11 + * Other names may be trademarks of their respective owners.
3005.12 *
3005.13 * The contents of this file are subject to the terms of either the GNU
3005.14 * General Public License Version 2 only ("GPL") or the Common
3005.15 @@ -13,9 +16,9 @@
3005.16 * specific language governing permissions and limitations under the
3005.17 * License. When distributing the software, include this License Header
3005.18 * Notice in each file and include the License file at
3005.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3005.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3005.21 * particular file as subject to the "Classpath" exception as provided
3005.22 - * by Sun in the GPL Version 2 section of the License file that
3005.23 + * by Oracle in the GPL Version 2 section of the License file that
3005.24 * accompanied this code. If applicable, add the following below the
3005.25 * License Header, with the fields enclosed by brackets [] replaced by
3005.26 * your own identifying information:
3006.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/UploadFilter.java Fri Jul 16 11:47:36 2010 -0400
3006.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/UploadFilter.java Fri Jul 16 14:21:50 2010 -0400
3006.3 @@ -1,7 +1,10 @@
3006.4 /*
3006.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3006.6 *
3006.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3006.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3006.9 + *
3006.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3006.11 + * Other names may be trademarks of their respective owners.
3006.12 *
3006.13 * The contents of this file are subject to the terms of either the GNU
3006.14 * General Public License Version 2 only ("GPL") or the Common
3006.15 @@ -13,9 +16,9 @@
3006.16 * specific language governing permissions and limitations under the
3006.17 * License. When distributing the software, include this License Header
3006.18 * Notice in each file and include the License file at
3006.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3006.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3006.21 * particular file as subject to the "Classpath" exception as provided
3006.22 - * by Sun in the GPL Version 2 section of the License file that
3006.23 + * by Oracle in the GPL Version 2 section of the License file that
3006.24 * accompanied this code. If applicable, add the following below the
3006.25 * License Header, with the fields enclosed by brackets [] replaced by
3006.26 * your own identifying information:
3007.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ValueType.java Fri Jul 16 11:47:36 2010 -0400
3007.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ValueType.java Fri Jul 16 14:21:50 2010 -0400
3007.3 @@ -1,7 +1,10 @@
3007.4 /*
3007.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3007.6 *
3007.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3007.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3007.9 + *
3007.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3007.11 + * Other names may be trademarks of their respective owners.
3007.12 *
3007.13 * The contents of this file are subject to the terms of either the GNU
3007.14 * General Public License Version 2 only ("GPL") or the Common
3007.15 @@ -13,9 +16,9 @@
3007.16 * specific language governing permissions and limitations under the
3007.17 * License. When distributing the software, include this License Header
3007.18 * Notice in each file and include the License file at
3007.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3007.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3007.21 * particular file as subject to the "Classpath" exception as provided
3007.22 - * by Sun in the GPL Version 2 section of the License file that
3007.23 + * by Oracle in the GPL Version 2 section of the License file that
3007.24 * accompanied this code. If applicable, add the following below the
3007.25 * License Header, with the fields enclosed by brackets [] replaced by
3007.26 * your own identifying information:
3008.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/ValueTypeEvaluator.java Fri Jul 16 11:47:36 2010 -0400
3008.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/ValueTypeEvaluator.java Fri Jul 16 14:21:50 2010 -0400
3008.3 @@ -1,7 +1,10 @@
3008.4 /*
3008.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3008.6 *
3008.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3008.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3008.9 + *
3008.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3008.11 + * Other names may be trademarks of their respective owners.
3008.12 *
3008.13 * The contents of this file are subject to the terms of either the GNU
3008.14 * General Public License Version 2 only ("GPL") or the Common
3008.15 @@ -13,9 +16,9 @@
3008.16 * specific language governing permissions and limitations under the
3008.17 * License. When distributing the software, include this License Header
3008.18 * Notice in each file and include the License file at
3008.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3008.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3008.21 * particular file as subject to the "Classpath" exception as provided
3008.22 - * by Sun in the GPL Version 2 section of the License file that
3008.23 + * by Oracle in the GPL Version 2 section of the License file that
3008.24 * accompanied this code. If applicable, add the following below the
3008.25 * License Header, with the fields enclosed by brackets [] replaced by
3008.26 * your own identifying information:
3009.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/util/VariableResolver.java Fri Jul 16 11:47:36 2010 -0400
3009.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/util/VariableResolver.java Fri Jul 16 14:21:50 2010 -0400
3009.3 @@ -1,7 +1,10 @@
3009.4 /*
3009.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3009.6 *
3009.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3009.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3009.9 + *
3009.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3009.11 + * Other names may be trademarks of their respective owners.
3009.12 *
3009.13 * The contents of this file are subject to the terms of either the GNU
3009.14 * General Public License Version 2 only ("GPL") or the Common
3009.15 @@ -13,9 +16,9 @@
3009.16 * specific language governing permissions and limitations under the
3009.17 * License. When distributing the software, include this License Header
3009.18 * Notice in each file and include the License file at
3009.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3009.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3009.21 * particular file as subject to the "Classpath" exception as provided
3009.22 - * by Sun in the GPL Version 2 section of the License file that
3009.23 + * by Oracle in the GPL Version 2 section of the License file that
3009.24 * accompanied this code. If applicable, add the following below the
3009.25 * License Header, with the fields enclosed by brackets [] replaced by
3009.26 * your own identifying information:
3010.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/validator/DateInRangeValidator.java Fri Jul 16 11:47:36 2010 -0400
3010.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/validator/DateInRangeValidator.java Fri Jul 16 14:21:50 2010 -0400
3010.3 @@ -1,7 +1,10 @@
3010.4 /*
3010.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3010.6 *
3010.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3010.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3010.9 + *
3010.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3010.11 + * Other names may be trademarks of their respective owners.
3010.12 *
3010.13 * The contents of this file are subject to the terms of either the GNU
3010.14 * General Public License Version 2 only ("GPL") or the Common
3010.15 @@ -13,9 +16,9 @@
3010.16 * specific language governing permissions and limitations under the
3010.17 * License. When distributing the software, include this License Header
3010.18 * Notice in each file and include the License file at
3010.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3010.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3010.21 * particular file as subject to the "Classpath" exception as provided
3010.22 - * by Sun in the GPL Version 2 section of the License file that
3010.23 + * by Oracle in the GPL Version 2 section of the License file that
3010.24 * accompanied this code. If applicable, add the following below the
3010.25 * License Header, with the fields enclosed by brackets [] replaced by
3010.26 * your own identifying information:
3011.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/validator/StringLengthValidator.java Fri Jul 16 11:47:36 2010 -0400
3011.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/validator/StringLengthValidator.java Fri Jul 16 14:21:50 2010 -0400
3011.3 @@ -1,7 +1,10 @@
3011.4 /*
3011.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3011.6 *
3011.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3011.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3011.9 + *
3011.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3011.11 + * Other names may be trademarks of their respective owners.
3011.12 *
3011.13 * The contents of this file are subject to the terms of either the GNU
3011.14 * General Public License Version 2 only ("GPL") or the Common
3011.15 @@ -13,9 +16,9 @@
3011.16 * specific language governing permissions and limitations under the
3011.17 * License. When distributing the software, include this License Header
3011.18 * Notice in each file and include the License file at
3011.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3011.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3011.21 * particular file as subject to the "Classpath" exception as provided
3011.22 - * by Sun in the GPL Version 2 section of the License file that
3011.23 + * by Oracle in the GPL Version 2 section of the License file that
3011.24 * accompanied this code. If applicable, add the following below the
3011.25 * License Header, with the fields enclosed by brackets [] replaced by
3011.26 * your own identifying information:
3012.1 --- a/visualweb.webui/library/src/com/sun/rave/web/ui/validator/ValueMatchesOptionsValidator.java Fri Jul 16 11:47:36 2010 -0400
3012.2 +++ b/visualweb.webui/library/src/com/sun/rave/web/ui/validator/ValueMatchesOptionsValidator.java Fri Jul 16 14:21:50 2010 -0400
3012.3 @@ -1,7 +1,10 @@
3012.4 /*
3012.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3012.6 *
3012.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3012.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3012.9 + *
3012.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3012.11 + * Other names may be trademarks of their respective owners.
3012.12 *
3012.13 * The contents of this file are subject to the terms of either the GNU
3012.14 * General Public License Version 2 only ("GPL") or the Common
3012.15 @@ -13,9 +16,9 @@
3012.16 * specific language governing permissions and limitations under the
3012.17 * License. When distributing the software, include this License Header
3012.18 * Notice in each file and include the License file at
3012.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3012.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3012.21 * particular file as subject to the "Classpath" exception as provided
3012.22 - * by Sun in the GPL Version 2 section of the License file that
3012.23 + * by Oracle in the GPL Version 2 section of the License file that
3012.24 * accompanied this code. If applicable, add the following below the
3012.25 * License Header, with the fields enclosed by brackets [] replaced by
3012.26 * your own identifying information:
3013.1 --- a/visualweb.webui/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
3013.2 +++ b/visualweb.webui/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
3013.3 @@ -1,6 +1,9 @@
3013.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3013.5 #
3013.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3013.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3013.8 +#
3013.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3013.10 +# Other names may be trademarks of their respective owners.
3013.11 #
3013.12 # The contents of this file are subject to the terms of either the GNU
3013.13 # General Public License Version 2 only ("GPL") or the Common
3013.14 @@ -12,9 +15,9 @@
3013.15 # specific language governing permissions and limitations under the
3013.16 # License. When distributing the software, include this License Header
3013.17 # Notice in each file and include the License file at
3013.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3013.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3013.20 # particular file as subject to the "Classpath" exception as provided
3013.21 -# by Sun in the GPL Version 2 section of the License file that
3013.22 +# by Oracle in the GPL Version 2 section of the License file that
3013.23 # accompanied this code. If applicable, add the following below the
3013.24 # License Header, with the fields enclosed by brackets [] replaced by
3013.25 # your own identifying information:
3014.1 --- a/visualweb.webui/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
3014.2 +++ b/visualweb.webui/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
3014.3 @@ -2,7 +2,10 @@
3014.4 <!--
3014.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3014.6
3014.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3014.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3014.9 +
3014.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3014.11 +Other names may be trademarks of their respective owners.
3014.12
3014.13
3014.14 The contents of this file are subject to the terms of either the GNU
3014.15 @@ -15,9 +18,9 @@
3014.16 specific language governing permissions and limitations under the
3014.17 License. When distributing the software, include this License Header
3014.18 Notice in each file and include the License file at
3014.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3014.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3014.21 particular file as subject to the "Classpath" exception as provided
3014.22 -by Sun in the GPL Version 2 section of the License file that
3014.23 +by Oracle in the GPL Version 2 section of the License file that
3014.24 accompanied this code. If applicable, add the following below the
3014.25 License Header, with the fields enclosed by brackets [] replaced by
3014.26 your own identifying information:
3015.1 --- a/visualweb.webui/src/org/netbeans/modules/visualweb/webui/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
3015.2 +++ b/visualweb.webui/src/org/netbeans/modules/visualweb/webui/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
3015.3 @@ -1,6 +1,9 @@
3015.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3015.5 #
3015.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3015.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3015.8 +#
3015.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3015.10 +# Other names may be trademarks of their respective owners.
3015.11 #
3015.12 # The contents of this file are subject to the terms of either the GNU
3015.13 # General Public License Version 2 only ("GPL") or the Common
3015.14 @@ -12,9 +15,9 @@
3015.15 # specific language governing permissions and limitations under the
3015.16 # License. When distributing the software, include this License Header
3015.17 # Notice in each file and include the License file at
3015.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3015.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3015.20 # particular file as subject to the "Classpath" exception as provided
3015.21 -# by Sun in the GPL Version 2 section of the License file that
3015.22 +# by Oracle in the GPL Version 2 section of the License file that
3015.23 # accompanied this code. If applicable, add the following below the
3015.24 # License Header, with the fields enclosed by brackets [] replaced by
3015.25 # your own identifying information:
3016.1 --- a/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
3016.2 +++ b/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
3016.3 @@ -1,6 +1,9 @@
3016.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3016.5 #
3016.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3016.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3016.8 +#
3016.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3016.10 +# Other names may be trademarks of their respective owners.
3016.11 #
3016.12 # The contents of this file are subject to the terms of either the GNU
3016.13 # General Public License Version 2 only ("GPL") or the Common
3016.14 @@ -12,9 +15,9 @@
3016.15 # specific language governing permissions and limitations under the
3016.16 # License. When distributing the software, include this License Header
3016.17 # Notice in each file and include the License file at
3016.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3016.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3016.20 # particular file as subject to the "Classpath" exception as provided
3016.21 -# by Sun in the GPL Version 2 section of the License file that
3016.22 +# by Oracle in the GPL Version 2 section of the License file that
3016.23 # accompanied this code. If applicable, add the following below the
3016.24 # License Header, with the fields enclosed by brackets [] replaced by
3016.25 # your own identifying information:
3017.1 --- a/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/layer.xml Fri Jul 16 11:47:36 2010 -0400
3017.2 +++ b/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/layer.xml Fri Jul 16 14:21:50 2010 -0400
3017.3 @@ -2,7 +2,10 @@
3017.4 <!--
3017.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3017.6
3017.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3017.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3017.9 +
3017.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3017.11 +Other names may be trademarks of their respective owners.
3017.12
3017.13
3017.14 The contents of this file are subject to the terms of either the GNU
3017.15 @@ -15,9 +18,9 @@
3017.16 specific language governing permissions and limitations under the
3017.17 License. When distributing the software, include this License Header
3017.18 Notice in each file and include the License file at
3017.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3017.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3017.21 particular file as subject to the "Classpath" exception as provided
3017.22 -by Sun in the GPL Version 2 section of the License file that
3017.23 +by Oracle in the GPL Version 2 section of the License file that
3017.24 accompanied this code. If applicable, add the following below the
3017.25 License Header, with the fields enclosed by brackets [] replaced by
3017.26 your own identifying information:
3018.1 --- a/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/webui-designtime.xml Fri Jul 16 11:47:36 2010 -0400
3018.2 +++ b/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/webui-designtime.xml Fri Jul 16 14:21:50 2010 -0400
3018.3 @@ -2,7 +2,10 @@
3018.4 <!--
3018.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3018.6
3018.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3018.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3018.9 +
3018.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3018.11 +Other names may be trademarks of their respective owners.
3018.12
3018.13
3018.14 The contents of this file are subject to the terms of either the GNU
3018.15 @@ -15,9 +18,9 @@
3018.16 specific language governing permissions and limitations under the
3018.17 License. When distributing the software, include this License Header
3018.18 Notice in each file and include the License file at
3018.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3018.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3018.21 particular file as subject to the "Classpath" exception as provided
3018.22 -by Sun in the GPL Version 2 section of the License file that
3018.23 +by Oracle in the GPL Version 2 section of the License file that
3018.24 accompanied this code. If applicable, add the following below the
3018.25 License Header, with the fields enclosed by brackets [] replaced by
3018.26 your own identifying information:
3018.27 @@ -48,15 +51,15 @@
3018.28 <localizing-bundle>org.netbeans.modules.visualweb.webui.resources.Bundle</localizing-bundle>
3018.29 <volume>
3018.30 <type>classpath</type>
3018.31 - <resource>jar:nbinst:///modules/ext/webui.jar!/</resource>
3018.32 - <resource>jar:nbinst:///modules/ext/commons-fileupload-1.0.jar!/</resource>
3018.33 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui/modules/ext/webui.jar!/</resource>
3018.34 + <resource>jar:nbinst://org.netbeans.libs.commons_fileupload/modules/ext/commons-fileupload-1.0.jar!/</resource>
3018.35 </volume>
3018.36 <volume>
3018.37 <type>src</type>
3018.38 - <resource>jar:nbinst:///docs/webui-src.zip!/</resource>
3018.39 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui/docs/webui-src.zip!/</resource>
3018.40 </volume>
3018.41 <volume>
3018.42 <type>javadoc</type>
3018.43 - <resource>jar:nbinst:///docs/webui-doc.zip!/</resource>
3018.44 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui/docs/webui-doc.zip!/</resource>
3018.45 </volume>
3018.46 </library>
3019.1 --- a/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/webui-runtime.xml Fri Jul 16 11:47:36 2010 -0400
3019.2 +++ b/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/webui-runtime.xml Fri Jul 16 14:21:50 2010 -0400
3019.3 @@ -2,7 +2,10 @@
3019.4 <!--
3019.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3019.6
3019.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3019.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3019.9 +
3019.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3019.11 +Other names may be trademarks of their respective owners.
3019.12
3019.13
3019.14 The contents of this file are subject to the terms of either the GNU
3019.15 @@ -15,9 +18,9 @@
3019.16 specific language governing permissions and limitations under the
3019.17 License. When distributing the software, include this License Header
3019.18 Notice in each file and include the License file at
3019.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3019.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3019.21 particular file as subject to the "Classpath" exception as provided
3019.22 -by Sun in the GPL Version 2 section of the License file that
3019.23 +by Oracle in the GPL Version 2 section of the License file that
3019.24 accompanied this code. If applicable, add the following below the
3019.25 License Header, with the fields enclosed by brackets [] replaced by
3019.26 your own identifying information:
3019.27 @@ -48,7 +51,7 @@
3019.28 <localizing-bundle>org.netbeans.modules.visualweb.webui.resources.Bundle</localizing-bundle>
3019.29 <volume>
3019.30 <type>classpath</type>
3019.31 - <resource>jar:nbinst:///modules/ext/webui.jar!/</resource>
3019.32 - <resource>jar:nbinst:///modules/ext/commons-fileupload-1.0.jar!/</resource>
3019.33 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui/modules/ext/webui.jar!/</resource>
3019.34 + <resource>jar:nbinst://org.netbeans.libs.commons_fileupload/modules/ext/commons-fileupload-1.0.jar!/</resource>
3019.35 </volume>
3019.36 </library>
3020.1 --- a/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/webui.xml Fri Jul 16 11:47:36 2010 -0400
3020.2 +++ b/visualweb.webui/src/org/netbeans/modules/visualweb/webui/resources/webui.xml Fri Jul 16 14:21:50 2010 -0400
3020.3 @@ -2,7 +2,10 @@
3020.4 <!--
3020.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3020.6
3020.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3020.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3020.9 +
3020.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3020.11 +Other names may be trademarks of their respective owners.
3020.12
3020.13
3020.14 The contents of this file are subject to the terms of either the GNU
3020.15 @@ -15,9 +18,9 @@
3020.16 specific language governing permissions and limitations under the
3020.17 License. When distributing the software, include this License Header
3020.18 Notice in each file and include the License file at
3020.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3020.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3020.21 particular file as subject to the "Classpath" exception as provided
3020.22 -by Sun in the GPL Version 2 section of the License file that
3020.23 +by Oracle in the GPL Version 2 section of the License file that
3020.24 accompanied this code. If applicable, add the following below the
3020.25 License Header, with the fields enclosed by brackets [] replaced by
3020.26 your own identifying information:
3020.27 @@ -48,15 +51,15 @@
3020.28 <localizing-bundle>org.netbeans.modules.visualweb.webui.resources.Bundle</localizing-bundle>
3020.29 <volume>
3020.30 <type>classpath</type>
3020.31 - <resource>jar:nbinst:///modules/ext/webui.jar!/</resource>
3020.32 - <resource>jar:nbinst:///modules/ext/commons-fileupload-1.0.jar!/</resource>
3020.33 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui/modules/ext/webui.jar!/</resource>
3020.34 + <resource>jar:nbinst://org.netbeans.libs.commons_fileupload/modules/ext/commons-fileupload-1.0.jar!/</resource>
3020.35 </volume>
3020.36 <volume>
3020.37 <type>src</type>
3020.38 - <resource>jar:nbinst:///docs/webui-src.zip!/</resource>
3020.39 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui/docs/webui-src.zip!/</resource>
3020.40 </volume>
3020.41 <volume>
3020.42 <type>javadoc</type>
3020.43 - <resource>jar:nbinst:///docs/webui-doc.zip!/</resource>
3020.44 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui/docs/webui-doc.zip!/</resource>
3020.45 </volume>
3020.46 </library>
3021.1 --- a/visualweb.woodstock.webui.jsf/build.xml Fri Jul 16 11:47:36 2010 -0400
3021.2 +++ b/visualweb.woodstock.webui.jsf/build.xml Fri Jul 16 14:21:50 2010 -0400
3021.3 @@ -2,7 +2,10 @@
3021.4 <!--
3021.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3021.6
3021.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3021.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3021.9 +
3021.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3021.11 +Other names may be trademarks of their respective owners.
3021.12
3021.13
3021.14 The contents of this file are subject to the terms of either the GNU
3021.15 @@ -15,9 +18,9 @@
3021.16 specific language governing permissions and limitations under the
3021.17 License. When distributing the software, include this License Header
3021.18 Notice in each file and include the License file at
3021.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3021.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3021.21 particular file as subject to the "Classpath" exception as provided
3021.22 -by Sun in the GPL Version 2 section of the License file that
3021.23 +by Oracle in the GPL Version 2 section of the License file that
3021.24 accompanied this code. If applicable, add the following below the
3021.25 License Header, with the fields enclosed by brackets [] replaced by
3021.26 your own identifying information:
3022.1 --- a/visualweb.woodstock.webui.jsf/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
3022.2 +++ b/visualweb.woodstock.webui.jsf/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
3022.3 @@ -1,6 +1,9 @@
3022.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3022.5 #
3022.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3022.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3022.8 +#
3022.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3022.10 +# Other names may be trademarks of their respective owners.
3022.11 #
3022.12 # The contents of this file are subject to the terms of either the GNU
3022.13 # General Public License Version 2 only ("GPL") or the Common
3022.14 @@ -12,9 +15,9 @@
3022.15 # specific language governing permissions and limitations under the
3022.16 # License. When distributing the software, include this License Header
3022.17 # Notice in each file and include the License file at
3022.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3022.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3022.20 # particular file as subject to the "Classpath" exception as provided
3022.21 -# by Sun in the GPL Version 2 section of the License file that
3022.22 +# by Oracle in the GPL Version 2 section of the License file that
3022.23 # accompanied this code. If applicable, add the following below the
3022.24 # License Header, with the fields enclosed by brackets [] replaced by
3022.25 # your own identifying information:
3022.26 @@ -36,7 +39,7 @@
3022.27 # However, if you add GPL Version 2 code and therefore, elected the GPL
3022.28 # Version 2 license, then the option applies only if the new code is
3022.29 # made subject to such option by the copyright holder.
3022.30 -javac.source=1.5
3022.31 +javac.source=1.6
3022.32
3022.33 test.qa-functional.cp.extra=\
3022.34 ${nb_all}/visualweb.kit/gravy/builds/gravy.jar:\
3023.1 --- a/visualweb.woodstock.webui.jsf/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
3023.2 +++ b/visualweb.woodstock.webui.jsf/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
3023.3 @@ -2,7 +2,10 @@
3023.4 <!--
3023.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3023.6
3023.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3023.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3023.9 +
3023.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3023.11 +Other names may be trademarks of their respective owners.
3023.12
3023.13
3023.14 The contents of this file are subject to the terms of either the GNU
3023.15 @@ -15,9 +18,9 @@
3023.16 specific language governing permissions and limitations under the
3023.17 License. When distributing the software, include this License Header
3023.18 Notice in each file and include the License file at
3023.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3023.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3023.21 particular file as subject to the "Classpath" exception as provided
3023.22 -by Sun in the GPL Version 2 section of the License file that
3023.23 +by Oracle in the GPL Version 2 section of the License file that
3023.24 accompanied this code. If applicable, add the following below the
3023.25 License Header, with the fields enclosed by brackets [] replaced by
3023.26 your own identifying information:
3023.27 @@ -170,7 +173,15 @@
3023.28 <build-prerequisite/>
3023.29 <compile-dependency/>
3023.30 <run-dependency>
3023.31 - <specification-version>6.8.21</specification-version>
3023.32 + <specification-version>8.0</specification-version>
3023.33 + </run-dependency>
3023.34 + </dependency>
3023.35 + <dependency>
3023.36 + <code-name-base>org.openide.util.lookup</code-name-base>
3023.37 + <build-prerequisite/>
3023.38 + <compile-dependency/>
3023.39 + <run-dependency>
3023.40 + <specification-version>8.0</specification-version>
3023.41 </run-dependency>
3023.42 </dependency>
3023.43 </module-dependencies>
3024.1 --- a/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
3024.2 +++ b/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
3024.3 @@ -1,6 +1,9 @@
3024.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3024.5 #
3024.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3024.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3024.8 +#
3024.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3024.10 +# Other names may be trademarks of their respective owners.
3024.11 #
3024.12 # The contents of this file are subject to the terms of either the GNU
3024.13 # General Public License Version 2 only ("GPL") or the Common
3024.14 @@ -12,9 +15,9 @@
3024.15 # specific language governing permissions and limitations under the
3024.16 # License. When distributing the software, include this License Header
3024.17 # Notice in each file and include the License file at
3024.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3024.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3024.20 # particular file as subject to the "Classpath" exception as provided
3024.21 -# by Sun in the GPL Version 2 section of the License file that
3024.22 +# by Oracle in the GPL Version 2 section of the License file that
3024.23 # accompanied this code. If applicable, add the following below the
3024.24 # License Header, with the fields enclosed by brackets [] replaced by
3024.25 # your own identifying information:
3025.1 --- a/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/layer.xml Fri Jul 16 11:47:36 2010 -0400
3025.2 +++ b/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/layer.xml Fri Jul 16 14:21:50 2010 -0400
3025.3 @@ -2,7 +2,10 @@
3025.4 <!--
3025.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3025.6
3025.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3025.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3025.9 +
3025.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3025.11 +Other names may be trademarks of their respective owners.
3025.12
3025.13
3025.14 The contents of this file are subject to the terms of either the GNU
3025.15 @@ -15,9 +18,9 @@
3025.16 specific language governing permissions and limitations under the
3025.17 License. When distributing the software, include this License Header
3025.18 Notice in each file and include the License file at
3025.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3025.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3025.21 particular file as subject to the "Classpath" exception as provided
3025.22 -by Sun in the GPL Version 2 section of the License file that
3025.23 +by Oracle in the GPL Version 2 section of the License file that
3025.24 accompanied this code. If applicable, add the following below the
3025.25 License Header, with the fields enclosed by brackets [] replaced by
3025.26 your own identifying information:
3026.1 --- a/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/libraries/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
3026.2 +++ b/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/libraries/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
3026.3 @@ -1,7 +1,10 @@
3026.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3026.5 -#
3026.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3026.7 -#
3026.8 +#
3026.9 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3026.10 +#
3026.11 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3026.12 +# Other names may be trademarks of their respective owners.
3026.13 +#
3026.14 # The contents of this file are subject to the terms of either the GNU
3026.15 # General Public License Version 2 only ("GPL") or the Common
3026.16 # Development and Distribution License("CDDL") (collectively, the
3026.17 @@ -12,9 +15,9 @@
3026.18 # specific language governing permissions and limitations under the
3026.19 # License. When distributing the software, include this License Header
3026.20 # Notice in each file and include the License file at
3026.21 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3026.22 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3026.23 # particular file as subject to the "Classpath" exception as provided
3026.24 -# by Sun in the GPL Version 2 section of the License file that
3026.25 +# by Oracle in the GPL Version 2 section of the License file that
3026.26 # accompanied this code. If applicable, add the following below the
3026.27 # License Header, with the fields enclosed by brackets [] replaced by
3026.28 # your own identifying information:
3027.1 --- a/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/libraries/woodstock-components.xml Fri Jul 16 11:47:36 2010 -0400
3027.2 +++ b/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/libraries/woodstock-components.xml Fri Jul 16 14:21:50 2010 -0400
3027.3 @@ -2,7 +2,10 @@
3027.4 <!--
3027.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3027.6
3027.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3027.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3027.9 +
3027.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3027.11 +Other names may be trademarks of their respective owners.
3027.12
3027.13
3027.14 The contents of this file are subject to the terms of either the GNU
3027.15 @@ -15,9 +18,9 @@
3027.16 specific language governing permissions and limitations under the
3027.17 License. When distributing the software, include this License Header
3027.18 Notice in each file and include the License file at
3027.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3027.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3027.21 particular file as subject to the "Classpath" exception as provided
3027.22 -by Sun in the GPL Version 2 section of the License file that
3027.23 +by Oracle in the GPL Version 2 section of the License file that
3027.24 accompanied this code. If applicable, add the following below the
3027.25 License Header, with the fields enclosed by brackets [] replaced by
3027.26 your own identifying information:
3027.27 @@ -48,20 +51,20 @@
3027.28 <localizing-bundle>org.netbeans.modules.visualweb.woodstock.webui.jsf.designtime.libraries.Bundle</localizing-bundle>
3027.29 <volume>
3027.30 <type>classpath</type>
3027.31 - <resource>jar:nbinst:///modules/ext/webui-jsf.jar!/</resource>
3027.32 - <resource>jar:nbinst:///modules/ext/commons-fileupload-1.0.jar!/</resource>
3027.33 - <resource>jar:nbinst:///modules/ext/json-2.jar!/</resource>
3027.34 - <resource>jar:nbinst:///modules/ext/jsf-extensions-common-0.1.jar!/</resource>
3027.35 - <resource>jar:nbinst:///modules/ext/jsf-extensions-dynamic-faces-0.1.jar!/</resource>
3027.36 + <resource>jar:nbinst://org.netbeans.modules.visualweb.woodstock.webui.jsf/modules/ext/webui-jsf.jar!/</resource>
3027.37 + <resource>jar:nbinst://org.netbeans.libs.commons_fileupload/modules/ext/commons-fileupload-1.0.jar!/</resource>
3027.38 + <resource>jar:nbinst://org.netbeans.modules.visualweb.woodstock.webui.jsf/modules/ext/json-2.jar!/</resource>
3027.39 + <resource>jar:nbinst://org.netbeans.modules.web.jsf.extensions/modules/ext/jsf-extensions-common-0.1.jar!/</resource>
3027.40 + <resource>jar:nbinst://org.netbeans.modules.web.jsf.extensions/modules/ext/jsf-extensions-dynamic-faces-0.1.jar!/</resource>
3027.41 </volume>
3027.42 <volume>
3027.43 <type>src</type>
3027.44 - <resource>jar:nbinst:///docs/webui-jsf-src.zip!/</resource>
3027.45 + <resource>jar:nbinst://org.netbeans.modules.visualweb.woodstock.webui.jsf/docs/webui-jsf-src.zip!/</resource>
3027.46 </volume>
3027.47 <volume>
3027.48 <type>javadoc</type>
3027.49 - <resource>jar:nbinst:///docs/webui-jsf-doc.zip!/</resource>
3027.50 - <resource>jar:nbinst:///docs/webui-jsf-tld.zip!/</resource>
3027.51 - <resource>jar:nbinst:///docs/portlet-doc.zip!/</resource>
3027.52 + <resource>jar:nbinst://org.netbeans.modules.visualweb.woodstock.webui.jsf/docs/webui-jsf-doc.zip!/</resource>
3027.53 + <resource>jar:nbinst://org.netbeans.modules.visualweb.woodstock.webui.jsf/docs/webui-jsf-tld.zip!/</resource>
3027.54 + <!--<resource>jar:nbinst:///docs/portlet-doc.zip!/</resource>-->
3027.55 </volume>
3027.56 </library>
3028.1 --- a/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/libraries/woodstock-theme-default.xml Fri Jul 16 11:47:36 2010 -0400
3028.2 +++ b/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/libraries/woodstock-theme-default.xml Fri Jul 16 14:21:50 2010 -0400
3028.3 @@ -2,7 +2,10 @@
3028.4 <!--
3028.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3028.6
3028.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3028.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3028.9 +
3028.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3028.11 +Other names may be trademarks of their respective owners.
3028.12
3028.13
3028.14 The contents of this file are subject to the terms of either the GNU
3028.15 @@ -15,9 +18,9 @@
3028.16 specific language governing permissions and limitations under the
3028.17 License. When distributing the software, include this License Header
3028.18 Notice in each file and include the License file at
3028.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3028.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3028.21 particular file as subject to the "Classpath" exception as provided
3028.22 -by Sun in the GPL Version 2 section of the License file that
3028.23 +by Oracle in the GPL Version 2 section of the License file that
3028.24 accompanied this code. If applicable, add the following below the
3028.25 License Header, with the fields enclosed by brackets [] replaced by
3028.26 your own identifying information:
3028.27 @@ -48,10 +51,10 @@
3028.28 <localizing-bundle>org.netbeans.modules.visualweb.woodstock.webui.jsf.designtime.libraries.Bundle</localizing-bundle>
3028.29 <volume>
3028.30 <type>classpath</type>
3028.31 - <resource>jar:nbinst:///modules/ext/webui-jsf-suntheme.jar!/</resource>
3028.32 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui.jsf.defaulttheme/modules/ext/webui-jsf-suntheme.jar!/</resource>
3028.33 </volume>
3028.34 <volume>
3028.35 <type>runtime</type>
3028.36 - <resource>jar:nbinst:///modules/ext/webui-jsf-suntheme.jar!/</resource>
3028.37 + <resource>jar:nbinst://org.netbeans.modules.visualweb.webui.jsf.defaulttheme/modules/ext/webui-jsf-suntheme.jar!/</resource>
3028.38 </volume>
3028.39 </library>
3029.1 --- a/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
3029.2 +++ b/visualweb.woodstock.webui.jsf/src/org/netbeans/modules/visualweb/woodstock/webui/jsf/designtime/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
3029.3 @@ -1,6 +1,9 @@
3029.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3029.5 #
3029.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3029.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3029.8 +#
3029.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3029.10 +# Other names may be trademarks of their respective owners.
3029.11 #
3029.12 # The contents of this file are subject to the terms of either the GNU
3029.13 # General Public License Version 2 only ("GPL") or the Common
3029.14 @@ -12,9 +15,9 @@
3029.15 # specific language governing permissions and limitations under the
3029.16 # License. When distributing the software, include this License Header
3029.17 # Notice in each file and include the License file at
3029.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3029.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3029.20 # particular file as subject to the "Classpath" exception as provided
3029.21 -# by Sun in the GPL Version 2 section of the License file that
3029.22 +# by Oracle in the GPL Version 2 section of the License file that
3029.23 # accompanied this code. If applicable, add the following below the
3029.24 # License Header, with the fields enclosed by brackets [] replaced by
3029.25 # your own identifying information:
3030.1 --- a/visualweb.woodstock.webui.jsf/test/build.properties Fri Jul 16 11:47:36 2010 -0400
3030.2 +++ b/visualweb.woodstock.webui.jsf/test/build.properties Fri Jul 16 14:21:50 2010 -0400
3030.3 @@ -1,6 +1,9 @@
3030.4 #DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3030.5 #
3030.6 -#Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
3030.7 +#Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3030.8 +#
3030.9 +#Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3030.10 +#Other names may be trademarks of their respective owners.
3030.11 #
3030.12 #The contents of this file are subject to the terms of either the GNU
3030.13 #General Public License Version 2 only ("GPL") or the Common
3030.14 @@ -12,9 +15,9 @@
3030.15 #specific language governing permissions and limitations under the
3030.16 #License. When distributing the software, include this License Header
3030.17 #Notice in each file and include the License file at
3030.18 -#nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3030.19 +#nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3030.20 #particular file as subject to the "Classpath" exception as provided
3030.21 -#by Sun in the GPL Version 2 section of the License file that
3030.22 +#by Oracle in the GPL Version 2 section of the License file that
3030.23 #accompanied this code. If applicable, add the following below the
3030.24 #License Header, with the fields enclosed by brackets [] replaced by
3030.25 #your own identifying information:
3031.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/Component.properties Fri Jul 16 11:47:36 2010 -0400
3031.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/Component.properties Fri Jul 16 14:21:50 2010 -0400
3031.3 @@ -1,6 +1,9 @@
3031.4 #DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3031.5 #
3031.6 -#Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
3031.7 +#Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3031.8 +#
3031.9 +#Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3031.10 +#Other names may be trademarks of their respective owners.
3031.11 #
3031.12 #The contents of this file are subject to the terms of either the GNU
3031.13 #General Public License Version 2 only ("GPL") or the Common
3031.14 @@ -12,9 +15,9 @@
3031.15 #specific language governing permissions and limitations under the
3031.16 #License. When distributing the software, include this License Header
3031.17 #Notice in each file and include the License file at
3031.18 -#nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3031.19 +#nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3031.20 #particular file as subject to the "Classpath" exception as provided
3031.21 -#by Sun in the GPL Version 2 section of the License file that
3031.22 +#by Oracle in the GPL Version 2 section of the License file that
3031.23 #accompanied this code. If applicable, add the following below the
3031.24 #License Header, with the fields enclosed by brackets [] replaced by
3031.25 #your own identifying information:
3032.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/ComponentJEE4.properties Fri Jul 16 11:47:36 2010 -0400
3032.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/ComponentJEE4.properties Fri Jul 16 14:21:50 2010 -0400
3032.3 @@ -1,6 +1,9 @@
3032.4 #DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3032.5 #
3032.6 -#Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
3032.7 +#Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3032.8 +#
3032.9 +#Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3032.10 +#Other names may be trademarks of their respective owners.
3032.11 #
3032.12 #The contents of this file are subject to the terms of either the GNU
3032.13 #General Public License Version 2 only ("GPL") or the Common
3032.14 @@ -12,9 +15,9 @@
3032.15 #specific language governing permissions and limitations under the
3032.16 #License. When distributing the software, include this License Header
3032.17 #Notice in each file and include the License file at
3032.18 -#nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3032.19 +#nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3032.20 #particular file as subject to the "Classpath" exception as provided
3032.21 -#by Sun in the GPL Version 2 section of the License file that
3032.22 +#by Oracle in the GPL Version 2 section of the License file that
3032.23 #accompanied this code. If applicable, add the following below the
3032.24 #License Header, with the fields enclosed by brackets [] replaced by
3032.25 #your own identifying information:
3033.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/breadcrumbs/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3033.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/breadcrumbs/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3033.3 @@ -1,7 +1,10 @@
3033.4 /*
3033.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3033.6 *
3033.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3033.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3033.9 + *
3033.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3033.11 + * Other names may be trademarks of their respective owners.
3033.12 *
3033.13 * The contents of this file are subject to the terms of either the GNU
3033.14 * General Public License Version 2 only ("GPL") or the Common
3033.15 @@ -13,9 +16,9 @@
3033.16 * specific language governing permissions and limitations under the
3033.17 * License. When distributing the software, include this License Header
3033.18 * Notice in each file and include the License file at
3033.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3033.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3033.21 * particular file as subject to the "Classpath" exception as provided
3033.22 - * by Sun in the GPL Version 2 section of the License file that
3033.23 + * by Oracle in the GPL Version 2 section of the License file that
3033.24 * accompanied this code. If applicable, add the following below the
3033.25 * License Header, with the fields enclosed by brackets [] replaced by
3033.26 * your own identifying information:
3034.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/bundle.properties Fri Jul 16 11:47:36 2010 -0400
3034.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/bundle.properties Fri Jul 16 14:21:50 2010 -0400
3034.3 @@ -1,6 +1,9 @@
3034.4 #DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3034.5 #
3034.6 -#Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
3034.7 +#Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3034.8 +#
3034.9 +#Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3034.10 +#Other names may be trademarks of their respective owners.
3034.11 #
3034.12 #The contents of this file are subject to the terms of either the GNU
3034.13 #General Public License Version 2 only ("GPL") or the Common
3034.14 @@ -12,9 +15,9 @@
3034.15 #specific language governing permissions and limitations under the
3034.16 #License. When distributing the software, include this License Header
3034.17 #Notice in each file and include the License file at
3034.18 -#nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3034.19 +#nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3034.20 #particular file as subject to the "Classpath" exception as provided
3034.21 -#by Sun in the GPL Version 2 section of the License file that
3034.22 +#by Oracle in the GPL Version 2 section of the License file that
3034.23 #accompanied this code. If applicable, add the following below the
3034.24 #License Header, with the fields enclosed by brackets [] replaced by
3034.25 #your own identifying information:
3035.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/button/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3035.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/button/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3035.3 @@ -1,7 +1,10 @@
3035.4 /*
3035.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3035.6 *
3035.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3035.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3035.9 + *
3035.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3035.11 + * Other names may be trademarks of their respective owners.
3035.12 *
3035.13 * The contents of this file are subject to the terms of either the GNU
3035.14 * General Public License Version 2 only ("GPL") or the Common
3035.15 @@ -13,9 +16,9 @@
3035.16 * specific language governing permissions and limitations under the
3035.17 * License. When distributing the software, include this License Header
3035.18 * Notice in each file and include the License file at
3035.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3035.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3035.21 * particular file as subject to the "Classpath" exception as provided
3035.22 - * by Sun in the GPL Version 2 section of the License file that
3035.23 + * by Oracle in the GPL Version 2 section of the License file that
3035.24 * accompanied this code. If applicable, add the following below the
3035.25 * License Header, with the fields enclosed by brackets [] replaced by
3035.26 * your own identifying information:
3036.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/hyperlink/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3036.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/hyperlink/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3036.3 @@ -1,7 +1,10 @@
3036.4 /*
3036.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3036.6 *
3036.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3036.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3036.9 + *
3036.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3036.11 + * Other names may be trademarks of their respective owners.
3036.12 *
3036.13 * The contents of this file are subject to the terms of either the GNU
3036.14 * General Public License Version 2 only ("GPL") or the Common
3036.15 @@ -13,9 +16,9 @@
3036.16 * specific language governing permissions and limitations under the
3036.17 * License. When distributing the software, include this License Header
3036.18 * Notice in each file and include the License file at
3036.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3036.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3036.21 * particular file as subject to the "Classpath" exception as provided
3036.22 - * by Sun in the GPL Version 2 section of the License file that
3036.23 + * by Oracle in the GPL Version 2 section of the License file that
3036.24 * accompanied this code. If applicable, add the following below the
3036.25 * License Header, with the fields enclosed by brackets [] replaced by
3036.26 * your own identifying information:
3037.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/image/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3037.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/image/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3037.3 @@ -1,7 +1,10 @@
3037.4 /*
3037.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3037.6 *
3037.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3037.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3037.9 + *
3037.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3037.11 + * Other names may be trademarks of their respective owners.
3037.12 *
3037.13 * The contents of this file are subject to the terms of either the GNU
3037.14 * General Public License Version 2 only ("GPL") or the Common
3037.15 @@ -13,9 +16,9 @@
3037.16 * specific language governing permissions and limitations under the
3037.17 * License. When distributing the software, include this License Header
3037.18 * Notice in each file and include the License file at
3037.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3037.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3037.21 * particular file as subject to the "Classpath" exception as provided
3037.22 - * by Sun in the GPL Version 2 section of the License file that
3037.23 + * by Oracle in the GPL Version 2 section of the License file that
3037.24 * accompanied this code. If applicable, add the following below the
3037.25 * License Header, with the fields enclosed by brackets [] replaced by
3037.26 * your own identifying information:
3038.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/imagehyperlink/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3038.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/imagehyperlink/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3038.3 @@ -1,7 +1,10 @@
3038.4 /*
3038.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3038.6 *
3038.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3038.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3038.9 + *
3038.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3038.11 + * Other names may be trademarks of their respective owners.
3038.12 *
3038.13 * The contents of this file are subject to the terms of either the GNU
3038.14 * General Public License Version 2 only ("GPL") or the Common
3038.15 @@ -13,9 +16,9 @@
3038.16 * specific language governing permissions and limitations under the
3038.17 * License. When distributing the software, include this License Header
3038.18 * Notice in each file and include the License file at
3038.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3038.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3038.21 * particular file as subject to the "Classpath" exception as provided
3038.22 - * by Sun in the GPL Version 2 section of the License file that
3038.23 + * by Oracle in the GPL Version 2 section of the License file that
3038.24 * accompanied this code. If applicable, add the following below the
3038.25 * License Header, with the fields enclosed by brackets [] replaced by
3038.26 * your own identifying information:
3039.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/progressbar/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3039.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/progressbar/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3039.3 @@ -1,6 +1,9 @@
3039.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3039.5 #
3039.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3039.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3039.8 +#
3039.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3039.10 +# Other names may be trademarks of their respective owners.
3039.11 #
3039.12 # The contents of this file are subject to the terms of either the GNU
3039.13 # General Public License Version 2 only ("GPL") or the Common
3039.14 @@ -12,9 +15,9 @@
3039.15 # specific language governing permissions and limitations under the
3039.16 # License. When distributing the software, include this License Header
3039.17 # Notice in each file and include the License file at
3039.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3039.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3039.20 # particular file as subject to the "Classpath" exception as provided
3039.21 -# by Sun in the GPL Version 2 section of the License file that
3039.22 +# by Oracle in the GPL Version 2 section of the License file that
3039.23 # accompanied this code. If applicable, add the following below the
3039.24 # License Header, with the fields enclosed by brackets [] replaced by
3039.25 # your own identifying information:
3040.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/progressbar/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3040.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/progressbar/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3040.3 @@ -1,7 +1,10 @@
3040.4 /*
3040.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3040.6 *
3040.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3040.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3040.9 + *
3040.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3040.11 + * Other names may be trademarks of their respective owners.
3040.12 *
3040.13 * The contents of this file are subject to the terms of either the GNU
3040.14 * General Public License Version 2 only ("GPL") or the Common
3040.15 @@ -13,9 +16,9 @@
3040.16 * specific language governing permissions and limitations under the
3040.17 * License. When distributing the software, include this License Header
3040.18 * Notice in each file and include the License file at
3040.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3040.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3040.21 * particular file as subject to the "Classpath" exception as provided
3040.22 - * by Sun in the GPL Version 2 section of the License file that
3040.23 + * by Oracle in the GPL Version 2 section of the License file that
3040.24 * accompanied this code. If applicable, add the following below the
3040.25 * License Header, with the fields enclosed by brackets [] replaced by
3040.26 * your own identifying information:
3041.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/stdbutton/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3041.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/stdbutton/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3041.3 @@ -1,7 +1,10 @@
3041.4 /*
3041.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3041.6 *
3041.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3041.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3041.9 + *
3041.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3041.11 + * Other names may be trademarks of their respective owners.
3041.12 *
3041.13 * The contents of this file are subject to the terms of either the GNU
3041.14 * General Public License Version 2 only ("GPL") or the Common
3041.15 @@ -13,9 +16,9 @@
3041.16 * specific language governing permissions and limitations under the
3041.17 * License. When distributing the software, include this License Header
3041.18 * Notice in each file and include the License file at
3041.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3041.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3041.21 * particular file as subject to the "Classpath" exception as provided
3041.22 - * by Sun in the GPL Version 2 section of the License file that
3041.23 + * by Oracle in the GPL Version 2 section of the License file that
3041.24 * accompanied this code. If applicable, add the following below the
3041.25 * License Header, with the fields enclosed by brackets [] replaced by
3041.26 * your own identifying information:
3042.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/tree/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3042.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/action/tree/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3042.3 @@ -1,7 +1,10 @@
3042.4 /*
3042.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3042.6 *
3042.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3042.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3042.9 + *
3042.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3042.11 + * Other names may be trademarks of their respective owners.
3042.12 *
3042.13 * The contents of this file are subject to the terms of either the GNU
3042.14 * General Public License Version 2 only ("GPL") or the Common
3042.15 @@ -13,9 +16,9 @@
3042.16 * specific language governing permissions and limitations under the
3042.17 * License. When distributing the software, include this License Header
3042.18 * Notice in each file and include the License file at
3042.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3042.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3042.21 * particular file as subject to the "Classpath" exception as provided
3042.22 - * by Sun in the GPL Version 2 section of the License file that
3042.23 + * by Oracle in the GPL Version 2 section of the License file that
3042.24 * accompanied this code. If applicable, add the following below the
3042.25 * License Header, with the fields enclosed by brackets [] replaced by
3042.26 * your own identifying information:
3043.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/encoding/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3043.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/encoding/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3043.3 @@ -1,6 +1,9 @@
3043.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3043.5 #
3043.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3043.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3043.8 +#
3043.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3043.10 +# Other names may be trademarks of their respective owners.
3043.11 #
3043.12 # The contents of this file are subject to the terms of either the GNU
3043.13 # General Public License Version 2 only ("GPL") or the Common
3043.14 @@ -12,9 +15,9 @@
3043.15 # specific language governing permissions and limitations under the
3043.16 # License. When distributing the software, include this License Header
3043.17 # Notice in each file and include the License file at
3043.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3043.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3043.20 # particular file as subject to the "Classpath" exception as provided
3043.21 -# by Sun in the GPL Version 2 section of the License file that
3043.22 +# by Oracle in the GPL Version 2 section of the License file that
3043.23 # accompanied this code. If applicable, add the following below the
3043.24 # License Header, with the fields enclosed by brackets [] replaced by
3043.25 # your own identifying information:
3044.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/encoding/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3044.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/encoding/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3044.3 @@ -1,7 +1,10 @@
3044.4 /*
3044.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3044.6 *
3044.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3044.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3044.9 + *
3044.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3044.11 + * Other names may be trademarks of their respective owners.
3044.12 *
3044.13 * The contents of this file are subject to the terms of either the GNU
3044.14 * General Public License Version 2 only ("GPL") or the Common
3044.15 @@ -13,9 +16,9 @@
3044.16 * specific language governing permissions and limitations under the
3044.17 * License. When distributing the software, include this License Header
3044.18 * Notice in each file and include the License file at
3044.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3044.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3044.21 * particular file as subject to the "Classpath" exception as provided
3044.22 - * by Sun in the GPL Version 2 section of the License file that
3044.23 + * by Oracle in the GPL Version 2 section of the License file that
3044.24 * accompanied this code. If applicable, add the following below the
3044.25 * License Header, with the fields enclosed by brackets [] replaced by
3044.26 * your own identifying information:
3045.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesactionlistener/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3045.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesactionlistener/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3045.3 @@ -1,6 +1,9 @@
3045.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3045.5 #
3045.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3045.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3045.8 +#
3045.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3045.10 +# Other names may be trademarks of their respective owners.
3045.11 #
3045.12 # The contents of this file are subject to the terms of either the GNU
3045.13 # General Public License Version 2 only ("GPL") or the Common
3045.14 @@ -12,9 +15,9 @@
3045.15 # specific language governing permissions and limitations under the
3045.16 # License. When distributing the software, include this License Header
3045.17 # Notice in each file and include the License file at
3045.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3045.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3045.20 # particular file as subject to the "Classpath" exception as provided
3045.21 -# by Sun in the GPL Version 2 section of the License file that
3045.22 +# by Oracle in the GPL Version 2 section of the License file that
3045.23 # accompanied this code. If applicable, add the following below the
3045.24 # License Header, with the fields enclosed by brackets [] replaced by
3045.25 # your own identifying information:
3046.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesactionlistener/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3046.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesactionlistener/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3046.3 @@ -1,7 +1,10 @@
3046.4 /*
3046.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3046.6 *
3046.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3046.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3046.9 + *
3046.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3046.11 + * Other names may be trademarks of their respective owners.
3046.12 *
3046.13 * The contents of this file are subject to the terms of either the GNU
3046.14 * General Public License Version 2 only ("GPL") or the Common
3046.15 @@ -13,9 +16,9 @@
3046.16 * specific language governing permissions and limitations under the
3046.17 * License. When distributing the software, include this License Header
3046.18 * Notice in each file and include the License file at
3046.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3046.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3046.21 * particular file as subject to the "Classpath" exception as provided
3046.22 - * by Sun in the GPL Version 2 section of the License file that
3046.23 + * by Oracle in the GPL Version 2 section of the License file that
3046.24 * accompanied this code. If applicable, add the following below the
3046.25 * License Header, with the fields enclosed by brackets [] replaced by
3046.26 * your own identifying information:
3047.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3047.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3047.3 @@ -1,6 +1,9 @@
3047.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3047.5 #
3047.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3047.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3047.8 +#
3047.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3047.10 +# Other names may be trademarks of their respective owners.
3047.11 #
3047.12 # The contents of this file are subject to the terms of either the GNU
3047.13 # General Public License Version 2 only ("GPL") or the Common
3047.14 @@ -12,9 +15,9 @@
3047.15 # specific language governing permissions and limitations under the
3047.16 # License. When distributing the software, include this License Header
3047.17 # Notice in each file and include the License file at
3047.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3047.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3047.20 # particular file as subject to the "Classpath" exception as provided
3047.21 -# by Sun in the GPL Version 2 section of the License file that
3047.22 +# by Oracle in the GPL Version 2 section of the License file that
3047.23 # accompanied this code. If applicable, add the following below the
3047.24 # License Header, with the fields enclosed by brackets [] replaced by
3047.25 # your own identifying information:
3048.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3048.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3048.3 @@ -1,7 +1,10 @@
3048.4 /*
3048.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3048.6 *
3048.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3048.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3048.9 + *
3048.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3048.11 + * Other names may be trademarks of their respective owners.
3048.12 *
3048.13 * The contents of this file are subject to the terms of either the GNU
3048.14 * General Public License Version 2 only ("GPL") or the Common
3048.15 @@ -13,9 +16,9 @@
3048.16 * specific language governing permissions and limitations under the
3048.17 * License. When distributing the software, include this License Header
3048.18 * Notice in each file and include the License file at
3048.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3048.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3048.21 * particular file as subject to the "Classpath" exception as provided
3048.22 - * by Sun in the GPL Version 2 section of the License file that
3048.23 + * by Oracle in the GPL Version 2 section of the License file that
3048.24 * accompanied this code. If applicable, add the following below the
3048.25 * License Header, with the fields enclosed by brackets [] replaced by
3048.26 * your own identifying information:
3049.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesvalidator/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3049.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesvalidator/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3049.3 @@ -1,6 +1,9 @@
3049.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3049.5 #
3049.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3049.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3049.8 +#
3049.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3049.10 +# Other names may be trademarks of their respective owners.
3049.11 #
3049.12 # The contents of this file are subject to the terms of either the GNU
3049.13 # General Public License Version 2 only ("GPL") or the Common
3049.14 @@ -12,9 +15,9 @@
3049.15 # specific language governing permissions and limitations under the
3049.16 # License. When distributing the software, include this License Header
3049.17 # Notice in each file and include the License file at
3049.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3049.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3049.20 # particular file as subject to the "Classpath" exception as provided
3049.21 -# by Sun in the GPL Version 2 section of the License file that
3049.22 +# by Oracle in the GPL Version 2 section of the License file that
3049.23 # accompanied this code. If applicable, add the following below the
3049.24 # License Header, with the fields enclosed by brackets [] replaced by
3049.25 # your own identifying information:
3050.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesvalidator/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3050.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesvalidator/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3050.3 @@ -1,7 +1,10 @@
3050.4 /*
3050.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3050.6 *
3050.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3050.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3050.9 + *
3050.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3050.11 + * Other names may be trademarks of their respective owners.
3050.12 *
3050.13 * The contents of this file are subject to the terms of either the GNU
3050.14 * General Public License Version 2 only ("GPL") or the Common
3050.15 @@ -13,9 +16,9 @@
3050.16 * specific language governing permissions and limitations under the
3050.17 * License. When distributing the software, include this License Header
3050.18 * Notice in each file and include the License file at
3050.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3050.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3050.21 * particular file as subject to the "Classpath" exception as provided
3050.22 - * by Sun in the GPL Version 2 section of the License file that
3050.23 + * by Oracle in the GPL Version 2 section of the License file that
3050.24 * accompanied this code. If applicable, add the following below the
3050.25 * License Header, with the fields enclosed by brackets [] replaced by
3050.26 * your own identifying information:
3051.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesvaluechangelistener/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3051.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesvaluechangelistener/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3051.3 @@ -1,6 +1,9 @@
3051.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3051.5 #
3051.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3051.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3051.8 +#
3051.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3051.10 +# Other names may be trademarks of their respective owners.
3051.11 #
3051.12 # The contents of this file are subject to the terms of either the GNU
3051.13 # General Public License Version 2 only ("GPL") or the Common
3051.14 @@ -12,9 +15,9 @@
3051.15 # specific language governing permissions and limitations under the
3051.16 # License. When distributing the software, include this License Header
3051.17 # Notice in each file and include the License file at
3051.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3051.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3051.20 # particular file as subject to the "Classpath" exception as provided
3051.21 -# by Sun in the GPL Version 2 section of the License file that
3051.22 +# by Oracle in the GPL Version 2 section of the License file that
3051.23 # accompanied this code. If applicable, add the following below the
3051.24 # License Header, with the fields enclosed by brackets [] replaced by
3051.25 # your own identifying information:
3052.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesvaluechangelistener/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3052.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesvaluechangelistener/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3052.3 @@ -1,7 +1,10 @@
3052.4 /*
3052.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3052.6 *
3052.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3052.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3052.9 + *
3052.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3052.11 + * Other names may be trademarks of their respective owners.
3052.12 *
3052.13 * The contents of this file are subject to the terms of either the GNU
3052.14 * General Public License Version 2 only ("GPL") or the Common
3052.15 @@ -13,9 +16,9 @@
3052.16 * specific language governing permissions and limitations under the
3052.17 * License. When distributing the software, include this License Header
3052.18 * Notice in each file and include the License file at
3052.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3052.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3052.21 * particular file as subject to the "Classpath" exception as provided
3052.22 - * by Sun in the GPL Version 2 section of the License file that
3052.23 + * by Oracle in the GPL Version 2 section of the License file that
3052.24 * accompanied this code. If applicable, add the following below the
3052.25 * License Header, with the fields enclosed by brackets [] replaced by
3052.26 * your own identifying information:
3053.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesverbatim/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3053.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesverbatim/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3053.3 @@ -1,6 +1,9 @@
3053.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3053.5 #
3053.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3053.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3053.8 +#
3053.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3053.10 +# Other names may be trademarks of their respective owners.
3053.11 #
3053.12 # The contents of this file are subject to the terms of either the GNU
3053.13 # General Public License Version 2 only ("GPL") or the Common
3053.14 @@ -12,9 +15,9 @@
3053.15 # specific language governing permissions and limitations under the
3053.16 # License. When distributing the software, include this License Header
3053.17 # Notice in each file and include the License file at
3053.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3053.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3053.20 # particular file as subject to the "Classpath" exception as provided
3053.21 -# by Sun in the GPL Version 2 section of the License file that
3053.22 +# by Oracle in the GPL Version 2 section of the License file that
3053.23 # accompanied this code. If applicable, add the following below the
3053.24 # License Header, with the fields enclosed by brackets [] replaced by
3053.25 # your own identifying information:
3054.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesverbatim/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3054.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/facesverbatim/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3054.3 @@ -1,7 +1,10 @@
3054.4 /*
3054.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3054.6 *
3054.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3054.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3054.9 + *
3054.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3054.11 + * Other names may be trademarks of their respective owners.
3054.12 *
3054.13 * The contents of this file are subject to the terms of either the GNU
3054.14 * General Public License Version 2 only ("GPL") or the Common
3054.15 @@ -13,9 +16,9 @@
3054.16 * specific language governing permissions and limitations under the
3054.17 * License. When distributing the software, include this License Header
3054.18 * Notice in each file and include the License file at
3054.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3054.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3054.21 * particular file as subject to the "Classpath" exception as provided
3054.22 - * by Sun in the GPL Version 2 section of the License file that
3054.23 + * by Oracle in the GPL Version 2 section of the License file that
3054.24 * accompanied this code. If applicable, add the following below the
3054.25 * License Header, with the fields enclosed by brackets [] replaced by
3054.26 * your own identifying information:
3055.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/link/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3055.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/link/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3055.3 @@ -1,6 +1,9 @@
3055.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3055.5 #
3055.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3055.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3055.8 +#
3055.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3055.10 +# Other names may be trademarks of their respective owners.
3055.11 #
3055.12 # The contents of this file are subject to the terms of either the GNU
3055.13 # General Public License Version 2 only ("GPL") or the Common
3055.14 @@ -12,9 +15,9 @@
3055.15 # specific language governing permissions and limitations under the
3055.16 # License. When distributing the software, include this License Header
3055.17 # Notice in each file and include the License file at
3055.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3055.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3055.20 # particular file as subject to the "Classpath" exception as provided
3055.21 -# by Sun in the GPL Version 2 section of the License file that
3055.22 +# by Oracle in the GPL Version 2 section of the License file that
3055.23 # accompanied this code. If applicable, add the following below the
3055.24 # License Header, with the fields enclosed by brackets [] replaced by
3055.25 # your own identifying information:
3056.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/link/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3056.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/link/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3056.3 @@ -1,7 +1,10 @@
3056.4 /*
3056.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3056.6 *
3056.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3056.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3056.9 + *
3056.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3056.11 + * Other names may be trademarks of their respective owners.
3056.12 *
3056.13 * The contents of this file are subject to the terms of either the GNU
3056.14 * General Public License Version 2 only ("GPL") or the Common
3056.15 @@ -13,9 +16,9 @@
3056.16 * specific language governing permissions and limitations under the
3056.17 * License. When distributing the software, include this License Header
3056.18 * Notice in each file and include the License file at
3056.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3056.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3056.21 * particular file as subject to the "Classpath" exception as provided
3056.22 - * by Sun in the GPL Version 2 section of the License file that
3056.23 + * by Oracle in the GPL Version 2 section of the License file that
3056.24 * accompanied this code. If applicable, add the following below the
3056.25 * License Header, with the fields enclosed by brackets [] replaced by
3056.26 * your own identifying information:
3057.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/loadbundle/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3057.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/loadbundle/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3057.3 @@ -1,6 +1,9 @@
3057.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3057.5 #
3057.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3057.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3057.8 +#
3057.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3057.10 +# Other names may be trademarks of their respective owners.
3057.11 #
3057.12 # The contents of this file are subject to the terms of either the GNU
3057.13 # General Public License Version 2 only ("GPL") or the Common
3057.14 @@ -12,9 +15,9 @@
3057.15 # specific language governing permissions and limitations under the
3057.16 # License. When distributing the software, include this License Header
3057.17 # Notice in each file and include the License file at
3057.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3057.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3057.20 # particular file as subject to the "Classpath" exception as provided
3057.21 -# by Sun in the GPL Version 2 section of the License file that
3057.22 +# by Oracle in the GPL Version 2 section of the License file that
3057.23 # accompanied this code. If applicable, add the following below the
3057.24 # License Header, with the fields enclosed by brackets [] replaced by
3057.25 # your own identifying information:
3058.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/loadbundle/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3058.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/loadbundle/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3058.3 @@ -1,7 +1,10 @@
3058.4 /*
3058.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3058.6 *
3058.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3058.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3058.9 + *
3058.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3058.11 + * Other names may be trademarks of their respective owners.
3058.12 *
3058.13 * The contents of this file are subject to the terms of either the GNU
3058.14 * General Public License Version 2 only ("GPL") or the Common
3058.15 @@ -13,9 +16,9 @@
3058.16 * specific language governing permissions and limitations under the
3058.17 * License. When distributing the software, include this License Header
3058.18 * Notice in each file and include the License file at
3058.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3058.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3058.21 * particular file as subject to the "Classpath" exception as provided
3058.22 - * by Sun in the GPL Version 2 section of the License file that
3058.23 + * by Oracle in the GPL Version 2 section of the License file that
3058.24 * accompanied this code. If applicable, add the following below the
3058.25 * License Header, with the fields enclosed by brackets [] replaced by
3058.26 * your own identifying information:
3059.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/markup/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3059.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/markup/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3059.3 @@ -1,6 +1,9 @@
3059.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3059.5 #
3059.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3059.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3059.8 +#
3059.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3059.10 +# Other names may be trademarks of their respective owners.
3059.11 #
3059.12 # The contents of this file are subject to the terms of either the GNU
3059.13 # General Public License Version 2 only ("GPL") or the Common
3059.14 @@ -12,9 +15,9 @@
3059.15 # specific language governing permissions and limitations under the
3059.16 # License. When distributing the software, include this License Header
3059.17 # Notice in each file and include the License file at
3059.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3059.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3059.20 # particular file as subject to the "Classpath" exception as provided
3059.21 -# by Sun in the GPL Version 2 section of the License file that
3059.22 +# by Oracle in the GPL Version 2 section of the License file that
3059.23 # accompanied this code. If applicable, add the following below the
3059.24 # License Header, with the fields enclosed by brackets [] replaced by
3059.25 # your own identifying information:
3060.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/markup/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3060.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/markup/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3060.3 @@ -1,7 +1,10 @@
3060.4 /*
3060.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3060.6 *
3060.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3060.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3060.9 + *
3060.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3060.11 + * Other names may be trademarks of their respective owners.
3060.12 *
3060.13 * The contents of this file are subject to the terms of either the GNU
3060.14 * General Public License Version 2 only ("GPL") or the Common
3060.15 @@ -13,9 +16,9 @@
3060.16 * specific language governing permissions and limitations under the
3060.17 * License. When distributing the software, include this License Header
3060.18 * Notice in each file and include the License file at
3060.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3060.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3060.21 * particular file as subject to the "Classpath" exception as provided
3060.22 - * by Sun in the GPL Version 2 section of the License file that
3060.23 + * by Oracle in the GPL Version 2 section of the License file that
3060.24 * accompanied this code. If applicable, add the following below the
3060.25 * License Header, with the fields enclosed by brackets [] replaced by
3060.26 * your own identifying information:
3061.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/meta/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3061.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/meta/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3061.3 @@ -1,6 +1,9 @@
3061.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3061.5 #
3061.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3061.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3061.8 +#
3061.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3061.10 +# Other names may be trademarks of their respective owners.
3061.11 #
3061.12 # The contents of this file are subject to the terms of either the GNU
3061.13 # General Public License Version 2 only ("GPL") or the Common
3061.14 @@ -12,9 +15,9 @@
3061.15 # specific language governing permissions and limitations under the
3061.16 # License. When distributing the software, include this License Header
3061.17 # Notice in each file and include the License file at
3061.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3061.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3061.20 # particular file as subject to the "Classpath" exception as provided
3061.21 -# by Sun in the GPL Version 2 section of the License file that
3061.22 +# by Oracle in the GPL Version 2 section of the License file that
3061.23 # accompanied this code. If applicable, add the following below the
3061.24 # License Header, with the fields enclosed by brackets [] replaced by
3061.25 # your own identifying information:
3062.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/meta/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3062.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/meta/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3062.3 @@ -1,7 +1,10 @@
3062.4 /*
3062.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3062.6 *
3062.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3062.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3062.9 + *
3062.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3062.11 + * Other names may be trademarks of their respective owners.
3062.12 *
3062.13 * The contents of this file are subject to the terms of either the GNU
3062.14 * General Public License Version 2 only ("GPL") or the Common
3062.15 @@ -13,9 +16,9 @@
3062.16 * specific language governing permissions and limitations under the
3062.17 * License. When distributing the software, include this License Header
3062.18 * Notice in each file and include the License file at
3062.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3062.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3062.21 * particular file as subject to the "Classpath" exception as provided
3062.22 - * by Sun in the GPL Version 2 section of the License file that
3062.23 + * by Oracle in the GPL Version 2 section of the License file that
3062.24 * accompanied this code. If applicable, add the following below the
3062.25 * License Header, with the fields enclosed by brackets [] replaced by
3062.26 * your own identifying information:
3063.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/parameter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3063.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/parameter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3063.3 @@ -1,6 +1,9 @@
3063.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3063.5 #
3063.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3063.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3063.8 +#
3063.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3063.10 +# Other names may be trademarks of their respective owners.
3063.11 #
3063.12 # The contents of this file are subject to the terms of either the GNU
3063.13 # General Public License Version 2 only ("GPL") or the Common
3063.14 @@ -12,9 +15,9 @@
3063.15 # specific language governing permissions and limitations under the
3063.16 # License. When distributing the software, include this License Header
3063.17 # Notice in each file and include the License file at
3063.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3063.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3063.20 # particular file as subject to the "Classpath" exception as provided
3063.21 -# by Sun in the GPL Version 2 section of the License file that
3063.22 +# by Oracle in the GPL Version 2 section of the License file that
3063.23 # accompanied this code. If applicable, add the following below the
3063.24 # License Header, with the fields enclosed by brackets [] replaced by
3063.25 # your own identifying information:
3064.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/parameter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3064.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/parameter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3064.3 @@ -1,7 +1,10 @@
3064.4 /*
3064.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3064.6 *
3064.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3064.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3064.9 + *
3064.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3064.11 + * Other names may be trademarks of their respective owners.
3064.12 *
3064.13 * The contents of this file are subject to the terms of either the GNU
3064.14 * General Public License Version 2 only ("GPL") or the Common
3064.15 @@ -13,9 +16,9 @@
3064.16 * specific language governing permissions and limitations under the
3064.17 * License. When distributing the software, include this License Header
3064.18 * Notice in each file and include the License file at
3064.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3064.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3064.21 * particular file as subject to the "Classpath" exception as provided
3064.22 - * by Sun in the GPL Version 2 section of the License file that
3064.23 + * by Oracle in the GPL Version 2 section of the License file that
3064.24 * accompanied this code. If applicable, add the following below the
3064.25 * License Header, with the fields enclosed by brackets [] replaced by
3064.26 * your own identifying information:
3065.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/script/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3065.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/script/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3065.3 @@ -1,6 +1,9 @@
3065.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3065.5 #
3065.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3065.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3065.8 +#
3065.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3065.10 +# Other names may be trademarks of their respective owners.
3065.11 #
3065.12 # The contents of this file are subject to the terms of either the GNU
3065.13 # General Public License Version 2 only ("GPL") or the Common
3065.14 @@ -12,9 +15,9 @@
3065.15 # specific language governing permissions and limitations under the
3065.16 # License. When distributing the software, include this License Header
3065.17 # Notice in each file and include the License file at
3065.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3065.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3065.20 # particular file as subject to the "Classpath" exception as provided
3065.21 -# by Sun in the GPL Version 2 section of the License file that
3065.22 +# by Oracle in the GPL Version 2 section of the License file that
3065.23 # accompanied this code. If applicable, add the following below the
3065.24 # License Header, with the fields enclosed by brackets [] replaced by
3065.25 # your own identifying information:
3066.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/script/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3066.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/advanced/script/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3066.3 @@ -1,7 +1,10 @@
3066.4 /*
3066.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3066.6 *
3066.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3066.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3066.9 + *
3066.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3066.11 + * Other names may be trademarks of their respective owners.
3066.12 *
3066.13 * The contents of this file are subject to the terms of either the GNU
3066.14 * General Public License Version 2 only ("GPL") or the Common
3066.15 @@ -13,9 +16,9 @@
3066.16 * specific language governing permissions and limitations under the
3066.17 * License. When distributing the software, include this License Header
3066.18 * Notice in each file and include the License file at
3066.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3066.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3066.21 * particular file as subject to the "Classpath" exception as provided
3066.22 - * by Sun in the GPL Version 2 section of the License file that
3066.23 + * by Oracle in the GPL Version 2 section of the License file that
3066.24 * accompanied this code. If applicable, add the following below the
3066.25 * License Header, with the fields enclosed by brackets [] replaced by
3066.26 * your own identifying information:
3067.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/composite/CheckIDELogTest.java Fri Jul 16 11:47:36 2010 -0400
3067.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/composite/CheckIDELogTest.java Fri Jul 16 14:21:50 2010 -0400
3067.3 @@ -1,7 +1,10 @@
3067.4 /*
3067.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3067.6 *
3067.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3067.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3067.9 + *
3067.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3067.11 + * Other names may be trademarks of their respective owners.
3067.12 *
3067.13 * The contents of this file are subject to the terms of either the GNU
3067.14 * General Public License Version 2 only ("GPL") or the Common
3067.15 @@ -13,9 +16,9 @@
3067.16 * specific language governing permissions and limitations under the
3067.17 * License. When distributing the software, include this License Header
3067.18 * Notice in each file and include the License file at
3067.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3067.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3067.21 * particular file as subject to the "Classpath" exception as provided
3067.22 - * by Sun in the GPL Version 2 section of the License file that
3067.23 + * by Oracle in the GPL Version 2 section of the License file that
3067.24 * accompanied this code. If applicable, add the following below the
3067.25 * License Header, with the fields enclosed by brackets [] replaced by
3067.26 * your own identifying information:
3068.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/composite/CompositeComponentsTest.java Fri Jul 16 11:47:36 2010 -0400
3068.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/composite/CompositeComponentsTest.java Fri Jul 16 14:21:50 2010 -0400
3068.3 @@ -1,7 +1,10 @@
3068.4 /*
3068.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3068.6 *
3068.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3068.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3068.9 + *
3068.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3068.11 + * Other names may be trademarks of their respective owners.
3068.12 *
3068.13 * The contents of this file are subject to the terms of either the GNU
3068.14 * General Public License Version 2 only ("GPL") or the Common
3068.15 @@ -13,9 +16,9 @@
3068.16 * specific language governing permissions and limitations under the
3068.17 * License. When distributing the software, include this License Header
3068.18 * Notice in each file and include the License file at
3068.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3068.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3068.21 * particular file as subject to the "Classpath" exception as provided
3068.22 - * by Sun in the GPL Version 2 section of the License file that
3068.23 + * by Oracle in the GPL Version 2 section of the License file that
3068.24 * accompanied this code. If applicable, add the following below the
3068.25 * License Header, with the fields enclosed by brackets [] replaced by
3068.26 * your own identifying information:
3069.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/bigdecimal/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3069.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/bigdecimal/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3069.3 @@ -1,6 +1,9 @@
3069.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3069.5 #
3069.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3069.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3069.8 +#
3069.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3069.10 +# Other names may be trademarks of their respective owners.
3069.11 #
3069.12 # The contents of this file are subject to the terms of either the GNU
3069.13 # General Public License Version 2 only ("GPL") or the Common
3069.14 @@ -12,9 +15,9 @@
3069.15 # specific language governing permissions and limitations under the
3069.16 # License. When distributing the software, include this License Header
3069.17 # Notice in each file and include the License file at
3069.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3069.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3069.20 # particular file as subject to the "Classpath" exception as provided
3069.21 -# by Sun in the GPL Version 2 section of the License file that
3069.22 +# by Oracle in the GPL Version 2 section of the License file that
3069.23 # accompanied this code. If applicable, add the following below the
3069.24 # License Header, with the fields enclosed by brackets [] replaced by
3069.25 # your own identifying information:
3070.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/bigdecimal/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3070.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/bigdecimal/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3070.3 @@ -1,7 +1,10 @@
3070.4 /*
3070.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3070.6 *
3070.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3070.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3070.9 + *
3070.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3070.11 + * Other names may be trademarks of their respective owners.
3070.12 *
3070.13 * The contents of this file are subject to the terms of either the GNU
3070.14 * General Public License Version 2 only ("GPL") or the Common
3070.15 @@ -13,9 +16,9 @@
3070.16 * specific language governing permissions and limitations under the
3070.17 * License. When distributing the software, include this License Header
3070.18 * Notice in each file and include the License file at
3070.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3070.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3070.21 * particular file as subject to the "Classpath" exception as provided
3070.22 - * by Sun in the GPL Version 2 section of the License file that
3070.23 + * by Oracle in the GPL Version 2 section of the License file that
3070.24 * accompanied this code. If applicable, add the following below the
3070.25 * License Header, with the fields enclosed by brackets [] replaced by
3070.26 * your own identifying information:
3071.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/biginteger/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3071.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/biginteger/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3071.3 @@ -1,6 +1,9 @@
3071.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3071.5 #
3071.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3071.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3071.8 +#
3071.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3071.10 +# Other names may be trademarks of their respective owners.
3071.11 #
3071.12 # The contents of this file are subject to the terms of either the GNU
3071.13 # General Public License Version 2 only ("GPL") or the Common
3071.14 @@ -12,9 +15,9 @@
3071.15 # specific language governing permissions and limitations under the
3071.16 # License. When distributing the software, include this License Header
3071.17 # Notice in each file and include the License file at
3071.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3071.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3071.20 # particular file as subject to the "Classpath" exception as provided
3071.21 -# by Sun in the GPL Version 2 section of the License file that
3071.22 +# by Oracle in the GPL Version 2 section of the License file that
3071.23 # accompanied this code. If applicable, add the following below the
3071.24 # License Header, with the fields enclosed by brackets [] replaced by
3071.25 # your own identifying information:
3072.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/biginteger/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3072.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/biginteger/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3072.3 @@ -1,7 +1,10 @@
3072.4 /*
3072.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3072.6 *
3072.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3072.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3072.9 + *
3072.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3072.11 + * Other names may be trademarks of their respective owners.
3072.12 *
3072.13 * The contents of this file are subject to the terms of either the GNU
3072.14 * General Public License Version 2 only ("GPL") or the Common
3072.15 @@ -13,9 +16,9 @@
3072.16 * specific language governing permissions and limitations under the
3072.17 * License. When distributing the software, include this License Header
3072.18 * Notice in each file and include the License file at
3072.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3072.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3072.21 * particular file as subject to the "Classpath" exception as provided
3072.22 - * by Sun in the GPL Version 2 section of the License file that
3072.23 + * by Oracle in the GPL Version 2 section of the License file that
3072.24 * accompanied this code. If applicable, add the following below the
3072.25 * License Header, with the fields enclosed by brackets [] replaced by
3072.26 * your own identifying information:
3073.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/booleanconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3073.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/booleanconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3073.3 @@ -1,6 +1,9 @@
3073.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3073.5 #
3073.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3073.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3073.8 +#
3073.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3073.10 +# Other names may be trademarks of their respective owners.
3073.11 #
3073.12 # The contents of this file are subject to the terms of either the GNU
3073.13 # General Public License Version 2 only ("GPL") or the Common
3073.14 @@ -12,9 +15,9 @@
3073.15 # specific language governing permissions and limitations under the
3073.16 # License. When distributing the software, include this License Header
3073.17 # Notice in each file and include the License file at
3073.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3073.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3073.20 # particular file as subject to the "Classpath" exception as provided
3073.21 -# by Sun in the GPL Version 2 section of the License file that
3073.22 +# by Oracle in the GPL Version 2 section of the License file that
3073.23 # accompanied this code. If applicable, add the following below the
3073.24 # License Header, with the fields enclosed by brackets [] replaced by
3073.25 # your own identifying information:
3074.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/booleanconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3074.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/booleanconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3074.3 @@ -1,7 +1,10 @@
3074.4 /*
3074.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3074.6 *
3074.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3074.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3074.9 + *
3074.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3074.11 + * Other names may be trademarks of their respective owners.
3074.12 *
3074.13 * The contents of this file are subject to the terms of either the GNU
3074.14 * General Public License Version 2 only ("GPL") or the Common
3074.15 @@ -13,9 +16,9 @@
3074.16 * specific language governing permissions and limitations under the
3074.17 * License. When distributing the software, include this License Header
3074.18 * Notice in each file and include the License file at
3074.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3074.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3074.21 * particular file as subject to the "Classpath" exception as provided
3074.22 - * by Sun in the GPL Version 2 section of the License file that
3074.23 + * by Oracle in the GPL Version 2 section of the License file that
3074.24 * accompanied this code. If applicable, add the following below the
3074.25 * License Header, with the fields enclosed by brackets [] replaced by
3074.26 * your own identifying information:
3075.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/byteconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3075.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/byteconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3075.3 @@ -1,6 +1,9 @@
3075.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3075.5 #
3075.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3075.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3075.8 +#
3075.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3075.10 +# Other names may be trademarks of their respective owners.
3075.11 #
3075.12 # The contents of this file are subject to the terms of either the GNU
3075.13 # General Public License Version 2 only ("GPL") or the Common
3075.14 @@ -12,9 +15,9 @@
3075.15 # specific language governing permissions and limitations under the
3075.16 # License. When distributing the software, include this License Header
3075.17 # Notice in each file and include the License file at
3075.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3075.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3075.20 # particular file as subject to the "Classpath" exception as provided
3075.21 -# by Sun in the GPL Version 2 section of the License file that
3075.22 +# by Oracle in the GPL Version 2 section of the License file that
3075.23 # accompanied this code. If applicable, add the following below the
3075.24 # License Header, with the fields enclosed by brackets [] replaced by
3075.25 # your own identifying information:
3076.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/byteconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3076.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/byteconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3076.3 @@ -1,7 +1,10 @@
3076.4 /*
3076.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3076.6 *
3076.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3076.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3076.9 + *
3076.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3076.11 + * Other names may be trademarks of their respective owners.
3076.12 *
3076.13 * The contents of this file are subject to the terms of either the GNU
3076.14 * General Public License Version 2 only ("GPL") or the Common
3076.15 @@ -13,9 +16,9 @@
3076.16 * specific language governing permissions and limitations under the
3076.17 * License. When distributing the software, include this License Header
3076.18 * Notice in each file and include the License file at
3076.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3076.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3076.21 * particular file as subject to the "Classpath" exception as provided
3076.22 - * by Sun in the GPL Version 2 section of the License file that
3076.23 + * by Oracle in the GPL Version 2 section of the License file that
3076.24 * accompanied this code. If applicable, add the following below the
3076.25 * License Header, with the fields enclosed by brackets [] replaced by
3076.26 * your own identifying information:
3077.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/calendar/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3077.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/calendar/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3077.3 @@ -1,6 +1,9 @@
3077.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3077.5 #
3077.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3077.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3077.8 +#
3077.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3077.10 +# Other names may be trademarks of their respective owners.
3077.11 #
3077.12 # The contents of this file are subject to the terms of either the GNU
3077.13 # General Public License Version 2 only ("GPL") or the Common
3077.14 @@ -12,9 +15,9 @@
3077.15 # specific language governing permissions and limitations under the
3077.16 # License. When distributing the software, include this License Header
3077.17 # Notice in each file and include the License file at
3077.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3077.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3077.20 # particular file as subject to the "Classpath" exception as provided
3077.21 -# by Sun in the GPL Version 2 section of the License file that
3077.22 +# by Oracle in the GPL Version 2 section of the License file that
3077.23 # accompanied this code. If applicable, add the following below the
3077.24 # License Header, with the fields enclosed by brackets [] replaced by
3077.25 # your own identifying information:
3078.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/calendar/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3078.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/calendar/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3078.3 @@ -1,7 +1,10 @@
3078.4 /*
3078.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3078.6 *
3078.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3078.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3078.9 + *
3078.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3078.11 + * Other names may be trademarks of their respective owners.
3078.12 *
3078.13 * The contents of this file are subject to the terms of either the GNU
3078.14 * General Public License Version 2 only ("GPL") or the Common
3078.15 @@ -13,9 +16,9 @@
3078.16 * specific language governing permissions and limitations under the
3078.17 * License. When distributing the software, include this License Header
3078.18 * Notice in each file and include the License file at
3078.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3078.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3078.21 * particular file as subject to the "Classpath" exception as provided
3078.22 - * by Sun in the GPL Version 2 section of the License file that
3078.23 + * by Oracle in the GPL Version 2 section of the License file that
3078.24 * accompanied this code. If applicable, add the following below the
3078.25 * License Header, with the fields enclosed by brackets [] replaced by
3078.26 * your own identifying information:
3079.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/character/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3079.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/character/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3079.3 @@ -1,6 +1,9 @@
3079.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3079.5 #
3079.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3079.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3079.8 +#
3079.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3079.10 +# Other names may be trademarks of their respective owners.
3079.11 #
3079.12 # The contents of this file are subject to the terms of either the GNU
3079.13 # General Public License Version 2 only ("GPL") or the Common
3079.14 @@ -12,9 +15,9 @@
3079.15 # specific language governing permissions and limitations under the
3079.16 # License. When distributing the software, include this License Header
3079.17 # Notice in each file and include the License file at
3079.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3079.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3079.20 # particular file as subject to the "Classpath" exception as provided
3079.21 -# by Sun in the GPL Version 2 section of the License file that
3079.22 +# by Oracle in the GPL Version 2 section of the License file that
3079.23 # accompanied this code. If applicable, add the following below the
3079.24 # License Header, with the fields enclosed by brackets [] replaced by
3079.25 # your own identifying information:
3080.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/character/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3080.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/character/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3080.3 @@ -1,7 +1,10 @@
3080.4 /*
3080.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3080.6 *
3080.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3080.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3080.9 + *
3080.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3080.11 + * Other names may be trademarks of their respective owners.
3080.12 *
3080.13 * The contents of this file are subject to the terms of either the GNU
3080.14 * General Public License Version 2 only ("GPL") or the Common
3080.15 @@ -13,9 +16,9 @@
3080.16 * specific language governing permissions and limitations under the
3080.17 * License. When distributing the software, include this License Header
3080.18 * Notice in each file and include the License file at
3080.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3080.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3080.21 * particular file as subject to the "Classpath" exception as provided
3080.22 - * by Sun in the GPL Version 2 section of the License file that
3080.23 + * by Oracle in the GPL Version 2 section of the License file that
3080.24 * accompanied this code. If applicable, add the following below the
3080.25 * License Header, with the fields enclosed by brackets [] replaced by
3080.26 * your own identifying information:
3081.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/datetime/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3081.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/datetime/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3081.3 @@ -1,6 +1,9 @@
3081.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3081.5 #
3081.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3081.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3081.8 +#
3081.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3081.10 +# Other names may be trademarks of their respective owners.
3081.11 #
3081.12 # The contents of this file are subject to the terms of either the GNU
3081.13 # General Public License Version 2 only ("GPL") or the Common
3081.14 @@ -12,9 +15,9 @@
3081.15 # specific language governing permissions and limitations under the
3081.16 # License. When distributing the software, include this License Header
3081.17 # Notice in each file and include the License file at
3081.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3081.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3081.20 # particular file as subject to the "Classpath" exception as provided
3081.21 -# by Sun in the GPL Version 2 section of the License file that
3081.22 +# by Oracle in the GPL Version 2 section of the License file that
3081.23 # accompanied this code. If applicable, add the following below the
3081.24 # License Header, with the fields enclosed by brackets [] replaced by
3081.25 # your own identifying information:
3082.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/datetime/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3082.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/datetime/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3082.3 @@ -1,7 +1,10 @@
3082.4 /*
3082.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3082.6 *
3082.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3082.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3082.9 + *
3082.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3082.11 + * Other names may be trademarks of their respective owners.
3082.12 *
3082.13 * The contents of this file are subject to the terms of either the GNU
3082.14 * General Public License Version 2 only ("GPL") or the Common
3082.15 @@ -13,9 +16,9 @@
3082.16 * specific language governing permissions and limitations under the
3082.17 * License. When distributing the software, include this License Header
3082.18 * Notice in each file and include the License file at
3082.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3082.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3082.21 * particular file as subject to the "Classpath" exception as provided
3082.22 - * by Sun in the GPL Version 2 section of the License file that
3082.23 + * by Oracle in the GPL Version 2 section of the License file that
3082.24 * accompanied this code. If applicable, add the following below the
3082.25 * License Header, with the fields enclosed by brackets [] replaced by
3082.26 * your own identifying information:
3083.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/doubleconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3083.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/doubleconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3083.3 @@ -1,6 +1,9 @@
3083.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3083.5 #
3083.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3083.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3083.8 +#
3083.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3083.10 +# Other names may be trademarks of their respective owners.
3083.11 #
3083.12 # The contents of this file are subject to the terms of either the GNU
3083.13 # General Public License Version 2 only ("GPL") or the Common
3083.14 @@ -12,9 +15,9 @@
3083.15 # specific language governing permissions and limitations under the
3083.16 # License. When distributing the software, include this License Header
3083.17 # Notice in each file and include the License file at
3083.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3083.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3083.20 # particular file as subject to the "Classpath" exception as provided
3083.21 -# by Sun in the GPL Version 2 section of the License file that
3083.22 +# by Oracle in the GPL Version 2 section of the License file that
3083.23 # accompanied this code. If applicable, add the following below the
3083.24 # License Header, with the fields enclosed by brackets [] replaced by
3083.25 # your own identifying information:
3084.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/doubleconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3084.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/doubleconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3084.3 @@ -1,7 +1,10 @@
3084.4 /*
3084.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3084.6 *
3084.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3084.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3084.9 + *
3084.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3084.11 + * Other names may be trademarks of their respective owners.
3084.12 *
3084.13 * The contents of this file are subject to the terms of either the GNU
3084.14 * General Public License Version 2 only ("GPL") or the Common
3084.15 @@ -13,9 +16,9 @@
3084.16 * specific language governing permissions and limitations under the
3084.17 * License. When distributing the software, include this License Header
3084.18 * Notice in each file and include the License file at
3084.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3084.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3084.21 * particular file as subject to the "Classpath" exception as provided
3084.22 - * by Sun in the GPL Version 2 section of the License file that
3084.23 + * by Oracle in the GPL Version 2 section of the License file that
3084.24 * accompanied this code. If applicable, add the following below the
3084.25 * License Header, with the fields enclosed by brackets [] replaced by
3084.26 * your own identifying information:
3085.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/enumconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3085.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/enumconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3085.3 @@ -1,6 +1,9 @@
3085.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3085.5 #
3085.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3085.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3085.8 +#
3085.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3085.10 +# Other names may be trademarks of their respective owners.
3085.11 #
3085.12 # The contents of this file are subject to the terms of either the GNU
3085.13 # General Public License Version 2 only ("GPL") or the Common
3085.14 @@ -12,9 +15,9 @@
3085.15 # specific language governing permissions and limitations under the
3085.16 # License. When distributing the software, include this License Header
3085.17 # Notice in each file and include the License file at
3085.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3085.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3085.20 # particular file as subject to the "Classpath" exception as provided
3085.21 -# by Sun in the GPL Version 2 section of the License file that
3085.22 +# by Oracle in the GPL Version 2 section of the License file that
3085.23 # accompanied this code. If applicable, add the following below the
3085.24 # License Header, with the fields enclosed by brackets [] replaced by
3085.25 # your own identifying information:
3086.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/enumconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3086.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/enumconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3086.3 @@ -1,7 +1,10 @@
3086.4 /*
3086.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3086.6 *
3086.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3086.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3086.9 + *
3086.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3086.11 + * Other names may be trademarks of their respective owners.
3086.12 *
3086.13 * The contents of this file are subject to the terms of either the GNU
3086.14 * General Public License Version 2 only ("GPL") or the Common
3086.15 @@ -13,9 +16,9 @@
3086.16 * specific language governing permissions and limitations under the
3086.17 * License. When distributing the software, include this License Header
3086.18 * Notice in each file and include the License file at
3086.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3086.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3086.21 * particular file as subject to the "Classpath" exception as provided
3086.22 - * by Sun in the GPL Version 2 section of the License file that
3086.23 + * by Oracle in the GPL Version 2 section of the License file that
3086.24 * accompanied this code. If applicable, add the following below the
3086.25 * License Header, with the fields enclosed by brackets [] replaced by
3086.26 * your own identifying information:
3087.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/floatconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3087.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/floatconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3087.3 @@ -1,6 +1,9 @@
3087.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3087.5 #
3087.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3087.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3087.8 +#
3087.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3087.10 +# Other names may be trademarks of their respective owners.
3087.11 #
3087.12 # The contents of this file are subject to the terms of either the GNU
3087.13 # General Public License Version 2 only ("GPL") or the Common
3087.14 @@ -12,9 +15,9 @@
3087.15 # specific language governing permissions and limitations under the
3087.16 # License. When distributing the software, include this License Header
3087.17 # Notice in each file and include the License file at
3087.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3087.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3087.20 # particular file as subject to the "Classpath" exception as provided
3087.21 -# by Sun in the GPL Version 2 section of the License file that
3087.22 +# by Oracle in the GPL Version 2 section of the License file that
3087.23 # accompanied this code. If applicable, add the following below the
3087.24 # License Header, with the fields enclosed by brackets [] replaced by
3087.25 # your own identifying information:
3088.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/floatconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3088.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/floatconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3088.3 @@ -1,7 +1,10 @@
3088.4 /*
3088.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3088.6 *
3088.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3088.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3088.9 + *
3088.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3088.11 + * Other names may be trademarks of their respective owners.
3088.12 *
3088.13 * The contents of this file are subject to the terms of either the GNU
3088.14 * General Public License Version 2 only ("GPL") or the Common
3088.15 @@ -13,9 +16,9 @@
3088.16 * specific language governing permissions and limitations under the
3088.17 * License. When distributing the software, include this License Header
3088.18 * Notice in each file and include the License file at
3088.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3088.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3088.21 * particular file as subject to the "Classpath" exception as provided
3088.22 - * by Sun in the GPL Version 2 section of the License file that
3088.23 + * by Oracle in the GPL Version 2 section of the License file that
3088.24 * accompanied this code. If applicable, add the following below the
3088.25 * License Header, with the fields enclosed by brackets [] replaced by
3088.26 * your own identifying information:
3089.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/integerconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3089.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/integerconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3089.3 @@ -1,6 +1,9 @@
3089.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3089.5 #
3089.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3089.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3089.8 +#
3089.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3089.10 +# Other names may be trademarks of their respective owners.
3089.11 #
3089.12 # The contents of this file are subject to the terms of either the GNU
3089.13 # General Public License Version 2 only ("GPL") or the Common
3089.14 @@ -12,9 +15,9 @@
3089.15 # specific language governing permissions and limitations under the
3089.16 # License. When distributing the software, include this License Header
3089.17 # Notice in each file and include the License file at
3089.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3089.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3089.20 # particular file as subject to the "Classpath" exception as provided
3089.21 -# by Sun in the GPL Version 2 section of the License file that
3089.22 +# by Oracle in the GPL Version 2 section of the License file that
3089.23 # accompanied this code. If applicable, add the following below the
3089.24 # License Header, with the fields enclosed by brackets [] replaced by
3089.25 # your own identifying information:
3090.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/integerconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3090.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/integerconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3090.3 @@ -1,7 +1,10 @@
3090.4 /*
3090.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3090.6 *
3090.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3090.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3090.9 + *
3090.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3090.11 + * Other names may be trademarks of their respective owners.
3090.12 *
3090.13 * The contents of this file are subject to the terms of either the GNU
3090.14 * General Public License Version 2 only ("GPL") or the Common
3090.15 @@ -13,9 +16,9 @@
3090.16 * specific language governing permissions and limitations under the
3090.17 * License. When distributing the software, include this License Header
3090.18 * Notice in each file and include the License file at
3090.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3090.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3090.21 * particular file as subject to the "Classpath" exception as provided
3090.22 - * by Sun in the GPL Version 2 section of the License file that
3090.23 + * by Oracle in the GPL Version 2 section of the License file that
3090.24 * accompanied this code. If applicable, add the following below the
3090.25 * License Header, with the fields enclosed by brackets [] replaced by
3090.26 * your own identifying information:
3091.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/longconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3091.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/longconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3091.3 @@ -1,6 +1,9 @@
3091.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3091.5 #
3091.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3091.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3091.8 +#
3091.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3091.10 +# Other names may be trademarks of their respective owners.
3091.11 #
3091.12 # The contents of this file are subject to the terms of either the GNU
3091.13 # General Public License Version 2 only ("GPL") or the Common
3091.14 @@ -12,9 +15,9 @@
3091.15 # specific language governing permissions and limitations under the
3091.16 # License. When distributing the software, include this License Header
3091.17 # Notice in each file and include the License file at
3091.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3091.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3091.20 # particular file as subject to the "Classpath" exception as provided
3091.21 -# by Sun in the GPL Version 2 section of the License file that
3091.22 +# by Oracle in the GPL Version 2 section of the License file that
3091.23 # accompanied this code. If applicable, add the following below the
3091.24 # License Header, with the fields enclosed by brackets [] replaced by
3091.25 # your own identifying information:
3092.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/longconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3092.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/longconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3092.3 @@ -1,7 +1,10 @@
3092.4 /*
3092.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3092.6 *
3092.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3092.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3092.9 + *
3092.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3092.11 + * Other names may be trademarks of their respective owners.
3092.12 *
3092.13 * The contents of this file are subject to the terms of either the GNU
3092.14 * General Public License Version 2 only ("GPL") or the Common
3092.15 @@ -13,9 +16,9 @@
3092.16 * specific language governing permissions and limitations under the
3092.17 * License. When distributing the software, include this License Header
3092.18 * Notice in each file and include the License file at
3092.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3092.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3092.21 * particular file as subject to the "Classpath" exception as provided
3092.22 - * by Sun in the GPL Version 2 section of the License file that
3092.23 + * by Oracle in the GPL Version 2 section of the License file that
3092.24 * accompanied this code. If applicable, add the following below the
3092.25 * License Header, with the fields enclosed by brackets [] replaced by
3092.26 * your own identifying information:
3093.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/numberconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3093.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/numberconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3093.3 @@ -1,6 +1,9 @@
3093.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3093.5 #
3093.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3093.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3093.8 +#
3093.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3093.10 +# Other names may be trademarks of their respective owners.
3093.11 #
3093.12 # The contents of this file are subject to the terms of either the GNU
3093.13 # General Public License Version 2 only ("GPL") or the Common
3093.14 @@ -12,9 +15,9 @@
3093.15 # specific language governing permissions and limitations under the
3093.16 # License. When distributing the software, include this License Header
3093.17 # Notice in each file and include the License file at
3093.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3093.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3093.20 # particular file as subject to the "Classpath" exception as provided
3093.21 -# by Sun in the GPL Version 2 section of the License file that
3093.22 +# by Oracle in the GPL Version 2 section of the License file that
3093.23 # accompanied this code. If applicable, add the following below the
3093.24 # License Header, with the fields enclosed by brackets [] replaced by
3093.25 # your own identifying information:
3094.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/numberconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3094.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/numberconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3094.3 @@ -1,7 +1,10 @@
3094.4 /*
3094.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3094.6 *
3094.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3094.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3094.9 + *
3094.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3094.11 + * Other names may be trademarks of their respective owners.
3094.12 *
3094.13 * The contents of this file are subject to the terms of either the GNU
3094.14 * General Public License Version 2 only ("GPL") or the Common
3094.15 @@ -13,9 +16,9 @@
3094.16 * specific language governing permissions and limitations under the
3094.17 * License. When distributing the software, include this License Header
3094.18 * Notice in each file and include the License file at
3094.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3094.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3094.21 * particular file as subject to the "Classpath" exception as provided
3094.22 - * by Sun in the GPL Version 2 section of the License file that
3094.23 + * by Oracle in the GPL Version 2 section of the License file that
3094.24 * accompanied this code. If applicable, add the following below the
3094.25 * License Header, with the fields enclosed by brackets [] replaced by
3094.26 * your own identifying information:
3095.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/shortconverter/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3095.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/shortconverter/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3095.3 @@ -1,6 +1,9 @@
3095.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3095.5 #
3095.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3095.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3095.8 +#
3095.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3095.10 +# Other names may be trademarks of their respective owners.
3095.11 #
3095.12 # The contents of this file are subject to the terms of either the GNU
3095.13 # General Public License Version 2 only ("GPL") or the Common
3095.14 @@ -12,9 +15,9 @@
3095.15 # specific language governing permissions and limitations under the
3095.16 # License. When distributing the software, include this License Header
3095.17 # Notice in each file and include the License file at
3095.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3095.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3095.20 # particular file as subject to the "Classpath" exception as provided
3095.21 -# by Sun in the GPL Version 2 section of the License file that
3095.22 +# by Oracle in the GPL Version 2 section of the License file that
3095.23 # accompanied this code. If applicable, add the following below the
3095.24 # License Header, with the fields enclosed by brackets [] replaced by
3095.25 # your own identifying information:
3096.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/shortconverter/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3096.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/shortconverter/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3096.3 @@ -1,7 +1,10 @@
3096.4 /*
3096.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3096.6 *
3096.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3096.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3096.9 + *
3096.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3096.11 + * Other names may be trademarks of their respective owners.
3096.12 *
3096.13 * The contents of this file are subject to the terms of either the GNU
3096.14 * General Public License Version 2 only ("GPL") or the Common
3096.15 @@ -13,9 +16,9 @@
3096.16 * specific language governing permissions and limitations under the
3096.17 * License. When distributing the software, include this License Header
3096.18 * Notice in each file and include the License file at
3096.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3096.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3096.21 * particular file as subject to the "Classpath" exception as provided
3096.22 - * by Sun in the GPL Version 2 section of the License file that
3096.23 + * by Oracle in the GPL Version 2 section of the License file that
3096.24 * accompanied this code. If applicable, add the following below the
3096.25 * License Header, with the fields enclosed by brackets [] replaced by
3096.26 * your own identifying information:
3097.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqldate/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3097.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqldate/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3097.3 @@ -1,6 +1,9 @@
3097.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3097.5 #
3097.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3097.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3097.8 +#
3097.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3097.10 +# Other names may be trademarks of their respective owners.
3097.11 #
3097.12 # The contents of this file are subject to the terms of either the GNU
3097.13 # General Public License Version 2 only ("GPL") or the Common
3097.14 @@ -12,9 +15,9 @@
3097.15 # specific language governing permissions and limitations under the
3097.16 # License. When distributing the software, include this License Header
3097.17 # Notice in each file and include the License file at
3097.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3097.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3097.20 # particular file as subject to the "Classpath" exception as provided
3097.21 -# by Sun in the GPL Version 2 section of the License file that
3097.22 +# by Oracle in the GPL Version 2 section of the License file that
3097.23 # accompanied this code. If applicable, add the following below the
3097.24 # License Header, with the fields enclosed by brackets [] replaced by
3097.25 # your own identifying information:
3098.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqldate/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3098.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqldate/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3098.3 @@ -1,7 +1,10 @@
3098.4 /*
3098.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3098.6 *
3098.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3098.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3098.9 + *
3098.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3098.11 + * Other names may be trademarks of their respective owners.
3098.12 *
3098.13 * The contents of this file are subject to the terms of either the GNU
3098.14 * General Public License Version 2 only ("GPL") or the Common
3098.15 @@ -13,9 +16,9 @@
3098.16 * specific language governing permissions and limitations under the
3098.17 * License. When distributing the software, include this License Header
3098.18 * Notice in each file and include the License file at
3098.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3098.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3098.21 * particular file as subject to the "Classpath" exception as provided
3098.22 - * by Sun in the GPL Version 2 section of the License file that
3098.23 + * by Oracle in the GPL Version 2 section of the License file that
3098.24 * accompanied this code. If applicable, add the following below the
3098.25 * License Header, with the fields enclosed by brackets [] replaced by
3098.26 * your own identifying information:
3099.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqltime/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3099.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqltime/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3099.3 @@ -1,6 +1,9 @@
3099.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3099.5 #
3099.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3099.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3099.8 +#
3099.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3099.10 +# Other names may be trademarks of their respective owners.
3099.11 #
3099.12 # The contents of this file are subject to the terms of either the GNU
3099.13 # General Public License Version 2 only ("GPL") or the Common
3099.14 @@ -12,9 +15,9 @@
3099.15 # specific language governing permissions and limitations under the
3099.16 # License. When distributing the software, include this License Header
3099.17 # Notice in each file and include the License file at
3099.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3099.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3099.20 # particular file as subject to the "Classpath" exception as provided
3099.21 -# by Sun in the GPL Version 2 section of the License file that
3099.22 +# by Oracle in the GPL Version 2 section of the License file that
3099.23 # accompanied this code. If applicable, add the following below the
3099.24 # License Header, with the fields enclosed by brackets [] replaced by
3099.25 # your own identifying information:
3100.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqltime/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3100.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqltime/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3100.3 @@ -1,7 +1,10 @@
3100.4 /*
3100.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3100.6 *
3100.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3100.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3100.9 + *
3100.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3100.11 + * Other names may be trademarks of their respective owners.
3100.12 *
3100.13 * The contents of this file are subject to the terms of either the GNU
3100.14 * General Public License Version 2 only ("GPL") or the Common
3100.15 @@ -13,9 +16,9 @@
3100.16 * specific language governing permissions and limitations under the
3100.17 * License. When distributing the software, include this License Header
3100.18 * Notice in each file and include the License file at
3100.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3100.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3100.21 * particular file as subject to the "Classpath" exception as provided
3100.22 - * by Sun in the GPL Version 2 section of the License file that
3100.23 + * by Oracle in the GPL Version 2 section of the License file that
3100.24 * accompanied this code. If applicable, add the following below the
3100.25 * License Header, with the fields enclosed by brackets [] replaced by
3100.26 * your own identifying information:
3101.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqltimestamp/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3101.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqltimestamp/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3101.3 @@ -1,6 +1,9 @@
3101.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3101.5 #
3101.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3101.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3101.8 +#
3101.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3101.10 +# Other names may be trademarks of their respective owners.
3101.11 #
3101.12 # The contents of this file are subject to the terms of either the GNU
3101.13 # General Public License Version 2 only ("GPL") or the Common
3101.14 @@ -12,9 +15,9 @@
3101.15 # specific language governing permissions and limitations under the
3101.16 # License. When distributing the software, include this License Header
3101.17 # Notice in each file and include the License file at
3101.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3101.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3101.20 # particular file as subject to the "Classpath" exception as provided
3101.21 -# by Sun in the GPL Version 2 section of the License file that
3101.22 +# by Oracle in the GPL Version 2 section of the License file that
3101.23 # accompanied this code. If applicable, add the following below the
3101.24 # License Header, with the fields enclosed by brackets [] replaced by
3101.25 # your own identifying information:
3102.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqltimestamp/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3102.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/converters/sqltimestamp/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3102.3 @@ -1,7 +1,10 @@
3102.4 /*
3102.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3102.6 *
3102.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3102.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3102.9 + *
3102.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3102.11 + * Other names may be trademarks of their respective owners.
3102.12 *
3102.13 * The contents of this file are subject to the terms of either the GNU
3102.14 * General Public License Version 2 only ("GPL") or the Common
3102.15 @@ -13,9 +16,9 @@
3102.16 * specific language governing permissions and limitations under the
3102.17 * License. When distributing the software, include this License Header
3102.18 * Notice in each file and include the License file at
3102.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3102.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3102.21 * particular file as subject to the "Classpath" exception as provided
3102.22 - * by Sun in the GPL Version 2 section of the License file that
3102.23 + * by Oracle in the GPL Version 2 section of the License file that
3102.24 * accompanied this code. If applicable, add the following below the
3102.25 * License Header, with the fields enclosed by brackets [] replaced by
3102.26 * your own identifying information:
3103.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/calendar/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3103.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/calendar/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3103.3 @@ -1,6 +1,9 @@
3103.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3103.5 #
3103.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3103.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3103.8 +#
3103.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3103.10 +# Other names may be trademarks of their respective owners.
3103.11 #
3103.12 # The contents of this file are subject to the terms of either the GNU
3103.13 # General Public License Version 2 only ("GPL") or the Common
3103.14 @@ -12,9 +15,9 @@
3103.15 # specific language governing permissions and limitations under the
3103.16 # License. When distributing the software, include this License Header
3103.17 # Notice in each file and include the License file at
3103.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3103.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3103.20 # particular file as subject to the "Classpath" exception as provided
3103.21 -# by Sun in the GPL Version 2 section of the License file that
3103.22 +# by Oracle in the GPL Version 2 section of the License file that
3103.23 # accompanied this code. If applicable, add the following below the
3103.24 # License Header, with the fields enclosed by brackets [] replaced by
3103.25 # your own identifying information:
3104.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/calendar/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3104.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/calendar/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3104.3 @@ -1,7 +1,10 @@
3104.4 /*
3104.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3104.6 *
3104.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3104.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3104.9 + *
3104.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3104.11 + * Other names may be trademarks of their respective owners.
3104.12 *
3104.13 * The contents of this file are subject to the terms of either the GNU
3104.14 * General Public License Version 2 only ("GPL") or the Common
3104.15 @@ -13,9 +16,9 @@
3104.16 * specific language governing permissions and limitations under the
3104.17 * License. When distributing the software, include this License Header
3104.18 * Notice in each file and include the License file at
3104.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3104.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3104.21 * particular file as subject to the "Classpath" exception as provided
3104.22 - * by Sun in the GPL Version 2 section of the License file that
3104.23 + * by Oracle in the GPL Version 2 section of the License file that
3104.24 * accompanied this code. If applicable, add the following below the
3104.25 * License Header, with the fields enclosed by brackets [] replaced by
3104.26 * your own identifying information:
3105.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/fileupload/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3105.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/fileupload/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3105.3 @@ -1,6 +1,9 @@
3105.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3105.5 #
3105.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3105.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3105.8 +#
3105.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3105.10 +# Other names may be trademarks of their respective owners.
3105.11 #
3105.12 # The contents of this file are subject to the terms of either the GNU
3105.13 # General Public License Version 2 only ("GPL") or the Common
3105.14 @@ -12,9 +15,9 @@
3105.15 # specific language governing permissions and limitations under the
3105.16 # License. When distributing the software, include this License Header
3105.17 # Notice in each file and include the License file at
3105.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3105.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3105.20 # particular file as subject to the "Classpath" exception as provided
3105.21 -# by Sun in the GPL Version 2 section of the License file that
3105.22 +# by Oracle in the GPL Version 2 section of the License file that
3105.23 # accompanied this code. If applicable, add the following below the
3105.24 # License Header, with the fields enclosed by brackets [] replaced by
3105.25 # your own identifying information:
3106.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/fileupload/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3106.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/fileupload/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3106.3 @@ -1,7 +1,10 @@
3106.4 /*
3106.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3106.6 *
3106.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3106.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3106.9 + *
3106.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3106.11 + * Other names may be trademarks of their respective owners.
3106.12 *
3106.13 * The contents of this file are subject to the terms of either the GNU
3106.14 * General Public License Version 2 only ("GPL") or the Common
3106.15 @@ -13,9 +16,9 @@
3106.16 * specific language governing permissions and limitations under the
3106.17 * License. When distributing the software, include this License Header
3106.18 * Notice in each file and include the License file at
3106.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3106.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3106.21 * particular file as subject to the "Classpath" exception as provided
3106.22 - * by Sun in the GPL Version 2 section of the License file that
3106.23 + * by Oracle in the GPL Version 2 section of the License file that
3106.24 * accompanied this code. If applicable, add the following below the
3106.25 * License Header, with the fields enclosed by brackets [] replaced by
3106.26 * your own identifying information:
3107.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/hiddenfield/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3107.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/hiddenfield/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3107.3 @@ -1,6 +1,9 @@
3107.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3107.5 #
3107.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3107.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3107.8 +#
3107.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3107.10 +# Other names may be trademarks of their respective owners.
3107.11 #
3107.12 # The contents of this file are subject to the terms of either the GNU
3107.13 # General Public License Version 2 only ("GPL") or the Common
3107.14 @@ -12,9 +15,9 @@
3107.15 # specific language governing permissions and limitations under the
3107.16 # License. When distributing the software, include this License Header
3107.17 # Notice in each file and include the License file at
3107.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3107.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3107.20 # particular file as subject to the "Classpath" exception as provided
3107.21 -# by Sun in the GPL Version 2 section of the License file that
3107.22 +# by Oracle in the GPL Version 2 section of the License file that
3107.23 # accompanied this code. If applicable, add the following below the
3107.24 # License Header, with the fields enclosed by brackets [] replaced by
3107.25 # your own identifying information:
3108.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/hiddenfield/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3108.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/hiddenfield/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3108.3 @@ -1,7 +1,10 @@
3108.4 /*
3108.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3108.6 *
3108.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3108.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3108.9 + *
3108.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3108.11 + * Other names may be trademarks of their respective owners.
3108.12 *
3108.13 * The contents of this file are subject to the terms of either the GNU
3108.14 * General Public License Version 2 only ("GPL") or the Common
3108.15 @@ -13,9 +16,9 @@
3108.16 * specific language governing permissions and limitations under the
3108.17 * License. When distributing the software, include this License Header
3108.18 * Notice in each file and include the License file at
3108.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3108.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3108.21 * particular file as subject to the "Classpath" exception as provided
3108.22 - * by Sun in the GPL Version 2 section of the License file that
3108.23 + * by Oracle in the GPL Version 2 section of the License file that
3108.24 * accompanied this code. If applicable, add the following below the
3108.25 * License Header, with the fields enclosed by brackets [] replaced by
3108.26 * your own identifying information:
3109.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/password/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3109.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/password/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3109.3 @@ -1,6 +1,9 @@
3109.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3109.5 #
3109.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3109.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3109.8 +#
3109.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3109.10 +# Other names may be trademarks of their respective owners.
3109.11 #
3109.12 # The contents of this file are subject to the terms of either the GNU
3109.13 # General Public License Version 2 only ("GPL") or the Common
3109.14 @@ -12,9 +15,9 @@
3109.15 # specific language governing permissions and limitations under the
3109.16 # License. When distributing the software, include this License Header
3109.17 # Notice in each file and include the License file at
3109.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3109.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3109.20 # particular file as subject to the "Classpath" exception as provided
3109.21 -# by Sun in the GPL Version 2 section of the License file that
3109.22 +# by Oracle in the GPL Version 2 section of the License file that
3109.23 # accompanied this code. If applicable, add the following below the
3109.24 # License Header, with the fields enclosed by brackets [] replaced by
3109.25 # your own identifying information:
3110.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/password/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3110.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/password/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3110.3 @@ -1,7 +1,10 @@
3110.4 /*
3110.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3110.6 *
3110.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3110.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3110.9 + *
3110.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3110.11 + * Other names may be trademarks of their respective owners.
3110.12 *
3110.13 * The contents of this file are subject to the terms of either the GNU
3110.14 * General Public License Version 2 only ("GPL") or the Common
3110.15 @@ -13,9 +16,9 @@
3110.16 * specific language governing permissions and limitations under the
3110.17 * License. When distributing the software, include this License Header
3110.18 * Notice in each file and include the License file at
3110.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3110.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3110.21 * particular file as subject to the "Classpath" exception as provided
3110.22 - * by Sun in the GPL Version 2 section of the License file that
3110.23 + * by Oracle in the GPL Version 2 section of the License file that
3110.24 * accompanied this code. If applicable, add the following below the
3110.25 * License Header, with the fields enclosed by brackets [] replaced by
3110.26 * your own identifying information:
3111.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdhiddenfield/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3111.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdhiddenfield/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3111.3 @@ -1,6 +1,9 @@
3111.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3111.5 #
3111.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3111.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3111.8 +#
3111.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3111.10 +# Other names may be trademarks of their respective owners.
3111.11 #
3111.12 # The contents of this file are subject to the terms of either the GNU
3111.13 # General Public License Version 2 only ("GPL") or the Common
3111.14 @@ -12,9 +15,9 @@
3111.15 # specific language governing permissions and limitations under the
3111.16 # License. When distributing the software, include this License Header
3111.17 # Notice in each file and include the License file at
3111.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3111.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3111.20 # particular file as subject to the "Classpath" exception as provided
3111.21 -# by Sun in the GPL Version 2 section of the License file that
3111.22 +# by Oracle in the GPL Version 2 section of the License file that
3111.23 # accompanied this code. If applicable, add the following below the
3111.24 # License Header, with the fields enclosed by brackets [] replaced by
3111.25 # your own identifying information:
3112.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdhiddenfield/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3112.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdhiddenfield/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3112.3 @@ -1,7 +1,10 @@
3112.4 /*
3112.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3112.6 *
3112.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3112.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3112.9 + *
3112.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3112.11 + * Other names may be trademarks of their respective owners.
3112.12 *
3112.13 * The contents of this file are subject to the terms of either the GNU
3112.14 * General Public License Version 2 only ("GPL") or the Common
3112.15 @@ -13,9 +16,9 @@
3112.16 * specific language governing permissions and limitations under the
3112.17 * License. When distributing the software, include this License Header
3112.18 * Notice in each file and include the License file at
3112.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3112.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3112.21 * particular file as subject to the "Classpath" exception as provided
3112.22 - * by Sun in the GPL Version 2 section of the License file that
3112.23 + * by Oracle in the GPL Version 2 section of the License file that
3112.24 * accompanied this code. If applicable, add the following below the
3112.25 * License Header, with the fields enclosed by brackets [] replaced by
3112.26 * your own identifying information:
3113.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdmultiline/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3113.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdmultiline/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3113.3 @@ -1,6 +1,9 @@
3113.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3113.5 #
3113.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3113.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3113.8 +#
3113.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3113.10 +# Other names may be trademarks of their respective owners.
3113.11 #
3113.12 # The contents of this file are subject to the terms of either the GNU
3113.13 # General Public License Version 2 only ("GPL") or the Common
3113.14 @@ -12,9 +15,9 @@
3113.15 # specific language governing permissions and limitations under the
3113.16 # License. When distributing the software, include this License Header
3113.17 # Notice in each file and include the License file at
3113.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3113.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3113.20 # particular file as subject to the "Classpath" exception as provided
3113.21 -# by Sun in the GPL Version 2 section of the License file that
3113.22 +# by Oracle in the GPL Version 2 section of the License file that
3113.23 # accompanied this code. If applicable, add the following below the
3113.24 # License Header, with the fields enclosed by brackets [] replaced by
3113.25 # your own identifying information:
3114.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdmultiline/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3114.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdmultiline/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3114.3 @@ -1,7 +1,10 @@
3114.4 /*
3114.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3114.6 *
3114.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3114.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3114.9 + *
3114.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3114.11 + * Other names may be trademarks of their respective owners.
3114.12 *
3114.13 * The contents of this file are subject to the terms of either the GNU
3114.14 * General Public License Version 2 only ("GPL") or the Common
3114.15 @@ -13,9 +16,9 @@
3114.16 * specific language governing permissions and limitations under the
3114.17 * License. When distributing the software, include this License Header
3114.18 * Notice in each file and include the License file at
3114.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3114.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3114.21 * particular file as subject to the "Classpath" exception as provided
3114.22 - * by Sun in the GPL Version 2 section of the License file that
3114.23 + * by Oracle in the GPL Version 2 section of the License file that
3114.24 * accompanied this code. If applicable, add the following below the
3114.25 * License Header, with the fields enclosed by brackets [] replaced by
3114.26 * your own identifying information:
3115.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdsecretfield/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3115.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdsecretfield/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3115.3 @@ -1,6 +1,9 @@
3115.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3115.5 #
3115.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3115.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3115.8 +#
3115.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3115.10 +# Other names may be trademarks of their respective owners.
3115.11 #
3115.12 # The contents of this file are subject to the terms of either the GNU
3115.13 # General Public License Version 2 only ("GPL") or the Common
3115.14 @@ -12,9 +15,9 @@
3115.15 # specific language governing permissions and limitations under the
3115.16 # License. When distributing the software, include this License Header
3115.17 # Notice in each file and include the License file at
3115.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3115.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3115.20 # particular file as subject to the "Classpath" exception as provided
3115.21 -# by Sun in the GPL Version 2 section of the License file that
3115.22 +# by Oracle in the GPL Version 2 section of the License file that
3115.23 # accompanied this code. If applicable, add the following below the
3115.24 # License Header, with the fields enclosed by brackets [] replaced by
3115.25 # your own identifying information:
3116.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdsecretfield/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3116.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdsecretfield/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3116.3 @@ -1,7 +1,10 @@
3116.4 /*
3116.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3116.6 *
3116.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3116.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3116.9 + *
3116.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3116.11 + * Other names may be trademarks of their respective owners.
3116.12 *
3116.13 * The contents of this file are subject to the terms of either the GNU
3116.14 * General Public License Version 2 only ("GPL") or the Common
3116.15 @@ -13,9 +16,9 @@
3116.16 * specific language governing permissions and limitations under the
3116.17 * License. When distributing the software, include this License Header
3116.18 * Notice in each file and include the License file at
3116.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3116.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3116.21 * particular file as subject to the "Classpath" exception as provided
3116.22 - * by Sun in the GPL Version 2 section of the License file that
3116.23 + * by Oracle in the GPL Version 2 section of the License file that
3116.24 * accompanied this code. If applicable, add the following below the
3116.25 * License Header, with the fields enclosed by brackets [] replaced by
3116.26 * your own identifying information:
3117.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdtextfield/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3117.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdtextfield/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3117.3 @@ -1,6 +1,9 @@
3117.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3117.5 #
3117.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3117.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3117.8 +#
3117.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3117.10 +# Other names may be trademarks of their respective owners.
3117.11 #
3117.12 # The contents of this file are subject to the terms of either the GNU
3117.13 # General Public License Version 2 only ("GPL") or the Common
3117.14 @@ -12,9 +15,9 @@
3117.15 # specific language governing permissions and limitations under the
3117.16 # License. When distributing the software, include this License Header
3117.17 # Notice in each file and include the License file at
3117.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3117.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3117.20 # particular file as subject to the "Classpath" exception as provided
3117.21 -# by Sun in the GPL Version 2 section of the License file that
3117.22 +# by Oracle in the GPL Version 2 section of the License file that
3117.23 # accompanied this code. If applicable, add the following below the
3117.24 # License Header, with the fields enclosed by brackets [] replaced by
3117.25 # your own identifying information:
3118.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdtextfield/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3118.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/stdtextfield/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3118.3 @@ -1,7 +1,10 @@
3118.4 /*
3118.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3118.6 *
3118.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3118.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3118.9 + *
3118.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3118.11 + * Other names may be trademarks of their respective owners.
3118.12 *
3118.13 * The contents of this file are subject to the terms of either the GNU
3118.14 * General Public License Version 2 only ("GPL") or the Common
3118.15 @@ -13,9 +16,9 @@
3118.16 * specific language governing permissions and limitations under the
3118.17 * License. When distributing the software, include this License Header
3118.18 * Notice in each file and include the License file at
3118.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3118.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3118.21 * particular file as subject to the "Classpath" exception as provided
3118.22 - * by Sun in the GPL Version 2 section of the License file that
3118.23 + * by Oracle in the GPL Version 2 section of the License file that
3118.24 * accompanied this code. If applicable, add the following below the
3118.25 * License Header, with the fields enclosed by brackets [] replaced by
3118.26 * your own identifying information:
3119.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/textarea/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3119.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/textarea/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3119.3 @@ -1,6 +1,9 @@
3119.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3119.5 #
3119.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3119.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3119.8 +#
3119.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3119.10 +# Other names may be trademarks of their respective owners.
3119.11 #
3119.12 # The contents of this file are subject to the terms of either the GNU
3119.13 # General Public License Version 2 only ("GPL") or the Common
3119.14 @@ -12,9 +15,9 @@
3119.15 # specific language governing permissions and limitations under the
3119.16 # License. When distributing the software, include this License Header
3119.17 # Notice in each file and include the License file at
3119.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3119.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3119.20 # particular file as subject to the "Classpath" exception as provided
3119.21 -# by Sun in the GPL Version 2 section of the License file that
3119.22 +# by Oracle in the GPL Version 2 section of the License file that
3119.23 # accompanied this code. If applicable, add the following below the
3119.24 # License Header, with the fields enclosed by brackets [] replaced by
3119.25 # your own identifying information:
3120.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/textarea/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3120.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/textarea/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3120.3 @@ -1,7 +1,10 @@
3120.4 /*
3120.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3120.6 *
3120.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3120.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3120.9 + *
3120.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3120.11 + * Other names may be trademarks of their respective owners.
3120.12 *
3120.13 * The contents of this file are subject to the terms of either the GNU
3120.14 * General Public License Version 2 only ("GPL") or the Common
3120.15 @@ -13,9 +16,9 @@
3120.16 * specific language governing permissions and limitations under the
3120.17 * License. When distributing the software, include this License Header
3120.18 * Notice in each file and include the License file at
3120.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3120.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3120.21 * particular file as subject to the "Classpath" exception as provided
3120.22 - * by Sun in the GPL Version 2 section of the License file that
3120.23 + * by Oracle in the GPL Version 2 section of the License file that
3120.24 * accompanied this code. If applicable, add the following below the
3120.25 * License Header, with the fields enclosed by brackets [] replaced by
3120.26 * your own identifying information:
3121.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/textfield/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3121.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/textfield/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3121.3 @@ -1,6 +1,9 @@
3121.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3121.5 #
3121.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3121.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3121.8 +#
3121.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3121.10 +# Other names may be trademarks of their respective owners.
3121.11 #
3121.12 # The contents of this file are subject to the terms of either the GNU
3121.13 # General Public License Version 2 only ("GPL") or the Common
3121.14 @@ -12,9 +15,9 @@
3121.15 # specific language governing permissions and limitations under the
3121.16 # License. When distributing the software, include this License Header
3121.17 # Notice in each file and include the License file at
3121.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3121.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3121.20 # particular file as subject to the "Classpath" exception as provided
3121.21 -# by Sun in the GPL Version 2 section of the License file that
3121.22 +# by Oracle in the GPL Version 2 section of the License file that
3121.23 # accompanied this code. If applicable, add the following below the
3121.24 # License Header, with the fields enclosed by brackets [] replaced by
3121.25 # your own identifying information:
3122.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/textfield/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3122.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/input/textfield/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3122.3 @@ -1,7 +1,10 @@
3122.4 /*
3122.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3122.6 *
3122.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3122.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3122.9 + *
3122.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3122.11 + * Other names may be trademarks of their respective owners.
3122.12 *
3122.13 * The contents of this file are subject to the terms of either the GNU
3122.14 * General Public License Version 2 only ("GPL") or the Common
3122.15 @@ -13,9 +16,9 @@
3122.16 * specific language governing permissions and limitations under the
3122.17 * License. When distributing the software, include this License Header
3122.18 * Notice in each file and include the License file at
3122.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3122.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3122.21 * particular file as subject to the "Classpath" exception as provided
3122.22 - * by Sun in the GPL Version 2 section of the License file that
3122.23 + * by Oracle in the GPL Version 2 section of the License file that
3122.24 * accompanied this code. If applicable, add the following below the
3122.25 * License Header, with the fields enclosed by brackets [] replaced by
3122.26 * your own identifying information:
3123.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/commontasks/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3123.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/commontasks/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3123.3 @@ -1,6 +1,9 @@
3123.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3123.5 #
3123.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3123.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3123.8 +#
3123.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3123.10 +# Other names may be trademarks of their respective owners.
3123.11 #
3123.12 # The contents of this file are subject to the terms of either the GNU
3123.13 # General Public License Version 2 only ("GPL") or the Common
3123.14 @@ -12,9 +15,9 @@
3123.15 # specific language governing permissions and limitations under the
3123.16 # License. When distributing the software, include this License Header
3123.17 # Notice in each file and include the License file at
3123.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3123.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3123.20 # particular file as subject to the "Classpath" exception as provided
3123.21 -# by Sun in the GPL Version 2 section of the License file that
3123.22 +# by Oracle in the GPL Version 2 section of the License file that
3123.23 # accompanied this code. If applicable, add the following below the
3123.24 # License Header, with the fields enclosed by brackets [] replaced by
3123.25 # your own identifying information:
3124.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/commontasks/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3124.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/commontasks/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3124.3 @@ -1,7 +1,10 @@
3124.4 /*
3124.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3124.6 *
3124.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3124.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3124.9 + *
3124.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3124.11 + * Other names may be trademarks of their respective owners.
3124.12 *
3124.13 * The contents of this file are subject to the terms of either the GNU
3124.14 * General Public License Version 2 only ("GPL") or the Common
3124.15 @@ -13,9 +16,9 @@
3124.16 * specific language governing permissions and limitations under the
3124.17 * License. When distributing the software, include this License Header
3124.18 * Notice in each file and include the License file at
3124.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3124.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3124.21 * particular file as subject to the "Classpath" exception as provided
3124.22 - * by Sun in the GPL Version 2 section of the License file that
3124.23 + * by Oracle in the GPL Version 2 section of the License file that
3124.24 * accompanied this code. If applicable, add the following below the
3124.25 * License Header, with the fields enclosed by brackets [] replaced by
3124.26 * your own identifying information:
3125.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/form/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3125.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/form/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3125.3 @@ -1,6 +1,9 @@
3125.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3125.5 #
3125.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3125.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3125.8 +#
3125.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3125.10 +# Other names may be trademarks of their respective owners.
3125.11 #
3125.12 # The contents of this file are subject to the terms of either the GNU
3125.13 # General Public License Version 2 only ("GPL") or the Common
3125.14 @@ -12,9 +15,9 @@
3125.15 # specific language governing permissions and limitations under the
3125.16 # License. When distributing the software, include this License Header
3125.17 # Notice in each file and include the License file at
3125.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3125.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3125.20 # particular file as subject to the "Classpath" exception as provided
3125.21 -# by Sun in the GPL Version 2 section of the License file that
3125.22 +# by Oracle in the GPL Version 2 section of the License file that
3125.23 # accompanied this code. If applicable, add the following below the
3125.24 # License Header, with the fields enclosed by brackets [] replaced by
3125.25 # your own identifying information:
3126.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/form/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3126.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/form/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3126.3 @@ -1,7 +1,10 @@
3126.4 /*
3126.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3126.6 *
3126.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3126.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3126.9 + *
3126.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3126.11 + * Other names may be trademarks of their respective owners.
3126.12 *
3126.13 * The contents of this file are subject to the terms of either the GNU
3126.14 * General Public License Version 2 only ("GPL") or the Common
3126.15 @@ -13,9 +16,9 @@
3126.16 * specific language governing permissions and limitations under the
3126.17 * License. When distributing the software, include this License Header
3126.18 * Notice in each file and include the License file at
3126.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3126.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3126.21 * particular file as subject to the "Classpath" exception as provided
3126.22 - * by Sun in the GPL Version 2 section of the License file that
3126.23 + * by Oracle in the GPL Version 2 section of the License file that
3126.24 * accompanied this code. If applicable, add the following below the
3126.25 * License Header, with the fields enclosed by brackets [] replaced by
3126.26 * your own identifying information:
3127.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/gridpanel/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3127.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/gridpanel/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3127.3 @@ -1,6 +1,9 @@
3127.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3127.5 #
3127.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3127.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3127.8 +#
3127.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3127.10 +# Other names may be trademarks of their respective owners.
3127.11 #
3127.12 # The contents of this file are subject to the terms of either the GNU
3127.13 # General Public License Version 2 only ("GPL") or the Common
3127.14 @@ -12,9 +15,9 @@
3127.15 # specific language governing permissions and limitations under the
3127.16 # License. When distributing the software, include this License Header
3127.17 # Notice in each file and include the License file at
3127.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3127.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3127.20 # particular file as subject to the "Classpath" exception as provided
3127.21 -# by Sun in the GPL Version 2 section of the License file that
3127.22 +# by Oracle in the GPL Version 2 section of the License file that
3127.23 # accompanied this code. If applicable, add the following below the
3127.24 # License Header, with the fields enclosed by brackets [] replaced by
3127.25 # your own identifying information:
3128.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/gridpanel/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3128.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/gridpanel/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3128.3 @@ -1,7 +1,10 @@
3128.4 /*
3128.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3128.6 *
3128.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3128.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3128.9 + *
3128.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3128.11 + * Other names may be trademarks of their respective owners.
3128.12 *
3128.13 * The contents of this file are subject to the terms of either the GNU
3128.14 * General Public License Version 2 only ("GPL") or the Common
3128.15 @@ -13,9 +16,9 @@
3128.16 * specific language governing permissions and limitations under the
3128.17 * License. When distributing the software, include this License Header
3128.18 * Notice in each file and include the License file at
3128.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3128.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3128.21 * particular file as subject to the "Classpath" exception as provided
3128.22 - * by Sun in the GPL Version 2 section of the License file that
3128.23 + * by Oracle in the GPL Version 2 section of the License file that
3128.24 * accompanied this code. If applicable, add the following below the
3128.25 * License Header, with the fields enclosed by brackets [] replaced by
3128.26 * your own identifying information:
3129.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/grouppanel/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3129.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/grouppanel/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3129.3 @@ -1,6 +1,9 @@
3129.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3129.5 #
3129.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3129.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3129.8 +#
3129.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3129.10 +# Other names may be trademarks of their respective owners.
3129.11 #
3129.12 # The contents of this file are subject to the terms of either the GNU
3129.13 # General Public License Version 2 only ("GPL") or the Common
3129.14 @@ -12,9 +15,9 @@
3129.15 # specific language governing permissions and limitations under the
3129.16 # License. When distributing the software, include this License Header
3129.17 # Notice in each file and include the License file at
3129.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3129.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3129.20 # particular file as subject to the "Classpath" exception as provided
3129.21 -# by Sun in the GPL Version 2 section of the License file that
3129.22 +# by Oracle in the GPL Version 2 section of the License file that
3129.23 # accompanied this code. If applicable, add the following below the
3129.24 # License Header, with the fields enclosed by brackets [] replaced by
3129.25 # your own identifying information:
3130.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/grouppanel/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3130.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/grouppanel/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3130.3 @@ -1,7 +1,10 @@
3130.4 /*
3130.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3130.6 *
3130.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3130.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3130.9 + *
3130.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3130.11 + * Other names may be trademarks of their respective owners.
3130.12 *
3130.13 * The contents of this file are subject to the terms of either the GNU
3130.14 * General Public License Version 2 only ("GPL") or the Common
3130.15 @@ -13,9 +16,9 @@
3130.16 * specific language governing permissions and limitations under the
3130.17 * License. When distributing the software, include this License Header
3130.18 * Notice in each file and include the License file at
3130.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3130.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3130.21 * particular file as subject to the "Classpath" exception as provided
3130.22 - * by Sun in the GPL Version 2 section of the License file that
3130.23 + * by Oracle in the GPL Version 2 section of the License file that
3130.24 * accompanied this code. If applicable, add the following below the
3130.25 * License Header, with the fields enclosed by brackets [] replaced by
3130.26 * your own identifying information:
3131.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/layoutpanel/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3131.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/layoutpanel/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3131.3 @@ -1,6 +1,9 @@
3131.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3131.5 #
3131.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3131.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3131.8 +#
3131.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3131.10 +# Other names may be trademarks of their respective owners.
3131.11 #
3131.12 # The contents of this file are subject to the terms of either the GNU
3131.13 # General Public License Version 2 only ("GPL") or the Common
3131.14 @@ -12,9 +15,9 @@
3131.15 # specific language governing permissions and limitations under the
3131.16 # License. When distributing the software, include this License Header
3131.17 # Notice in each file and include the License file at
3131.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3131.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3131.20 # particular file as subject to the "Classpath" exception as provided
3131.21 -# by Sun in the GPL Version 2 section of the License file that
3131.22 +# by Oracle in the GPL Version 2 section of the License file that
3131.23 # accompanied this code. If applicable, add the following below the
3131.24 # License Header, with the fields enclosed by brackets [] replaced by
3131.25 # your own identifying information:
3132.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/layoutpanel/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3132.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/layoutpanel/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3132.3 @@ -1,7 +1,10 @@
3132.4 /*
3132.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3132.6 *
3132.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3132.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3132.9 + *
3132.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3132.11 + * Other names may be trademarks of their respective owners.
3132.12 *
3132.13 * The contents of this file are subject to the terms of either the GNU
3132.14 * General Public License Version 2 only ("GPL") or the Common
3132.15 @@ -13,9 +16,9 @@
3132.16 * specific language governing permissions and limitations under the
3132.17 * License. When distributing the software, include this License Header
3132.18 * Notice in each file and include the License file at
3132.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3132.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3132.21 * particular file as subject to the "Classpath" exception as provided
3132.22 - * by Sun in the GPL Version 2 section of the License file that
3132.23 + * by Oracle in the GPL Version 2 section of the License file that
3132.24 * accompanied this code. If applicable, add the following below the
3132.25 * License Header, with the fields enclosed by brackets [] replaced by
3132.26 * your own identifying information:
3133.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/pagefragment/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3133.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/pagefragment/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3133.3 @@ -1,6 +1,9 @@
3133.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3133.5 #
3133.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3133.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3133.8 +#
3133.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3133.10 +# Other names may be trademarks of their respective owners.
3133.11 #
3133.12 # The contents of this file are subject to the terms of either the GNU
3133.13 # General Public License Version 2 only ("GPL") or the Common
3133.14 @@ -12,9 +15,9 @@
3133.15 # specific language governing permissions and limitations under the
3133.16 # License. When distributing the software, include this License Header
3133.17 # Notice in each file and include the License file at
3133.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3133.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3133.20 # particular file as subject to the "Classpath" exception as provided
3133.21 -# by Sun in the GPL Version 2 section of the License file that
3133.22 +# by Oracle in the GPL Version 2 section of the License file that
3133.23 # accompanied this code. If applicable, add the following below the
3133.24 # License Header, with the fields enclosed by brackets [] replaced by
3133.25 # your own identifying information:
3134.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/pagefragment/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3134.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/pagefragment/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3134.3 @@ -1,7 +1,10 @@
3134.4 /*
3134.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3134.6 *
3134.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3134.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3134.9 + *
3134.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3134.11 + * Other names may be trademarks of their respective owners.
3134.12 *
3134.13 * The contents of this file are subject to the terms of either the GNU
3134.14 * General Public License Version 2 only ("GPL") or the Common
3134.15 @@ -13,9 +16,9 @@
3134.16 * specific language governing permissions and limitations under the
3134.17 * License. When distributing the software, include this License Header
3134.18 * Notice in each file and include the License file at
3134.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3134.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3134.21 * particular file as subject to the "Classpath" exception as provided
3134.22 - * by Sun in the GPL Version 2 section of the License file that
3134.23 + * by Oracle in the GPL Version 2 section of the License file that
3134.24 * accompanied this code. If applicable, add the following below the
3134.25 * License Header, with the fields enclosed by brackets [] replaced by
3134.26 * your own identifying information:
3135.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/pageseparator/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3135.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/pageseparator/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3135.3 @@ -1,6 +1,9 @@
3135.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3135.5 #
3135.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3135.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3135.8 +#
3135.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3135.10 +# Other names may be trademarks of their respective owners.
3135.11 #
3135.12 # The contents of this file are subject to the terms of either the GNU
3135.13 # General Public License Version 2 only ("GPL") or the Common
3135.14 @@ -12,9 +15,9 @@
3135.15 # specific language governing permissions and limitations under the
3135.16 # License. When distributing the software, include this License Header
3135.17 # Notice in each file and include the License file at
3135.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3135.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3135.20 # particular file as subject to the "Classpath" exception as provided
3135.21 -# by Sun in the GPL Version 2 section of the License file that
3135.22 +# by Oracle in the GPL Version 2 section of the License file that
3135.23 # accompanied this code. If applicable, add the following below the
3135.24 # License Header, with the fields enclosed by brackets [] replaced by
3135.25 # your own identifying information:
3136.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/pageseparator/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3136.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/pageseparator/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3136.3 @@ -1,7 +1,10 @@
3136.4 /*
3136.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3136.6 *
3136.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3136.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3136.9 + *
3136.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3136.11 + * Other names may be trademarks of their respective owners.
3136.12 *
3136.13 * The contents of this file are subject to the terms of either the GNU
3136.14 * General Public License Version 2 only ("GPL") or the Common
3136.15 @@ -13,9 +16,9 @@
3136.16 * specific language governing permissions and limitations under the
3136.17 * License. When distributing the software, include this License Header
3136.18 * Notice in each file and include the License file at
3136.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3136.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3136.21 * particular file as subject to the "Classpath" exception as provided
3136.22 - * by Sun in the GPL Version 2 section of the License file that
3136.23 + * by Oracle in the GPL Version 2 section of the License file that
3136.24 * accompanied this code. If applicable, add the following below the
3136.25 * License Header, with the fields enclosed by brackets [] replaced by
3136.26 * your own identifying information:
3137.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/propertysheet/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3137.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/propertysheet/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3137.3 @@ -1,6 +1,9 @@
3137.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3137.5 #
3137.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3137.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3137.8 +#
3137.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3137.10 +# Other names may be trademarks of their respective owners.
3137.11 #
3137.12 # The contents of this file are subject to the terms of either the GNU
3137.13 # General Public License Version 2 only ("GPL") or the Common
3137.14 @@ -12,9 +15,9 @@
3137.15 # specific language governing permissions and limitations under the
3137.16 # License. When distributing the software, include this License Header
3137.17 # Notice in each file and include the License file at
3137.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3137.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3137.20 # particular file as subject to the "Classpath" exception as provided
3137.21 -# by Sun in the GPL Version 2 section of the License file that
3137.22 +# by Oracle in the GPL Version 2 section of the License file that
3137.23 # accompanied this code. If applicable, add the following below the
3137.24 # License Header, with the fields enclosed by brackets [] replaced by
3137.25 # your own identifying information:
3138.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/propertysheet/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3138.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/propertysheet/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3138.3 @@ -1,7 +1,10 @@
3138.4 /*
3138.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3138.6 *
3138.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3138.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3138.9 + *
3138.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3138.11 + * Other names may be trademarks of their respective owners.
3138.12 *
3138.13 * The contents of this file are subject to the terms of either the GNU
3138.14 * General Public License Version 2 only ("GPL") or the Common
3138.15 @@ -13,9 +16,9 @@
3138.16 * specific language governing permissions and limitations under the
3138.17 * License. When distributing the software, include this License Header
3138.18 * Notice in each file and include the License file at
3138.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3138.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3138.21 * particular file as subject to the "Classpath" exception as provided
3138.22 - * by Sun in the GPL Version 2 section of the License file that
3138.23 + * by Oracle in the GPL Version 2 section of the License file that
3138.24 * accompanied this code. If applicable, add the following below the
3138.25 * License Header, with the fields enclosed by brackets [] replaced by
3138.26 * your own identifying information:
3139.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdform/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3139.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdform/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3139.3 @@ -1,6 +1,9 @@
3139.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3139.5 #
3139.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3139.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3139.8 +#
3139.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3139.10 +# Other names may be trademarks of their respective owners.
3139.11 #
3139.12 # The contents of this file are subject to the terms of either the GNU
3139.13 # General Public License Version 2 only ("GPL") or the Common
3139.14 @@ -12,9 +15,9 @@
3139.15 # specific language governing permissions and limitations under the
3139.16 # License. When distributing the software, include this License Header
3139.17 # Notice in each file and include the License file at
3139.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3139.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3139.20 # particular file as subject to the "Classpath" exception as provided
3139.21 -# by Sun in the GPL Version 2 section of the License file that
3139.22 +# by Oracle in the GPL Version 2 section of the License file that
3139.23 # accompanied this code. If applicable, add the following below the
3139.24 # License Header, with the fields enclosed by brackets [] replaced by
3139.25 # your own identifying information:
3140.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdform/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3140.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdform/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3140.3 @@ -1,7 +1,10 @@
3140.4 /*
3140.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3140.6 *
3140.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3140.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3140.9 + *
3140.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3140.11 + * Other names may be trademarks of their respective owners.
3140.12 *
3140.13 * The contents of this file are subject to the terms of either the GNU
3140.14 * General Public License Version 2 only ("GPL") or the Common
3140.15 @@ -13,9 +16,9 @@
3140.16 * specific language governing permissions and limitations under the
3140.17 * License. When distributing the software, include this License Header
3140.18 * Notice in each file and include the License file at
3140.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3140.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3140.21 * particular file as subject to the "Classpath" exception as provided
3140.22 - * by Sun in the GPL Version 2 section of the License file that
3140.23 + * by Oracle in the GPL Version 2 section of the License file that
3140.24 * accompanied this code. If applicable, add the following below the
3140.25 * License Header, with the fields enclosed by brackets [] replaced by
3140.26 * your own identifying information:
3141.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdgridpanel/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3141.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdgridpanel/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3141.3 @@ -1,6 +1,9 @@
3141.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3141.5 #
3141.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3141.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3141.8 +#
3141.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3141.10 +# Other names may be trademarks of their respective owners.
3141.11 #
3141.12 # The contents of this file are subject to the terms of either the GNU
3141.13 # General Public License Version 2 only ("GPL") or the Common
3141.14 @@ -12,9 +15,9 @@
3141.15 # specific language governing permissions and limitations under the
3141.16 # License. When distributing the software, include this License Header
3141.17 # Notice in each file and include the License file at
3141.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3141.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3141.20 # particular file as subject to the "Classpath" exception as provided
3141.21 -# by Sun in the GPL Version 2 section of the License file that
3141.22 +# by Oracle in the GPL Version 2 section of the License file that
3141.23 # accompanied this code. If applicable, add the following below the
3141.24 # License Header, with the fields enclosed by brackets [] replaced by
3141.25 # your own identifying information:
3142.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdgridpanel/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3142.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdgridpanel/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3142.3 @@ -1,7 +1,10 @@
3142.4 /*
3142.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3142.6 *
3142.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3142.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3142.9 + *
3142.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3142.11 + * Other names may be trademarks of their respective owners.
3142.12 *
3142.13 * The contents of this file are subject to the terms of either the GNU
3142.14 * General Public License Version 2 only ("GPL") or the Common
3142.15 @@ -13,9 +16,9 @@
3142.16 * specific language governing permissions and limitations under the
3142.17 * License. When distributing the software, include this License Header
3142.18 * Notice in each file and include the License file at
3142.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3142.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3142.21 * particular file as subject to the "Classpath" exception as provided
3142.22 - * by Sun in the GPL Version 2 section of the License file that
3142.23 + * by Oracle in the GPL Version 2 section of the License file that
3142.24 * accompanied this code. If applicable, add the following below the
3142.25 * License Header, with the fields enclosed by brackets [] replaced by
3142.26 * your own identifying information:
3143.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdgrouppanel/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3143.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdgrouppanel/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3143.3 @@ -1,6 +1,9 @@
3143.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3143.5 #
3143.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3143.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3143.8 +#
3143.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3143.10 +# Other names may be trademarks of their respective owners.
3143.11 #
3143.12 # The contents of this file are subject to the terms of either the GNU
3143.13 # General Public License Version 2 only ("GPL") or the Common
3143.14 @@ -12,9 +15,9 @@
3143.15 # specific language governing permissions and limitations under the
3143.16 # License. When distributing the software, include this License Header
3143.17 # Notice in each file and include the License file at
3143.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3143.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3143.20 # particular file as subject to the "Classpath" exception as provided
3143.21 -# by Sun in the GPL Version 2 section of the License file that
3143.22 +# by Oracle in the GPL Version 2 section of the License file that
3143.23 # accompanied this code. If applicable, add the following below the
3143.24 # License Header, with the fields enclosed by brackets [] replaced by
3143.25 # your own identifying information:
3144.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdgrouppanel/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3144.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/stdgrouppanel/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3144.3 @@ -1,7 +1,10 @@
3144.4 /*
3144.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3144.6 *
3144.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3144.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3144.9 + *
3144.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3144.11 + * Other names may be trademarks of their respective owners.
3144.12 *
3144.13 * The contents of this file are subject to the terms of either the GNU
3144.14 * General Public License Version 2 only ("GPL") or the Common
3144.15 @@ -13,9 +16,9 @@
3144.16 * specific language governing permissions and limitations under the
3144.17 * License. When distributing the software, include this License Header
3144.18 * Notice in each file and include the License file at
3144.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3144.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3144.21 * particular file as subject to the "Classpath" exception as provided
3144.22 - * by Sun in the GPL Version 2 section of the License file that
3144.23 + * by Oracle in the GPL Version 2 section of the License file that
3144.24 * accompanied this code. If applicable, add the following below the
3144.25 * License Header, with the fields enclosed by brackets [] replaced by
3144.26 * your own identifying information:
3145.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/tabset/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3145.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/tabset/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3145.3 @@ -1,6 +1,9 @@
3145.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3145.5 #
3145.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3145.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3145.8 +#
3145.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3145.10 +# Other names may be trademarks of their respective owners.
3145.11 #
3145.12 # The contents of this file are subject to the terms of either the GNU
3145.13 # General Public License Version 2 only ("GPL") or the Common
3145.14 @@ -12,9 +15,9 @@
3145.15 # specific language governing permissions and limitations under the
3145.16 # License. When distributing the software, include this License Header
3145.17 # Notice in each file and include the License file at
3145.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3145.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3145.20 # particular file as subject to the "Classpath" exception as provided
3145.21 -# by Sun in the GPL Version 2 section of the License file that
3145.22 +# by Oracle in the GPL Version 2 section of the License file that
3145.23 # accompanied this code. If applicable, add the following below the
3145.24 # License Header, with the fields enclosed by brackets [] replaced by
3145.25 # your own identifying information:
3146.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/tabset/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3146.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/tabset/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3146.3 @@ -1,7 +1,10 @@
3146.4 /*
3146.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3146.6 *
3146.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3146.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3146.9 + *
3146.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3146.11 + * Other names may be trademarks of their respective owners.
3146.12 *
3146.13 * The contents of this file are subject to the terms of either the GNU
3146.14 * General Public License Version 2 only ("GPL") or the Common
3146.15 @@ -13,9 +16,9 @@
3146.16 * specific language governing permissions and limitations under the
3146.17 * License. When distributing the software, include this License Header
3146.18 * Notice in each file and include the License file at
3146.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3146.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3146.21 * particular file as subject to the "Classpath" exception as provided
3146.22 - * by Sun in the GPL Version 2 section of the License file that
3146.23 + * by Oracle in the GPL Version 2 section of the License file that
3146.24 * accompanied this code. If applicable, add the following below the
3146.25 * License Header, with the fields enclosed by brackets [] replaced by
3146.26 * your own identifying information:
3147.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/virtualform/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3147.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/virtualform/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3147.3 @@ -1,6 +1,9 @@
3147.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3147.5 #
3147.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3147.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3147.8 +#
3147.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3147.10 +# Other names may be trademarks of their respective owners.
3147.11 #
3147.12 # The contents of this file are subject to the terms of either the GNU
3147.13 # General Public License Version 2 only ("GPL") or the Common
3147.14 @@ -12,9 +15,9 @@
3147.15 # specific language governing permissions and limitations under the
3147.16 # License. When distributing the software, include this License Header
3147.17 # Notice in each file and include the License file at
3147.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3147.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3147.20 # particular file as subject to the "Classpath" exception as provided
3147.21 -# by Sun in the GPL Version 2 section of the License file that
3147.22 +# by Oracle in the GPL Version 2 section of the License file that
3147.23 # accompanied this code. If applicable, add the following below the
3147.24 # License Header, with the fields enclosed by brackets [] replaced by
3147.25 # your own identifying information:
3148.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/virtualform/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3148.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/layout/virtualform/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3148.3 @@ -1,7 +1,10 @@
3148.4 /*
3148.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3148.6 *
3148.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3148.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3148.9 + *
3148.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3148.11 + * Other names may be trademarks of their respective owners.
3148.12 *
3148.13 * The contents of this file are subject to the terms of either the GNU
3148.14 * General Public License Version 2 only ("GPL") or the Common
3148.15 @@ -13,9 +16,9 @@
3148.16 * specific language governing permissions and limitations under the
3148.17 * License. When distributing the software, include this License Header
3148.18 * Notice in each file and include the License file at
3148.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3148.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3148.21 * particular file as subject to the "Classpath" exception as provided
3148.22 - * by Sun in the GPL Version 2 section of the License file that
3148.23 + * by Oracle in the GPL Version 2 section of the License file that
3148.24 * accompanied this code. If applicable, add the following below the
3148.25 * License Header, with the fields enclosed by brackets [] replaced by
3148.26 * your own identifying information:
3149.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/alert/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3149.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/alert/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3149.3 @@ -1,7 +1,10 @@
3149.4 /*
3149.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3149.6 *
3149.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3149.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3149.9 + *
3149.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3149.11 + * Other names may be trademarks of their respective owners.
3149.12 *
3149.13 * The contents of this file are subject to the terms of either the GNU
3149.14 * General Public License Version 2 only ("GPL") or the Common
3149.15 @@ -13,9 +16,9 @@
3149.16 * specific language governing permissions and limitations under the
3149.17 * License. When distributing the software, include this License Header
3149.18 * Notice in each file and include the License file at
3149.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3149.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3149.21 * particular file as subject to the "Classpath" exception as provided
3149.22 - * by Sun in the GPL Version 2 section of the License file that
3149.23 + * by Oracle in the GPL Version 2 section of the License file that
3149.24 * accompanied this code. If applicable, add the following below the
3149.25 * License Header, with the fields enclosed by brackets [] replaced by
3149.26 * your own identifying information:
3150.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/anchor/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3150.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/anchor/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3150.3 @@ -1,7 +1,10 @@
3150.4 /*
3150.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3150.6 *
3150.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3150.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3150.9 + *
3150.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3150.11 + * Other names may be trademarks of their respective owners.
3150.12 *
3150.13 * The contents of this file are subject to the terms of either the GNU
3150.14 * General Public License Version 2 only ("GPL") or the Common
3150.15 @@ -13,9 +16,9 @@
3150.16 * specific language governing permissions and limitations under the
3150.17 * License. When distributing the software, include this License Header
3150.18 * Notice in each file and include the License file at
3150.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3150.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3150.21 * particular file as subject to the "Classpath" exception as provided
3150.22 - * by Sun in the GPL Version 2 section of the License file that
3150.23 + * by Oracle in the GPL Version 2 section of the License file that
3150.24 * accompanied this code. If applicable, add the following below the
3150.25 * License Header, with the fields enclosed by brackets [] replaced by
3150.26 * your own identifying information:
3151.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/inlinehelp/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3151.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/inlinehelp/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3151.3 @@ -1,7 +1,10 @@
3151.4 /*
3151.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3151.6 *
3151.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3151.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3151.9 + *
3151.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3151.11 + * Other names may be trademarks of their respective owners.
3151.12 *
3151.13 * The contents of this file are subject to the terms of either the GNU
3151.14 * General Public License Version 2 only ("GPL") or the Common
3151.15 @@ -13,9 +16,9 @@
3151.16 * specific language governing permissions and limitations under the
3151.17 * License. When distributing the software, include this License Header
3151.18 * Notice in each file and include the License file at
3151.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3151.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3151.21 * particular file as subject to the "Classpath" exception as provided
3151.22 - * by Sun in the GPL Version 2 section of the License file that
3151.23 + * by Oracle in the GPL Version 2 section of the License file that
3151.24 * accompanied this code. If applicable, add the following below the
3151.25 * License Header, with the fields enclosed by brackets [] replaced by
3151.26 * your own identifying information:
3152.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/label/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3152.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/label/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3152.3 @@ -1,7 +1,10 @@
3152.4 /*
3152.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3152.6 *
3152.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3152.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3152.9 + *
3152.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3152.11 + * Other names may be trademarks of their respective owners.
3152.12 *
3152.13 * The contents of this file are subject to the terms of either the GNU
3152.14 * General Public License Version 2 only ("GPL") or the Common
3152.15 @@ -13,9 +16,9 @@
3152.16 * specific language governing permissions and limitations under the
3152.17 * License. When distributing the software, include this License Header
3152.18 * Notice in each file and include the License file at
3152.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3152.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3152.21 * particular file as subject to the "Classpath" exception as provided
3152.22 - * by Sun in the GPL Version 2 section of the License file that
3152.23 + * by Oracle in the GPL Version 2 section of the License file that
3152.24 * accompanied this code. If applicable, add the following below the
3152.25 * License Header, with the fields enclosed by brackets [] replaced by
3152.26 * your own identifying information:
3153.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/message/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3153.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/message/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3153.3 @@ -1,7 +1,10 @@
3153.4 /*
3153.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3153.6 *
3153.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3153.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3153.9 + *
3153.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3153.11 + * Other names may be trademarks of their respective owners.
3153.12 *
3153.13 * The contents of this file are subject to the terms of either the GNU
3153.14 * General Public License Version 2 only ("GPL") or the Common
3153.15 @@ -13,9 +16,9 @@
3153.16 * specific language governing permissions and limitations under the
3153.17 * License. When distributing the software, include this License Header
3153.18 * Notice in each file and include the License file at
3153.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3153.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3153.21 * particular file as subject to the "Classpath" exception as provided
3153.22 - * by Sun in the GPL Version 2 section of the License file that
3153.23 + * by Oracle in the GPL Version 2 section of the License file that
3153.24 * accompanied this code. If applicable, add the following below the
3153.25 * License Header, with the fields enclosed by brackets [] replaced by
3153.26 * your own identifying information:
3154.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/messagegroup/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3154.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/messagegroup/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3154.3 @@ -1,7 +1,10 @@
3154.4 /*
3154.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3154.6 *
3154.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3154.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3154.9 + *
3154.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3154.11 + * Other names may be trademarks of their respective owners.
3154.12 *
3154.13 * The contents of this file are subject to the terms of either the GNU
3154.14 * General Public License Version 2 only ("GPL") or the Common
3154.15 @@ -13,9 +16,9 @@
3154.16 * specific language governing permissions and limitations under the
3154.17 * License. When distributing the software, include this License Header
3154.18 * Notice in each file and include the License file at
3154.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3154.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3154.21 * particular file as subject to the "Classpath" exception as provided
3154.22 - * by Sun in the GPL Version 2 section of the License file that
3154.23 + * by Oracle in the GPL Version 2 section of the License file that
3154.24 * accompanied this code. If applicable, add the following below the
3154.25 * License Header, with the fields enclosed by brackets [] replaced by
3154.26 * your own identifying information:
3155.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/pagealert/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3155.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/pagealert/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3155.3 @@ -1,7 +1,10 @@
3155.4 /*
3155.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3155.6 *
3155.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3155.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3155.9 + *
3155.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3155.11 + * Other names may be trademarks of their respective owners.
3155.12 *
3155.13 * The contents of this file are subject to the terms of either the GNU
3155.14 * General Public License Version 2 only ("GPL") or the Common
3155.15 @@ -13,9 +16,9 @@
3155.16 * specific language governing permissions and limitations under the
3155.17 * License. When distributing the software, include this License Header
3155.18 * Notice in each file and include the License file at
3155.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3155.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3155.21 * particular file as subject to the "Classpath" exception as provided
3155.22 - * by Sun in the GPL Version 2 section of the License file that
3155.23 + * by Oracle in the GPL Version 2 section of the License file that
3155.24 * accompanied this code. If applicable, add the following below the
3155.25 * License Header, with the fields enclosed by brackets [] replaced by
3155.26 * your own identifying information:
3156.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/statictext/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3156.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/statictext/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3156.3 @@ -1,7 +1,10 @@
3156.4 /*
3156.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3156.6 *
3156.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3156.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3156.9 + *
3156.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3156.11 + * Other names may be trademarks of their respective owners.
3156.12 *
3156.13 * The contents of this file are subject to the terms of either the GNU
3156.14 * General Public License Version 2 only ("GPL") or the Common
3156.15 @@ -13,9 +16,9 @@
3156.16 * specific language governing permissions and limitations under the
3156.17 * License. When distributing the software, include this License Header
3156.18 * Notice in each file and include the License file at
3156.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3156.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3156.21 * particular file as subject to the "Classpath" exception as provided
3156.22 - * by Sun in the GPL Version 2 section of the License file that
3156.23 + * by Oracle in the GPL Version 2 section of the License file that
3156.24 * accompanied this code. If applicable, add the following below the
3156.25 * License Header, with the fields enclosed by brackets [] replaced by
3156.26 * your own identifying information:
3157.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdcomponentlabel/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3157.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdcomponentlabel/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3157.3 @@ -1,7 +1,10 @@
3157.4 /*
3157.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3157.6 *
3157.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3157.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3157.9 + *
3157.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3157.11 + * Other names may be trademarks of their respective owners.
3157.12 *
3157.13 * The contents of this file are subject to the terms of either the GNU
3157.14 * General Public License Version 2 only ("GPL") or the Common
3157.15 @@ -13,9 +16,9 @@
3157.16 * specific language governing permissions and limitations under the
3157.17 * License. When distributing the software, include this License Header
3157.18 * Notice in each file and include the License file at
3157.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3157.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3157.21 * particular file as subject to the "Classpath" exception as provided
3157.22 - * by Sun in the GPL Version 2 section of the License file that
3157.23 + * by Oracle in the GPL Version 2 section of the License file that
3157.24 * accompanied this code. If applicable, add the following below the
3157.25 * License Header, with the fields enclosed by brackets [] replaced by
3157.26 * your own identifying information:
3158.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdcomponentlabel/AcceptanceTest.properties Fri Jul 16 11:47:36 2010 -0400
3158.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdcomponentlabel/AcceptanceTest.properties Fri Jul 16 14:21:50 2010 -0400
3158.3 @@ -1,6 +1,9 @@
3158.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3158.5 #
3158.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3158.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3158.8 +#
3158.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3158.10 +# Other names may be trademarks of their respective owners.
3158.11 #
3158.12 # The contents of this file are subject to the terms of either the GNU
3158.13 # General Public License Version 2 only ("GPL") or the Common
3158.14 @@ -12,9 +15,9 @@
3158.15 # specific language governing permissions and limitations under the
3158.16 # License. When distributing the software, include this License Header
3158.17 # Notice in each file and include the License file at
3158.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3158.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3158.20 # particular file as subject to the "Classpath" exception as provided
3158.21 -# by Sun in the GPL Version 2 section of the License file that
3158.22 +# by Oracle in the GPL Version 2 section of the License file that
3158.23 # accompanied this code. If applicable, add the following below the
3158.24 # License Header, with the fields enclosed by brackets [] replaced by
3158.25 # your own identifying information:
3159.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdformattedoutput/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3159.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdformattedoutput/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3159.3 @@ -1,7 +1,10 @@
3159.4 /*
3159.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3159.6 *
3159.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3159.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3159.9 + *
3159.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3159.11 + * Other names may be trademarks of their respective owners.
3159.12 *
3159.13 * The contents of this file are subject to the terms of either the GNU
3159.14 * General Public License Version 2 only ("GPL") or the Common
3159.15 @@ -13,9 +16,9 @@
3159.16 * specific language governing permissions and limitations under the
3159.17 * License. When distributing the software, include this License Header
3159.18 * Notice in each file and include the License file at
3159.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3159.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3159.21 * particular file as subject to the "Classpath" exception as provided
3159.22 - * by Sun in the GPL Version 2 section of the License file that
3159.23 + * by Oracle in the GPL Version 2 section of the License file that
3159.24 * accompanied this code. If applicable, add the following below the
3159.25 * License Header, with the fields enclosed by brackets [] replaced by
3159.26 * your own identifying information:
3160.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdformattedoutput/AcceptanceTest.properties Fri Jul 16 11:47:36 2010 -0400
3160.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdformattedoutput/AcceptanceTest.properties Fri Jul 16 14:21:50 2010 -0400
3160.3 @@ -1,6 +1,9 @@
3160.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3160.5 #
3160.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3160.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3160.8 +#
3160.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3160.10 +# Other names may be trademarks of their respective owners.
3160.11 #
3160.12 # The contents of this file are subject to the terms of either the GNU
3160.13 # General Public License Version 2 only ("GPL") or the Common
3160.14 @@ -12,9 +15,9 @@
3160.15 # specific language governing permissions and limitations under the
3160.16 # License. When distributing the software, include this License Header
3160.17 # Notice in each file and include the License file at
3160.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3160.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3160.20 # particular file as subject to the "Classpath" exception as provided
3160.21 -# by Sun in the GPL Version 2 section of the License file that
3160.22 +# by Oracle in the GPL Version 2 section of the License file that
3160.23 # accompanied this code. If applicable, add the following below the
3160.24 # License Header, with the fields enclosed by brackets [] replaced by
3160.25 # your own identifying information:
3161.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdinlinemessage/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3161.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdinlinemessage/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3161.3 @@ -1,7 +1,10 @@
3161.4 /*
3161.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3161.6 *
3161.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3161.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3161.9 + *
3161.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3161.11 + * Other names may be trademarks of their respective owners.
3161.12 *
3161.13 * The contents of this file are subject to the terms of either the GNU
3161.14 * General Public License Version 2 only ("GPL") or the Common
3161.15 @@ -13,9 +16,9 @@
3161.16 * specific language governing permissions and limitations under the
3161.17 * License. When distributing the software, include this License Header
3161.18 * Notice in each file and include the License file at
3161.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3161.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3161.21 * particular file as subject to the "Classpath" exception as provided
3161.22 - * by Sun in the GPL Version 2 section of the License file that
3161.23 + * by Oracle in the GPL Version 2 section of the License file that
3161.24 * accompanied this code. If applicable, add the following below the
3161.25 * License Header, with the fields enclosed by brackets [] replaced by
3161.26 * your own identifying information:
3162.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdinlinemessage/AcceptanceTest.properties Fri Jul 16 11:47:36 2010 -0400
3162.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/output/stdinlinemessage/AcceptanceTest.properties Fri Jul 16 14:21:50 2010 -0400
3162.3 @@ -1,6 +1,9 @@
3162.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3162.5 #
3162.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3162.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3162.8 +#
3162.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3162.10 +# Other names may be trademarks of their respective owners.
3162.11 #
3162.12 # The contents of this file are subject to the terms of either the GNU
3162.13 # General Public License Version 2 only ("GPL") or the Common
3162.14 @@ -12,9 +15,9 @@
3162.15 # specific language governing permissions and limitations under the
3162.16 # License. When distributing the software, include this License Header
3162.17 # Notice in each file and include the License file at
3162.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3162.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3162.20 # particular file as subject to the "Classpath" exception as provided
3162.21 -# by Sun in the GPL Version 2 section of the License file that
3162.22 +# by Oracle in the GPL Version 2 section of the License file that
3162.23 # accompanied this code. If applicable, add the following below the
3162.24 # License Header, with the fields enclosed by brackets [] replaced by
3162.25 # your own identifying information:
3163.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/project.properties Fri Jul 16 11:47:36 2010 -0400
3163.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/project.properties Fri Jul 16 14:21:50 2010 -0400
3163.3 @@ -1,6 +1,9 @@
3163.4 #DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3163.5 #
3163.6 -#Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
3163.7 +#Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3163.8 +#
3163.9 +#Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3163.10 +#Other names may be trademarks of their respective owners.
3163.11 #
3163.12 #The contents of this file are subject to the terms of either the GNU
3163.13 #General Public License Version 2 only ("GPL") or the Common
3163.14 @@ -12,9 +15,9 @@
3163.15 #specific language governing permissions and limitations under the
3163.16 #License. When distributing the software, include this License Header
3163.17 #Notice in each file and include the License file at
3163.18 -#nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3163.19 +#nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3163.20 #particular file as subject to the "Classpath" exception as provided
3163.21 -#by Sun in the GPL Version 2 section of the License file that
3163.22 +#by Oracle in the GPL Version 2 section of the License file that
3163.23 #accompanied this code. If applicable, add the following below the
3163.24 #License Header, with the fields enclosed by brackets [] replaced by
3163.25 #your own identifying information:
3164.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/addremove/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3164.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/addremove/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3164.3 @@ -1,7 +1,10 @@
3164.4 /*
3164.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3164.6 *
3164.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3164.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3164.9 + *
3164.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3164.11 + * Other names may be trademarks of their respective owners.
3164.12 *
3164.13 * The contents of this file are subject to the terms of either the GNU
3164.14 * General Public License Version 2 only ("GPL") or the Common
3164.15 @@ -13,9 +16,9 @@
3164.16 * specific language governing permissions and limitations under the
3164.17 * License. When distributing the software, include this License Header
3164.18 * Notice in each file and include the License file at
3164.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3164.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3164.21 * particular file as subject to the "Classpath" exception as provided
3164.22 - * by Sun in the GPL Version 2 section of the License file that
3164.23 + * by Oracle in the GPL Version 2 section of the License file that
3164.24 * accompanied this code. If applicable, add the following below the
3164.25 * License Header, with the fields enclosed by brackets [] replaced by
3164.26 * your own identifying information:
3165.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/checkbox/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3165.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/checkbox/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3165.3 @@ -1,7 +1,10 @@
3165.4 /*
3165.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3165.6 *
3165.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3165.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3165.9 + *
3165.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3165.11 + * Other names may be trademarks of their respective owners.
3165.12 *
3165.13 * The contents of this file are subject to the terms of either the GNU
3165.14 * General Public License Version 2 only ("GPL") or the Common
3165.15 @@ -13,9 +16,9 @@
3165.16 * specific language governing permissions and limitations under the
3165.17 * License. When distributing the software, include this License Header
3165.18 * Notice in each file and include the License file at
3165.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3165.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3165.21 * particular file as subject to the "Classpath" exception as provided
3165.22 - * by Sun in the GPL Version 2 section of the License file that
3165.23 + * by Oracle in the GPL Version 2 section of the License file that
3165.24 * accompanied this code. If applicable, add the following below the
3165.25 * License Header, with the fields enclosed by brackets [] replaced by
3165.26 * your own identifying information:
3166.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/checkboxgroup/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3166.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/checkboxgroup/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3166.3 @@ -1,7 +1,10 @@
3166.4 /*
3166.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3166.6 *
3166.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3166.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3166.9 + *
3166.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3166.11 + * Other names may be trademarks of their respective owners.
3166.12 *
3166.13 * The contents of this file are subject to the terms of either the GNU
3166.14 * General Public License Version 2 only ("GPL") or the Common
3166.15 @@ -13,9 +16,9 @@
3166.16 * specific language governing permissions and limitations under the
3166.17 * License. When distributing the software, include this License Header
3166.18 * Notice in each file and include the License file at
3166.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3166.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3166.21 * particular file as subject to the "Classpath" exception as provided
3166.22 - * by Sun in the GPL Version 2 section of the License file that
3166.23 + * by Oracle in the GPL Version 2 section of the License file that
3166.24 * accompanied this code. If applicable, add the following below the
3166.25 * License Header, with the fields enclosed by brackets [] replaced by
3166.26 * your own identifying information:
3167.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/dropdown/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3167.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/dropdown/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3167.3 @@ -1,7 +1,10 @@
3167.4 /*
3167.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3167.6 *
3167.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3167.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3167.9 + *
3167.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3167.11 + * Other names may be trademarks of their respective owners.
3167.12 *
3167.13 * The contents of this file are subject to the terms of either the GNU
3167.14 * General Public License Version 2 only ("GPL") or the Common
3167.15 @@ -13,9 +16,9 @@
3167.16 * specific language governing permissions and limitations under the
3167.17 * License. When distributing the software, include this License Header
3167.18 * Notice in each file and include the License file at
3167.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3167.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3167.21 * particular file as subject to the "Classpath" exception as provided
3167.22 - * by Sun in the GPL Version 2 section of the License file that
3167.23 + * by Oracle in the GPL Version 2 section of the License file that
3167.24 * accompanied this code. If applicable, add the following below the
3167.25 * License Header, with the fields enclosed by brackets [] replaced by
3167.26 * your own identifying information:
3168.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/listbox/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3168.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/listbox/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3168.3 @@ -1,7 +1,10 @@
3168.4 /*
3168.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3168.6 *
3168.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3168.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3168.9 + *
3168.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3168.11 + * Other names may be trademarks of their respective owners.
3168.12 *
3168.13 * The contents of this file are subject to the terms of either the GNU
3168.14 * General Public License Version 2 only ("GPL") or the Common
3168.15 @@ -13,9 +16,9 @@
3168.16 * specific language governing permissions and limitations under the
3168.17 * License. When distributing the software, include this License Header
3168.18 * Notice in each file and include the License file at
3168.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3168.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3168.21 * particular file as subject to the "Classpath" exception as provided
3168.22 - * by Sun in the GPL Version 2 section of the License file that
3168.23 + * by Oracle in the GPL Version 2 section of the License file that
3168.24 * accompanied this code. If applicable, add the following below the
3168.25 * License Header, with the fields enclosed by brackets [] replaced by
3168.26 * your own identifying information:
3169.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/radiobutton/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3169.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/radiobutton/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3169.3 @@ -1,7 +1,10 @@
3169.4 /*
3169.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3169.6 *
3169.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3169.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3169.9 + *
3169.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3169.11 + * Other names may be trademarks of their respective owners.
3169.12 *
3169.13 * The contents of this file are subject to the terms of either the GNU
3169.14 * General Public License Version 2 only ("GPL") or the Common
3169.15 @@ -13,9 +16,9 @@
3169.16 * specific language governing permissions and limitations under the
3169.17 * License. When distributing the software, include this License Header
3169.18 * Notice in each file and include the License file at
3169.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3169.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3169.21 * particular file as subject to the "Classpath" exception as provided
3169.22 - * by Sun in the GPL Version 2 section of the License file that
3169.23 + * by Oracle in the GPL Version 2 section of the License file that
3169.24 * accompanied this code. If applicable, add the following below the
3169.25 * License Header, with the fields enclosed by brackets [] replaced by
3169.26 * your own identifying information:
3170.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/radiobuttongroup/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3170.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/selection/radiobuttongroup/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3170.3 @@ -1,7 +1,10 @@
3170.4 /*
3170.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3170.6 *
3170.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3170.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3170.9 + *
3170.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3170.11 + * Other names may be trademarks of their respective owners.
3170.12 *
3170.13 * The contents of this file are subject to the terms of either the GNU
3170.14 * General Public License Version 2 only ("GPL") or the Common
3170.15 @@ -13,9 +16,9 @@
3170.16 * specific language governing permissions and limitations under the
3170.17 * License. When distributing the software, include this License Header
3170.18 * Notice in each file and include the License file at
3170.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3170.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3170.21 * particular file as subject to the "Classpath" exception as provided
3170.22 - * by Sun in the GPL Version 2 section of the License file that
3170.23 + * by Oracle in the GPL Version 2 section of the License file that
3170.24 * accompanied this code. If applicable, add the following below the
3170.25 * License Header, with the fields enclosed by brackets [] replaced by
3170.26 * your own identifying information:
3171.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/table/basic/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3171.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/table/basic/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3171.3 @@ -1,7 +1,10 @@
3171.4 /*
3171.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3171.6 *
3171.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3171.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3171.9 + *
3171.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3171.11 + * Other names may be trademarks of their respective owners.
3171.12 *
3171.13 * The contents of this file are subject to the terms of either the GNU
3171.14 * General Public License Version 2 only ("GPL") or the Common
3171.15 @@ -13,9 +16,9 @@
3171.16 * specific language governing permissions and limitations under the
3171.17 * License. When distributing the software, include this License Header
3171.18 * Notice in each file and include the License file at
3171.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3171.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3171.21 * particular file as subject to the "Classpath" exception as provided
3171.22 - * by Sun in the GPL Version 2 section of the License file that
3171.23 + * by Oracle in the GPL Version 2 section of the License file that
3171.24 * accompanied this code. If applicable, add the following below the
3171.25 * License Header, with the fields enclosed by brackets [] replaced by
3171.26 * your own identifying information:
3172.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/table/std/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3172.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/table/std/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3172.3 @@ -1,7 +1,10 @@
3172.4 /*
3172.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3172.6 *
3172.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3172.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3172.9 + *
3172.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3172.11 + * Other names may be trademarks of their respective owners.
3172.12 *
3172.13 * The contents of this file are subject to the terms of either the GNU
3172.14 * General Public License Version 2 only ("GPL") or the Common
3172.15 @@ -13,9 +16,9 @@
3172.16 * specific language governing permissions and limitations under the
3172.17 * License. When distributing the software, include this License Header
3172.18 * Notice in each file and include the License file at
3172.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3172.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3172.21 * particular file as subject to the "Classpath" exception as provided
3172.22 - * by Sun in the GPL Version 2 section of the License file that
3172.23 + * by Oracle in the GPL Version 2 section of the License file that
3172.24 * accompanied this code. If applicable, add the following below the
3172.25 * License Header, with the fields enclosed by brackets [] replaced by
3172.26 * your own identifying information:
3173.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/table/std/AcceptanceTest.properties Fri Jul 16 11:47:36 2010 -0400
3173.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/table/std/AcceptanceTest.properties Fri Jul 16 14:21:50 2010 -0400
3173.3 @@ -1,6 +1,9 @@
3173.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3173.5 #
3173.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3173.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3173.8 +#
3173.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3173.10 +# Other names may be trademarks of their respective owners.
3173.11 #
3173.12 # The contents of this file are subject to the terms of either the GNU
3173.13 # General Public License Version 2 only ("GPL") or the Common
3173.14 @@ -12,9 +15,9 @@
3173.15 # specific language governing permissions and limitations under the
3173.16 # License. When distributing the software, include this License Header
3173.17 # Notice in each file and include the License file at
3173.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3173.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3173.20 # particular file as subject to the "Classpath" exception as provided
3173.21 -# by Sun in the GPL Version 2 section of the License file that
3173.22 +# by Oracle in the GPL Version 2 section of the License file that
3173.23 # accompanied this code. If applicable, add the following below the
3173.24 # License Header, with the fields enclosed by brackets [] replaced by
3173.25 # your own identifying information:
3174.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/templates/TemplateTest.java Fri Jul 16 11:47:36 2010 -0400
3174.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/templates/TemplateTest.java Fri Jul 16 14:21:50 2010 -0400
3174.3 @@ -1,7 +1,10 @@
3174.4 /*
3174.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3174.6 *
3174.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3174.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3174.9 + *
3174.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3174.11 + * Other names may be trademarks of their respective owners.
3174.12 *
3174.13 * The contents of this file are subject to the terms of either the GNU
3174.14 * General Public License Version 2 only ("GPL") or the Common
3174.15 @@ -13,9 +16,9 @@
3174.16 * specific language governing permissions and limitations under the
3174.17 * License. When distributing the software, include this License Header
3174.18 * Notice in each file and include the License file at
3174.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3174.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3174.21 * particular file as subject to the "Classpath" exception as provided
3174.22 - * by Sun in the GPL Version 2 section of the License file that
3174.23 + * by Oracle in the GPL Version 2 section of the License file that
3174.24 * accompanied this code. If applicable, add the following below the
3174.25 * License Header, with the fields enclosed by brackets [] replaced by
3174.26 * your own identifying information:
3175.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/util/ComponentUtils.java Fri Jul 16 11:47:36 2010 -0400
3175.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/util/ComponentUtils.java Fri Jul 16 14:21:50 2010 -0400
3175.3 @@ -1,7 +1,10 @@
3175.4 /*
3175.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3175.6 *
3175.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3175.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3175.9 + *
3175.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3175.11 + * Other names may be trademarks of their respective owners.
3175.12 *
3175.13 * The contents of this file are subject to the terms of either the GNU
3175.14 * General Public License Version 2 only ("GPL") or the Common
3175.15 @@ -13,9 +16,9 @@
3175.16 * specific language governing permissions and limitations under the
3175.17 * License. When distributing the software, include this License Header
3175.18 * Notice in each file and include the License file at
3175.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3175.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3175.21 * particular file as subject to the "Classpath" exception as provided
3175.22 - * by Sun in the GPL Version 2 section of the License file that
3175.23 + * by Oracle in the GPL Version 2 section of the License file that
3175.24 * accompanied this code. If applicable, add the following below the
3175.25 * License Header, with the fields enclosed by brackets [] replaced by
3175.26 * your own identifying information:
3176.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/util/PaletteHelper.java Fri Jul 16 11:47:36 2010 -0400
3176.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/util/PaletteHelper.java Fri Jul 16 14:21:50 2010 -0400
3176.3 @@ -1,7 +1,10 @@
3176.4 /*
3176.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3176.6 *
3176.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3176.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3176.9 + *
3176.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3176.11 + * Other names may be trademarks of their respective owners.
3176.12 *
3176.13 * The contents of this file are subject to the terms of either the GNU
3176.14 * General Public License Version 2 only ("GPL") or the Common
3176.15 @@ -13,9 +16,9 @@
3176.16 * specific language governing permissions and limitations under the
3176.17 * License. When distributing the software, include this License Header
3176.18 * Notice in each file and include the License file at
3176.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3176.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3176.21 * particular file as subject to the "Classpath" exception as provided
3176.22 - * by Sun in the GPL Version 2 section of the License file that
3176.23 + * by Oracle in the GPL Version 2 section of the License file that
3176.24 * accompanied this code. If applicable, add the following below the
3176.25 * License Header, with the fields enclosed by brackets [] replaced by
3176.26 * your own identifying information:
3177.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/doublerange/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3177.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/doublerange/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3177.3 @@ -1,6 +1,9 @@
3177.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3177.5 #
3177.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3177.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3177.8 +#
3177.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3177.10 +# Other names may be trademarks of their respective owners.
3177.11 #
3177.12 # The contents of this file are subject to the terms of either the GNU
3177.13 # General Public License Version 2 only ("GPL") or the Common
3177.14 @@ -12,9 +15,9 @@
3177.15 # specific language governing permissions and limitations under the
3177.16 # License. When distributing the software, include this License Header
3177.17 # Notice in each file and include the License file at
3177.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3177.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3177.20 # particular file as subject to the "Classpath" exception as provided
3177.21 -# by Sun in the GPL Version 2 section of the License file that
3177.22 +# by Oracle in the GPL Version 2 section of the License file that
3177.23 # accompanied this code. If applicable, add the following below the
3177.24 # License Header, with the fields enclosed by brackets [] replaced by
3177.25 # your own identifying information:
3178.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/doublerange/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3178.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/doublerange/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3178.3 @@ -1,7 +1,10 @@
3178.4 /*
3178.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3178.6 *
3178.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3178.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3178.9 + *
3178.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3178.11 + * Other names may be trademarks of their respective owners.
3178.12 *
3178.13 * The contents of this file are subject to the terms of either the GNU
3178.14 * General Public License Version 2 only ("GPL") or the Common
3178.15 @@ -13,9 +16,9 @@
3178.16 * specific language governing permissions and limitations under the
3178.17 * License. When distributing the software, include this License Header
3178.18 * Notice in each file and include the License file at
3178.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3178.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3178.21 * particular file as subject to the "Classpath" exception as provided
3178.22 - * by Sun in the GPL Version 2 section of the License file that
3178.23 + * by Oracle in the GPL Version 2 section of the License file that
3178.24 * accompanied this code. If applicable, add the following below the
3178.25 * License Header, with the fields enclosed by brackets [] replaced by
3178.26 * your own identifying information:
3179.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/length/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3179.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/length/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3179.3 @@ -1,6 +1,9 @@
3179.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3179.5 #
3179.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3179.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3179.8 +#
3179.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3179.10 +# Other names may be trademarks of their respective owners.
3179.11 #
3179.12 # The contents of this file are subject to the terms of either the GNU
3179.13 # General Public License Version 2 only ("GPL") or the Common
3179.14 @@ -12,9 +15,9 @@
3179.15 # specific language governing permissions and limitations under the
3179.16 # License. When distributing the software, include this License Header
3179.17 # Notice in each file and include the License file at
3179.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3179.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3179.20 # particular file as subject to the "Classpath" exception as provided
3179.21 -# by Sun in the GPL Version 2 section of the License file that
3179.22 +# by Oracle in the GPL Version 2 section of the License file that
3179.23 # accompanied this code. If applicable, add the following below the
3179.24 # License Header, with the fields enclosed by brackets [] replaced by
3179.25 # your own identifying information:
3180.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/length/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3180.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/length/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3180.3 @@ -1,7 +1,10 @@
3180.4 /*
3180.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3180.6 *
3180.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3180.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3180.9 + *
3180.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3180.11 + * Other names may be trademarks of their respective owners.
3180.12 *
3180.13 * The contents of this file are subject to the terms of either the GNU
3180.14 * General Public License Version 2 only ("GPL") or the Common
3180.15 @@ -13,9 +16,9 @@
3180.16 * specific language governing permissions and limitations under the
3180.17 * License. When distributing the software, include this License Header
3180.18 * Notice in each file and include the License file at
3180.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3180.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3180.21 * particular file as subject to the "Classpath" exception as provided
3180.22 - * by Sun in the GPL Version 2 section of the License file that
3180.23 + * by Oracle in the GPL Version 2 section of the License file that
3180.24 * accompanied this code. If applicable, add the following below the
3180.25 * License Header, with the fields enclosed by brackets [] replaced by
3180.26 * your own identifying information:
3181.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/longrange/Acceptance.properties Fri Jul 16 11:47:36 2010 -0400
3181.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/longrange/Acceptance.properties Fri Jul 16 14:21:50 2010 -0400
3181.3 @@ -1,6 +1,9 @@
3181.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3181.5 #
3181.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3181.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3181.8 +#
3181.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3181.10 +# Other names may be trademarks of their respective owners.
3181.11 #
3181.12 # The contents of this file are subject to the terms of either the GNU
3181.13 # General Public License Version 2 only ("GPL") or the Common
3181.14 @@ -12,9 +15,9 @@
3181.15 # specific language governing permissions and limitations under the
3181.16 # License. When distributing the software, include this License Header
3181.17 # Notice in each file and include the License file at
3181.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3181.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3181.20 # particular file as subject to the "Classpath" exception as provided
3181.21 -# by Sun in the GPL Version 2 section of the License file that
3181.22 +# by Oracle in the GPL Version 2 section of the License file that
3181.23 # accompanied this code. If applicable, add the following below the
3181.24 # License Header, with the fields enclosed by brackets [] replaced by
3181.25 # your own identifying information:
3182.1 --- a/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/longrange/AcceptanceTest.java Fri Jul 16 11:47:36 2010 -0400
3182.2 +++ b/visualweb.woodstock.webui.jsf/test/qa-functional/src/org/netbeans/modules/visualweb/test/components/validators/longrange/AcceptanceTest.java Fri Jul 16 14:21:50 2010 -0400
3182.3 @@ -1,7 +1,10 @@
3182.4 /*
3182.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3182.6 *
3182.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3182.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3182.9 + *
3182.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3182.11 + * Other names may be trademarks of their respective owners.
3182.12 *
3182.13 * The contents of this file are subject to the terms of either the GNU
3182.14 * General Public License Version 2 only ("GPL") or the Common
3182.15 @@ -13,9 +16,9 @@
3182.16 * specific language governing permissions and limitations under the
3182.17 * License. When distributing the software, include this License Header
3182.18 * Notice in each file and include the License file at
3182.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3182.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3182.21 * particular file as subject to the "Classpath" exception as provided
3182.22 - * by Sun in the GPL Version 2 section of the License file that
3182.23 + * by Oracle in the GPL Version 2 section of the License file that
3182.24 * accompanied this code. If applicable, add the following below the
3182.25 * License Header, with the fields enclosed by brackets [] replaced by
3182.26 * your own identifying information:
3183.1 --- a/visualweb.xhtml/arch.xml Fri Jul 16 11:47:36 2010 -0400
3183.2 +++ b/visualweb.xhtml/arch.xml Fri Jul 16 14:21:50 2010 -0400
3183.3 @@ -2,7 +2,10 @@
3183.4 <!--
3183.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3183.6
3183.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3183.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3183.9 +
3183.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3183.11 +Other names may be trademarks of their respective owners.
3183.12
3183.13
3183.14 The contents of this file are subject to the terms of either the GNU
3183.15 @@ -15,9 +18,9 @@
3183.16 specific language governing permissions and limitations under the
3183.17 License. When distributing the software, include this License Header
3183.18 Notice in each file and include the License file at
3183.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3183.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3183.21 particular file as subject to the "Classpath" exception as provided
3183.22 -by Sun in the GPL Version 2 section of the License file that
3183.23 +by Oracle in the GPL Version 2 section of the License file that
3183.24 accompanied this code. If applicable, add the following below the
3183.25 License Header, with the fields enclosed by brackets [] replaced by
3183.26 your own identifying information:
3184.1 --- a/visualweb.xhtml/build.xml Fri Jul 16 11:47:36 2010 -0400
3184.2 +++ b/visualweb.xhtml/build.xml Fri Jul 16 14:21:50 2010 -0400
3184.3 @@ -2,7 +2,10 @@
3184.4 <!--
3184.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3184.6
3184.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3184.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3184.9 +
3184.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3184.11 +Other names may be trademarks of their respective owners.
3184.12
3184.13
3184.14 The contents of this file are subject to the terms of either the GNU
3184.15 @@ -15,9 +18,9 @@
3184.16 specific language governing permissions and limitations under the
3184.17 License. When distributing the software, include this License Header
3184.18 Notice in each file and include the License file at
3184.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3184.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3184.21 particular file as subject to the "Classpath" exception as provided
3184.22 -by Sun in the GPL Version 2 section of the License file that
3184.23 +by Oracle in the GPL Version 2 section of the License file that
3184.24 accompanied this code. If applicable, add the following below the
3184.25 License Header, with the fields enclosed by brackets [] replaced by
3184.26 your own identifying information:
3185.1 --- a/visualweb.xhtml/nbproject/project.properties Fri Jul 16 11:47:36 2010 -0400
3185.2 +++ b/visualweb.xhtml/nbproject/project.properties Fri Jul 16 14:21:50 2010 -0400
3185.3 @@ -1,6 +1,9 @@
3185.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3185.5 #
3185.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3185.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3185.8 +#
3185.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3185.10 +# Other names may be trademarks of their respective owners.
3185.11 #
3185.12 # The contents of this file are subject to the terms of either the GNU
3185.13 # General Public License Version 2 only ("GPL") or the Common
3185.14 @@ -12,9 +15,9 @@
3185.15 # specific language governing permissions and limitations under the
3185.16 # License. When distributing the software, include this License Header
3185.17 # Notice in each file and include the License file at
3185.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3185.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3185.20 # particular file as subject to the "Classpath" exception as provided
3185.21 -# by Sun in the GPL Version 2 section of the License file that
3185.22 +# by Oracle in the GPL Version 2 section of the License file that
3185.23 # accompanied this code. If applicable, add the following below the
3185.24 # License Header, with the fields enclosed by brackets [] replaced by
3185.25 # your own identifying information:
3186.1 --- a/visualweb.xhtml/nbproject/project.xml Fri Jul 16 11:47:36 2010 -0400
3186.2 +++ b/visualweb.xhtml/nbproject/project.xml Fri Jul 16 14:21:50 2010 -0400
3186.3 @@ -2,7 +2,10 @@
3186.4 <!--
3186.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3186.6
3186.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3186.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3186.9 +
3186.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3186.11 +Other names may be trademarks of their respective owners.
3186.12
3186.13
3186.14 The contents of this file are subject to the terms of either the GNU
3186.15 @@ -15,9 +18,9 @@
3186.16 specific language governing permissions and limitations under the
3186.17 License. When distributing the software, include this License Header
3186.18 Notice in each file and include the License file at
3186.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3186.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3186.21 particular file as subject to the "Classpath" exception as provided
3186.22 -by Sun in the GPL Version 2 section of the License file that
3186.23 +by Oracle in the GPL Version 2 section of the License file that
3186.24 accompanied this code. If applicable, add the following below the
3186.25 License Header, with the fields enclosed by brackets [] replaced by
3186.26 your own identifying information:
3186.27 @@ -213,7 +216,15 @@
3186.28 <build-prerequisite/>
3186.29 <compile-dependency/>
3186.30 <run-dependency>
3186.31 - <specification-version>6.8</specification-version>
3186.32 + <specification-version>8.0</specification-version>
3186.33 + </run-dependency>
3186.34 + </dependency>
3186.35 + <dependency>
3186.36 + <code-name-base>org.openide.util.lookup</code-name-base>
3186.37 + <build-prerequisite/>
3186.38 + <compile-dependency/>
3186.39 + <run-dependency>
3186.40 + <specification-version>8.0</specification-version>
3186.41 </run-dependency>
3186.42 </dependency>
3186.43 </module-dependencies>
3187.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/A.java Fri Jul 16 11:47:36 2010 -0400
3187.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/A.java Fri Jul 16 14:21:50 2010 -0400
3187.3 @@ -1,7 +1,10 @@
3187.4 /*
3187.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3187.6 *
3187.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3187.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3187.9 + *
3187.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3187.11 + * Other names may be trademarks of their respective owners.
3187.12 *
3187.13 * The contents of this file are subject to the terms of either the GNU
3187.14 * General Public License Version 2 only ("GPL") or the Common
3187.15 @@ -13,9 +16,9 @@
3187.16 * specific language governing permissions and limitations under the
3187.17 * License. When distributing the software, include this License Header
3187.18 * Notice in each file and include the License file at
3187.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3187.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3187.21 * particular file as subject to the "Classpath" exception as provided
3187.22 - * by Sun in the GPL Version 2 section of the License file that
3187.23 + * by Oracle in the GPL Version 2 section of the License file that
3187.24 * accompanied this code. If applicable, add the following below the
3187.25 * License Header, with the fields enclosed by brackets [] replaced by
3187.26 * your own identifying information:
3188.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ABeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3188.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ABeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3188.3 @@ -2,7 +2,10 @@
3188.4 /*
3188.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3188.6 *
3188.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3188.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3188.9 + *
3188.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3188.11 + * Other names may be trademarks of their respective owners.
3188.12 *
3188.13 * The contents of this file are subject to the terms of either the GNU
3188.14 * General Public License Version 2 only ("GPL") or the Common
3188.15 @@ -14,9 +17,9 @@
3188.16 * specific language governing permissions and limitations under the
3188.17 * License. When distributing the software, include this License Header
3188.18 * Notice in each file and include the License file at
3188.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3188.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3188.21 * particular file as subject to the "Classpath" exception as provided
3188.22 - * by Sun in the GPL Version 2 section of the License file that
3188.23 + * by Oracle in the GPL Version 2 section of the License file that
3188.24 * accompanied this code. If applicable, add the following below the
3188.25 * License Header, with the fields enclosed by brackets [] replaced by
3188.26 * your own identifying information:
3189.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ADesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3189.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ADesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3189.3 @@ -1,7 +1,10 @@
3189.4 /*
3189.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3189.6 *
3189.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3189.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3189.9 + *
3189.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3189.11 + * Other names may be trademarks of their respective owners.
3189.12 *
3189.13 * The contents of this file are subject to the terms of either the GNU
3189.14 * General Public License Version 2 only ("GPL") or the Common
3189.15 @@ -13,9 +16,9 @@
3189.16 * specific language governing permissions and limitations under the
3189.17 * License. When distributing the software, include this License Header
3189.18 * Notice in each file and include the License file at
3189.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3189.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3189.21 * particular file as subject to the "Classpath" exception as provided
3189.22 - * by Sun in the GPL Version 2 section of the License file that
3189.23 + * by Oracle in the GPL Version 2 section of the License file that
3189.24 * accompanied this code. If applicable, add the following below the
3189.25 * License Header, with the fields enclosed by brackets [] replaced by
3189.26 * your own identifying information:
3190.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Abbr.java Fri Jul 16 11:47:36 2010 -0400
3190.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Abbr.java Fri Jul 16 14:21:50 2010 -0400
3190.3 @@ -1,7 +1,10 @@
3190.4 /*
3190.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3190.6 *
3190.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3190.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3190.9 + *
3190.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3190.11 + * Other names may be trademarks of their respective owners.
3190.12 *
3190.13 * The contents of this file are subject to the terms of either the GNU
3190.14 * General Public License Version 2 only ("GPL") or the Common
3190.15 @@ -13,9 +16,9 @@
3190.16 * specific language governing permissions and limitations under the
3190.17 * License. When distributing the software, include this License Header
3190.18 * Notice in each file and include the License file at
3190.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3190.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3190.21 * particular file as subject to the "Classpath" exception as provided
3190.22 - * by Sun in the GPL Version 2 section of the License file that
3190.23 + * by Oracle in the GPL Version 2 section of the License file that
3190.24 * accompanied this code. If applicable, add the following below the
3190.25 * License Header, with the fields enclosed by brackets [] replaced by
3190.26 * your own identifying information:
3191.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Acronym.java Fri Jul 16 11:47:36 2010 -0400
3191.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Acronym.java Fri Jul 16 14:21:50 2010 -0400
3191.3 @@ -1,7 +1,10 @@
3191.4 /*
3191.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3191.6 *
3191.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3191.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3191.9 + *
3191.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3191.11 + * Other names may be trademarks of their respective owners.
3191.12 *
3191.13 * The contents of this file are subject to the terms of either the GNU
3191.14 * General Public License Version 2 only ("GPL") or the Common
3191.15 @@ -13,9 +16,9 @@
3191.16 * specific language governing permissions and limitations under the
3191.17 * License. When distributing the software, include this License Header
3191.18 * Notice in each file and include the License file at
3191.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3191.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3191.21 * particular file as subject to the "Classpath" exception as provided
3191.22 - * by Sun in the GPL Version 2 section of the License file that
3191.23 + * by Oracle in the GPL Version 2 section of the License file that
3191.24 * accompanied this code. If applicable, add the following below the
3191.25 * License Header, with the fields enclosed by brackets [] replaced by
3191.26 * your own identifying information:
3192.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Address.java Fri Jul 16 11:47:36 2010 -0400
3192.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Address.java Fri Jul 16 14:21:50 2010 -0400
3192.3 @@ -1,7 +1,10 @@
3192.4 /*
3192.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3192.6 *
3192.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3192.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3192.9 + *
3192.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3192.11 + * Other names may be trademarks of their respective owners.
3192.12 *
3192.13 * The contents of this file are subject to the terms of either the GNU
3192.14 * General Public License Version 2 only ("GPL") or the Common
3192.15 @@ -13,9 +16,9 @@
3192.16 * specific language governing permissions and limitations under the
3192.17 * License. When distributing the software, include this License Header
3192.18 * Notice in each file and include the License file at
3192.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3192.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3192.21 * particular file as subject to the "Classpath" exception as provided
3192.22 - * by Sun in the GPL Version 2 section of the License file that
3192.23 + * by Oracle in the GPL Version 2 section of the License file that
3192.24 * accompanied this code. If applicable, add the following below the
3192.25 * License Header, with the fields enclosed by brackets [] replaced by
3192.26 * your own identifying information:
3193.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Applet.java Fri Jul 16 11:47:36 2010 -0400
3193.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Applet.java Fri Jul 16 14:21:50 2010 -0400
3193.3 @@ -1,7 +1,10 @@
3193.4 /*
3193.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3193.6 *
3193.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3193.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3193.9 + *
3193.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3193.11 + * Other names may be trademarks of their respective owners.
3193.12 *
3193.13 * The contents of this file are subject to the terms of either the GNU
3193.14 * General Public License Version 2 only ("GPL") or the Common
3193.15 @@ -13,9 +16,9 @@
3193.16 * specific language governing permissions and limitations under the
3193.17 * License. When distributing the software, include this License Header
3193.18 * Notice in each file and include the License file at
3193.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3193.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3193.21 * particular file as subject to the "Classpath" exception as provided
3193.22 - * by Sun in the GPL Version 2 section of the License file that
3193.23 + * by Oracle in the GPL Version 2 section of the License file that
3193.24 * accompanied this code. If applicable, add the following below the
3193.25 * License Header, with the fields enclosed by brackets [] replaced by
3193.26 * your own identifying information:
3194.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Area.java Fri Jul 16 11:47:36 2010 -0400
3194.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Area.java Fri Jul 16 14:21:50 2010 -0400
3194.3 @@ -1,7 +1,10 @@
3194.4 /*
3194.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3194.6 *
3194.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3194.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3194.9 + *
3194.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3194.11 + * Other names may be trademarks of their respective owners.
3194.12 *
3194.13 * The contents of this file are subject to the terms of either the GNU
3194.14 * General Public License Version 2 only ("GPL") or the Common
3194.15 @@ -13,9 +16,9 @@
3194.16 * specific language governing permissions and limitations under the
3194.17 * License. When distributing the software, include this License Header
3194.18 * Notice in each file and include the License file at
3194.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3194.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3194.21 * particular file as subject to the "Classpath" exception as provided
3194.22 - * by Sun in the GPL Version 2 section of the License file that
3194.23 + * by Oracle in the GPL Version 2 section of the License file that
3194.24 * accompanied this code. If applicable, add the following below the
3194.25 * License Header, with the fields enclosed by brackets [] replaced by
3194.26 * your own identifying information:
3195.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/B.java Fri Jul 16 11:47:36 2010 -0400
3195.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/B.java Fri Jul 16 14:21:50 2010 -0400
3195.3 @@ -1,7 +1,10 @@
3195.4 /*
3195.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3195.6 *
3195.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3195.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3195.9 + *
3195.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3195.11 + * Other names may be trademarks of their respective owners.
3195.12 *
3195.13 * The contents of this file are subject to the terms of either the GNU
3195.14 * General Public License Version 2 only ("GPL") or the Common
3195.15 @@ -13,9 +16,9 @@
3195.16 * specific language governing permissions and limitations under the
3195.17 * License. When distributing the software, include this License Header
3195.18 * Notice in each file and include the License file at
3195.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3195.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3195.21 * particular file as subject to the "Classpath" exception as provided
3195.22 - * by Sun in the GPL Version 2 section of the License file that
3195.23 + * by Oracle in the GPL Version 2 section of the License file that
3195.24 * accompanied this code. If applicable, add the following below the
3195.25 * License Header, with the fields enclosed by brackets [] replaced by
3195.26 * your own identifying information:
3196.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Base.java Fri Jul 16 11:47:36 2010 -0400
3196.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Base.java Fri Jul 16 14:21:50 2010 -0400
3196.3 @@ -1,7 +1,10 @@
3196.4 /*
3196.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3196.6 *
3196.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3196.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3196.9 + *
3196.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3196.11 + * Other names may be trademarks of their respective owners.
3196.12 *
3196.13 * The contents of this file are subject to the terms of either the GNU
3196.14 * General Public License Version 2 only ("GPL") or the Common
3196.15 @@ -13,9 +16,9 @@
3196.16 * specific language governing permissions and limitations under the
3196.17 * License. When distributing the software, include this License Header
3196.18 * Notice in each file and include the License file at
3196.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3196.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3196.21 * particular file as subject to the "Classpath" exception as provided
3196.22 - * by Sun in the GPL Version 2 section of the License file that
3196.23 + * by Oracle in the GPL Version 2 section of the License file that
3196.24 * accompanied this code. If applicable, add the following below the
3196.25 * License Header, with the fields enclosed by brackets [] replaced by
3196.26 * your own identifying information:
3197.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Basefont.java Fri Jul 16 11:47:36 2010 -0400
3197.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Basefont.java Fri Jul 16 14:21:50 2010 -0400
3197.3 @@ -1,7 +1,10 @@
3197.4 /*
3197.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3197.6 *
3197.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3197.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3197.9 + *
3197.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3197.11 + * Other names may be trademarks of their respective owners.
3197.12 *
3197.13 * The contents of this file are subject to the terms of either the GNU
3197.14 * General Public License Version 2 only ("GPL") or the Common
3197.15 @@ -13,9 +16,9 @@
3197.16 * specific language governing permissions and limitations under the
3197.17 * License. When distributing the software, include this License Header
3197.18 * Notice in each file and include the License file at
3197.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3197.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3197.21 * particular file as subject to the "Classpath" exception as provided
3197.22 - * by Sun in the GPL Version 2 section of the License file that
3197.23 + * by Oracle in the GPL Version 2 section of the License file that
3197.24 * accompanied this code. If applicable, add the following below the
3197.25 * License Header, with the fields enclosed by brackets [] replaced by
3197.26 * your own identifying information:
3198.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Bdo.java Fri Jul 16 11:47:36 2010 -0400
3198.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Bdo.java Fri Jul 16 14:21:50 2010 -0400
3198.3 @@ -1,7 +1,10 @@
3198.4 /*
3198.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3198.6 *
3198.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3198.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3198.9 + *
3198.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3198.11 + * Other names may be trademarks of their respective owners.
3198.12 *
3198.13 * The contents of this file are subject to the terms of either the GNU
3198.14 * General Public License Version 2 only ("GPL") or the Common
3198.15 @@ -13,9 +16,9 @@
3198.16 * specific language governing permissions and limitations under the
3198.17 * License. When distributing the software, include this License Header
3198.18 * Notice in each file and include the License file at
3198.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3198.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3198.21 * particular file as subject to the "Classpath" exception as provided
3198.22 - * by Sun in the GPL Version 2 section of the License file that
3198.23 + * by Oracle in the GPL Version 2 section of the License file that
3198.24 * accompanied this code. If applicable, add the following below the
3198.25 * License Header, with the fields enclosed by brackets [] replaced by
3198.26 * your own identifying information:
3199.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Big.java Fri Jul 16 11:47:36 2010 -0400
3199.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Big.java Fri Jul 16 14:21:50 2010 -0400
3199.3 @@ -1,7 +1,10 @@
3199.4 /*
3199.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3199.6 *
3199.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3199.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3199.9 + *
3199.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3199.11 + * Other names may be trademarks of their respective owners.
3199.12 *
3199.13 * The contents of this file are subject to the terms of either the GNU
3199.14 * General Public License Version 2 only ("GPL") or the Common
3199.15 @@ -13,9 +16,9 @@
3199.16 * specific language governing permissions and limitations under the
3199.17 * License. When distributing the software, include this License Header
3199.18 * Notice in each file and include the License file at
3199.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3199.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3199.21 * particular file as subject to the "Classpath" exception as provided
3199.22 - * by Sun in the GPL Version 2 section of the License file that
3199.23 + * by Oracle in the GPL Version 2 section of the License file that
3199.24 * accompanied this code. If applicable, add the following below the
3199.25 * License Header, with the fields enclosed by brackets [] replaced by
3199.26 * your own identifying information:
3200.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Blockquote.java Fri Jul 16 11:47:36 2010 -0400
3200.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Blockquote.java Fri Jul 16 14:21:50 2010 -0400
3200.3 @@ -1,7 +1,10 @@
3200.4 /*
3200.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3200.6 *
3200.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3200.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3200.9 + *
3200.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3200.11 + * Other names may be trademarks of their respective owners.
3200.12 *
3200.13 * The contents of this file are subject to the terms of either the GNU
3200.14 * General Public License Version 2 only ("GPL") or the Common
3200.15 @@ -13,9 +16,9 @@
3200.16 * specific language governing permissions and limitations under the
3200.17 * License. When distributing the software, include this License Header
3200.18 * Notice in each file and include the License file at
3200.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3200.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3200.21 * particular file as subject to the "Classpath" exception as provided
3200.22 - * by Sun in the GPL Version 2 section of the License file that
3200.23 + * by Oracle in the GPL Version 2 section of the License file that
3200.24 * accompanied this code. If applicable, add the following below the
3200.25 * License Header, with the fields enclosed by brackets [] replaced by
3200.26 * your own identifying information:
3201.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/BlockquoteBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3201.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/BlockquoteBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3201.3 @@ -2,7 +2,10 @@
3201.4 /*
3201.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3201.6 *
3201.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3201.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3201.9 + *
3201.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3201.11 + * Other names may be trademarks of their respective owners.
3201.12 *
3201.13 * The contents of this file are subject to the terms of either the GNU
3201.14 * General Public License Version 2 only ("GPL") or the Common
3201.15 @@ -14,9 +17,9 @@
3201.16 * specific language governing permissions and limitations under the
3201.17 * License. When distributing the software, include this License Header
3201.18 * Notice in each file and include the License file at
3201.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3201.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3201.21 * particular file as subject to the "Classpath" exception as provided
3201.22 - * by Sun in the GPL Version 2 section of the License file that
3201.23 + * by Oracle in the GPL Version 2 section of the License file that
3201.24 * accompanied this code. If applicable, add the following below the
3201.25 * License Header, with the fields enclosed by brackets [] replaced by
3201.26 * your own identifying information:
3202.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/BlockquoteDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3202.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/BlockquoteDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3202.3 @@ -1,7 +1,10 @@
3202.4 /*
3202.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3202.6 *
3202.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3202.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3202.9 + *
3202.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3202.11 + * Other names may be trademarks of their respective owners.
3202.12 *
3202.13 * The contents of this file are subject to the terms of either the GNU
3202.14 * General Public License Version 2 only ("GPL") or the Common
3202.15 @@ -13,9 +16,9 @@
3202.16 * specific language governing permissions and limitations under the
3202.17 * License. When distributing the software, include this License Header
3202.18 * Notice in each file and include the License file at
3202.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3202.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3202.21 * particular file as subject to the "Classpath" exception as provided
3202.22 - * by Sun in the GPL Version 2 section of the License file that
3202.23 + * by Oracle in the GPL Version 2 section of the License file that
3202.24 * accompanied this code. If applicable, add the following below the
3202.25 * License Header, with the fields enclosed by brackets [] replaced by
3202.26 * your own identifying information:
3203.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Body.java Fri Jul 16 11:47:36 2010 -0400
3203.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Body.java Fri Jul 16 14:21:50 2010 -0400
3203.3 @@ -1,7 +1,10 @@
3203.4 /*
3203.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3203.6 *
3203.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3203.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3203.9 + *
3203.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3203.11 + * Other names may be trademarks of their respective owners.
3203.12 *
3203.13 * The contents of this file are subject to the terms of either the GNU
3203.14 * General Public License Version 2 only ("GPL") or the Common
3203.15 @@ -13,9 +16,9 @@
3203.16 * specific language governing permissions and limitations under the
3203.17 * License. When distributing the software, include this License Header
3203.18 * Notice in each file and include the License file at
3203.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3203.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3203.21 * particular file as subject to the "Classpath" exception as provided
3203.22 - * by Sun in the GPL Version 2 section of the License file that
3203.23 + * by Oracle in the GPL Version 2 section of the License file that
3203.24 * accompanied this code. If applicable, add the following below the
3203.25 * License Header, with the fields enclosed by brackets [] replaced by
3203.26 * your own identifying information:
3204.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Br.java Fri Jul 16 11:47:36 2010 -0400
3204.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Br.java Fri Jul 16 14:21:50 2010 -0400
3204.3 @@ -1,7 +1,10 @@
3204.4 /*
3204.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3204.6 *
3204.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3204.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3204.9 + *
3204.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3204.11 + * Other names may be trademarks of their respective owners.
3204.12 *
3204.13 * The contents of this file are subject to the terms of either the GNU
3204.14 * General Public License Version 2 only ("GPL") or the Common
3204.15 @@ -13,9 +16,9 @@
3204.16 * specific language governing permissions and limitations under the
3204.17 * License. When distributing the software, include this License Header
3204.18 * Notice in each file and include the License file at
3204.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3204.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3204.21 * particular file as subject to the "Classpath" exception as provided
3204.22 - * by Sun in the GPL Version 2 section of the License file that
3204.23 + * by Oracle in the GPL Version 2 section of the License file that
3204.24 * accompanied this code. If applicable, add the following below the
3204.25 * License Header, with the fields enclosed by brackets [] replaced by
3204.26 * your own identifying information:
3205.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/BrDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3205.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/BrDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3205.3 @@ -1,7 +1,10 @@
3205.4 /*
3205.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3205.6 *
3205.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3205.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3205.9 + *
3205.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3205.11 + * Other names may be trademarks of their respective owners.
3205.12 *
3205.13 * The contents of this file are subject to the terms of either the GNU
3205.14 * General Public License Version 2 only ("GPL") or the Common
3205.15 @@ -13,9 +16,9 @@
3205.16 * specific language governing permissions and limitations under the
3205.17 * License. When distributing the software, include this License Header
3205.18 * Notice in each file and include the License file at
3205.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3205.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3205.21 * particular file as subject to the "Classpath" exception as provided
3205.22 - * by Sun in the GPL Version 2 section of the License file that
3205.23 + * by Oracle in the GPL Version 2 section of the License file that
3205.24 * accompanied this code. If applicable, add the following below the
3205.25 * License Header, with the fields enclosed by brackets [] replaced by
3205.26 * your own identifying information:
3206.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Bundle-JSF.properties Fri Jul 16 11:47:36 2010 -0400
3206.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Bundle-JSF.properties Fri Jul 16 14:21:50 2010 -0400
3206.3 @@ -1,6 +1,9 @@
3206.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3206.5 #
3206.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3206.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3206.8 +#
3206.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3206.10 +# Other names may be trademarks of their respective owners.
3206.11 #
3206.12 # The contents of this file are subject to the terms of either the GNU
3206.13 # General Public License Version 2 only ("GPL") or the Common
3206.14 @@ -12,9 +15,9 @@
3206.15 # specific language governing permissions and limitations under the
3206.16 # License. When distributing the software, include this License Header
3206.17 # Notice in each file and include the License file at
3206.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3206.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3206.20 # particular file as subject to the "Classpath" exception as provided
3206.21 -# by Sun in the GPL Version 2 section of the License file that
3206.22 +# by Oracle in the GPL Version 2 section of the License file that
3206.23 # accompanied this code. If applicable, add the following below the
3206.24 # License Header, with the fields enclosed by brackets [] replaced by
3206.25 # your own identifying information:
3207.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
3207.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
3207.3 @@ -1,6 +1,9 @@
3207.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3207.5 #
3207.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3207.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3207.8 +#
3207.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3207.10 +# Other names may be trademarks of their respective owners.
3207.11 #
3207.12 # The contents of this file are subject to the terms of either the GNU
3207.13 # General Public License Version 2 only ("GPL") or the Common
3207.14 @@ -12,9 +15,9 @@
3207.15 # specific language governing permissions and limitations under the
3207.16 # License. When distributing the software, include this License Header
3207.17 # Notice in each file and include the License file at
3207.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3207.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3207.20 # particular file as subject to the "Classpath" exception as provided
3207.21 -# by Sun in the GPL Version 2 section of the License file that
3207.22 +# by Oracle in the GPL Version 2 section of the License file that
3207.23 # accompanied this code. If applicable, add the following below the
3207.24 # License Header, with the fields enclosed by brackets [] replaced by
3207.25 # your own identifying information:
3208.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Button.java Fri Jul 16 11:47:36 2010 -0400
3208.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Button.java Fri Jul 16 14:21:50 2010 -0400
3208.3 @@ -1,7 +1,10 @@
3208.4 /*
3208.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3208.6 *
3208.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3208.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3208.9 + *
3208.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3208.11 + * Other names may be trademarks of their respective owners.
3208.12 *
3208.13 * The contents of this file are subject to the terms of either the GNU
3208.14 * General Public License Version 2 only ("GPL") or the Common
3208.15 @@ -13,9 +16,9 @@
3208.16 * specific language governing permissions and limitations under the
3208.17 * License. When distributing the software, include this License Header
3208.18 * Notice in each file and include the License file at
3208.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3208.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3208.21 * particular file as subject to the "Classpath" exception as provided
3208.22 - * by Sun in the GPL Version 2 section of the License file that
3208.23 + * by Oracle in the GPL Version 2 section of the License file that
3208.24 * accompanied this code. If applicable, add the following below the
3208.25 * License Header, with the fields enclosed by brackets [] replaced by
3208.26 * your own identifying information:
3209.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Caption.java Fri Jul 16 11:47:36 2010 -0400
3209.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Caption.java Fri Jul 16 14:21:50 2010 -0400
3209.3 @@ -1,7 +1,10 @@
3209.4 /*
3209.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3209.6 *
3209.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3209.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3209.9 + *
3209.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3209.11 + * Other names may be trademarks of their respective owners.
3209.12 *
3209.13 * The contents of this file are subject to the terms of either the GNU
3209.14 * General Public License Version 2 only ("GPL") or the Common
3209.15 @@ -13,9 +16,9 @@
3209.16 * specific language governing permissions and limitations under the
3209.17 * License. When distributing the software, include this License Header
3209.18 * Notice in each file and include the License file at
3209.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3209.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3209.21 * particular file as subject to the "Classpath" exception as provided
3209.22 - * by Sun in the GPL Version 2 section of the License file that
3209.23 + * by Oracle in the GPL Version 2 section of the License file that
3209.24 * accompanied this code. If applicable, add the following below the
3209.25 * License Header, with the fields enclosed by brackets [] replaced by
3209.26 * your own identifying information:
3210.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Center.java Fri Jul 16 11:47:36 2010 -0400
3210.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Center.java Fri Jul 16 14:21:50 2010 -0400
3210.3 @@ -1,7 +1,10 @@
3210.4 /*
3210.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3210.6 *
3210.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3210.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3210.9 + *
3210.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3210.11 + * Other names may be trademarks of their respective owners.
3210.12 *
3210.13 * The contents of this file are subject to the terms of either the GNU
3210.14 * General Public License Version 2 only ("GPL") or the Common
3210.15 @@ -13,9 +16,9 @@
3210.16 * specific language governing permissions and limitations under the
3210.17 * License. When distributing the software, include this License Header
3210.18 * Notice in each file and include the License file at
3210.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3210.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3210.21 * particular file as subject to the "Classpath" exception as provided
3210.22 - * by Sun in the GPL Version 2 section of the License file that
3210.23 + * by Oracle in the GPL Version 2 section of the License file that
3210.24 * accompanied this code. If applicable, add the following below the
3210.25 * License Header, with the fields enclosed by brackets [] replaced by
3210.26 * your own identifying information:
3211.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Cite.java Fri Jul 16 11:47:36 2010 -0400
3211.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Cite.java Fri Jul 16 14:21:50 2010 -0400
3211.3 @@ -1,7 +1,10 @@
3211.4 /*
3211.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3211.6 *
3211.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3211.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3211.9 + *
3211.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3211.11 + * Other names may be trademarks of their respective owners.
3211.12 *
3211.13 * The contents of this file are subject to the terms of either the GNU
3211.14 * General Public License Version 2 only ("GPL") or the Common
3211.15 @@ -13,9 +16,9 @@
3211.16 * specific language governing permissions and limitations under the
3211.17 * License. When distributing the software, include this License Header
3211.18 * Notice in each file and include the License file at
3211.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3211.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3211.21 * particular file as subject to the "Classpath" exception as provided
3211.22 - * by Sun in the GPL Version 2 section of the License file that
3211.23 + * by Oracle in the GPL Version 2 section of the License file that
3211.24 * accompanied this code. If applicable, add the following below the
3211.25 * License Header, with the fields enclosed by brackets [] replaced by
3211.26 * your own identifying information:
3212.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Code.java Fri Jul 16 11:47:36 2010 -0400
3212.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Code.java Fri Jul 16 14:21:50 2010 -0400
3212.3 @@ -1,7 +1,10 @@
3212.4 /*
3212.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3212.6 *
3212.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3212.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3212.9 + *
3212.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3212.11 + * Other names may be trademarks of their respective owners.
3212.12 *
3212.13 * The contents of this file are subject to the terms of either the GNU
3212.14 * General Public License Version 2 only ("GPL") or the Common
3212.15 @@ -13,9 +16,9 @@
3212.16 * specific language governing permissions and limitations under the
3212.17 * License. When distributing the software, include this License Header
3212.18 * Notice in each file and include the License file at
3212.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3212.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3212.21 * particular file as subject to the "Classpath" exception as provided
3212.22 - * by Sun in the GPL Version 2 section of the License file that
3212.23 + * by Oracle in the GPL Version 2 section of the License file that
3212.24 * accompanied this code. If applicable, add the following below the
3212.25 * License Header, with the fields enclosed by brackets [] replaced by
3212.26 * your own identifying information:
3213.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Col.java Fri Jul 16 11:47:36 2010 -0400
3213.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Col.java Fri Jul 16 14:21:50 2010 -0400
3213.3 @@ -1,7 +1,10 @@
3213.4 /*
3213.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3213.6 *
3213.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3213.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3213.9 + *
3213.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3213.11 + * Other names may be trademarks of their respective owners.
3213.12 *
3213.13 * The contents of this file are subject to the terms of either the GNU
3213.14 * General Public License Version 2 only ("GPL") or the Common
3213.15 @@ -13,9 +16,9 @@
3213.16 * specific language governing permissions and limitations under the
3213.17 * License. When distributing the software, include this License Header
3213.18 * Notice in each file and include the License file at
3213.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3213.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3213.21 * particular file as subject to the "Classpath" exception as provided
3213.22 - * by Sun in the GPL Version 2 section of the License file that
3213.23 + * by Oracle in the GPL Version 2 section of the License file that
3213.24 * accompanied this code. If applicable, add the following below the
3213.25 * License Header, with the fields enclosed by brackets [] replaced by
3213.26 * your own identifying information:
3214.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Colgroup.java Fri Jul 16 11:47:36 2010 -0400
3214.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Colgroup.java Fri Jul 16 14:21:50 2010 -0400
3214.3 @@ -1,7 +1,10 @@
3214.4 /*
3214.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3214.6 *
3214.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3214.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3214.9 + *
3214.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3214.11 + * Other names may be trademarks of their respective owners.
3214.12 *
3214.13 * The contents of this file are subject to the terms of either the GNU
3214.14 * General Public License Version 2 only ("GPL") or the Common
3214.15 @@ -13,9 +16,9 @@
3214.16 * specific language governing permissions and limitations under the
3214.17 * License. When distributing the software, include this License Header
3214.18 * Notice in each file and include the License file at
3214.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3214.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3214.21 * particular file as subject to the "Classpath" exception as provided
3214.22 - * by Sun in the GPL Version 2 section of the License file that
3214.23 + * by Oracle in the GPL Version 2 section of the License file that
3214.24 * accompanied this code. If applicable, add the following below the
3214.25 * License Header, with the fields enclosed by brackets [] replaced by
3214.26 * your own identifying information:
3215.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dd.java Fri Jul 16 11:47:36 2010 -0400
3215.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dd.java Fri Jul 16 14:21:50 2010 -0400
3215.3 @@ -1,7 +1,10 @@
3215.4 /*
3215.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3215.6 *
3215.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3215.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3215.9 + *
3215.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3215.11 + * Other names may be trademarks of their respective owners.
3215.12 *
3215.13 * The contents of this file are subject to the terms of either the GNU
3215.14 * General Public License Version 2 only ("GPL") or the Common
3215.15 @@ -13,9 +16,9 @@
3215.16 * specific language governing permissions and limitations under the
3215.17 * License. When distributing the software, include this License Header
3215.18 * Notice in each file and include the License file at
3215.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3215.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3215.21 * particular file as subject to the "Classpath" exception as provided
3215.22 - * by Sun in the GPL Version 2 section of the License file that
3215.23 + * by Oracle in the GPL Version 2 section of the License file that
3215.24 * accompanied this code. If applicable, add the following below the
3215.25 * License Header, with the fields enclosed by brackets [] replaced by
3215.26 * your own identifying information:
3216.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Del.java Fri Jul 16 11:47:36 2010 -0400
3216.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Del.java Fri Jul 16 14:21:50 2010 -0400
3216.3 @@ -1,7 +1,10 @@
3216.4 /*
3216.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3216.6 *
3216.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3216.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3216.9 + *
3216.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3216.11 + * Other names may be trademarks of their respective owners.
3216.12 *
3216.13 * The contents of this file are subject to the terms of either the GNU
3216.14 * General Public License Version 2 only ("GPL") or the Common
3216.15 @@ -13,9 +16,9 @@
3216.16 * specific language governing permissions and limitations under the
3216.17 * License. When distributing the software, include this License Header
3216.18 * Notice in each file and include the License file at
3216.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3216.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3216.21 * particular file as subject to the "Classpath" exception as provided
3216.22 - * by Sun in the GPL Version 2 section of the License file that
3216.23 + * by Oracle in the GPL Version 2 section of the License file that
3216.24 * accompanied this code. If applicable, add the following below the
3216.25 * License Header, with the fields enclosed by brackets [] replaced by
3216.26 * your own identifying information:
3217.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dfn.java Fri Jul 16 11:47:36 2010 -0400
3217.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dfn.java Fri Jul 16 14:21:50 2010 -0400
3217.3 @@ -1,7 +1,10 @@
3217.4 /*
3217.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3217.6 *
3217.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3217.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3217.9 + *
3217.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3217.11 + * Other names may be trademarks of their respective owners.
3217.12 *
3217.13 * The contents of this file are subject to the terms of either the GNU
3217.14 * General Public License Version 2 only ("GPL") or the Common
3217.15 @@ -13,9 +16,9 @@
3217.16 * specific language governing permissions and limitations under the
3217.17 * License. When distributing the software, include this License Header
3217.18 * Notice in each file and include the License file at
3217.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3217.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3217.21 * particular file as subject to the "Classpath" exception as provided
3217.22 - * by Sun in the GPL Version 2 section of the License file that
3217.23 + * by Oracle in the GPL Version 2 section of the License file that
3217.24 * accompanied this code. If applicable, add the following below the
3217.25 * License Header, with the fields enclosed by brackets [] replaced by
3217.26 * your own identifying information:
3218.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dir.java Fri Jul 16 11:47:36 2010 -0400
3218.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dir.java Fri Jul 16 14:21:50 2010 -0400
3218.3 @@ -1,7 +1,10 @@
3218.4 /*
3218.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3218.6 *
3218.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3218.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3218.9 + *
3218.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3218.11 + * Other names may be trademarks of their respective owners.
3218.12 *
3218.13 * The contents of this file are subject to the terms of either the GNU
3218.14 * General Public License Version 2 only ("GPL") or the Common
3218.15 @@ -13,9 +16,9 @@
3218.16 * specific language governing permissions and limitations under the
3218.17 * License. When distributing the software, include this License Header
3218.18 * Notice in each file and include the License file at
3218.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3218.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3218.21 * particular file as subject to the "Classpath" exception as provided
3218.22 - * by Sun in the GPL Version 2 section of the License file that
3218.23 + * by Oracle in the GPL Version 2 section of the License file that
3218.24 * accompanied this code. If applicable, add the following below the
3218.25 * License Header, with the fields enclosed by brackets [] replaced by
3218.26 * your own identifying information:
3219.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Div.java Fri Jul 16 11:47:36 2010 -0400
3219.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Div.java Fri Jul 16 14:21:50 2010 -0400
3219.3 @@ -1,7 +1,10 @@
3219.4 /*
3219.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3219.6 *
3219.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3219.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3219.9 + *
3219.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3219.11 + * Other names may be trademarks of their respective owners.
3219.12 *
3219.13 * The contents of this file are subject to the terms of either the GNU
3219.14 * General Public License Version 2 only ("GPL") or the Common
3219.15 @@ -13,9 +16,9 @@
3219.16 * specific language governing permissions and limitations under the
3219.17 * License. When distributing the software, include this License Header
3219.18 * Notice in each file and include the License file at
3219.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3219.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3219.21 * particular file as subject to the "Classpath" exception as provided
3219.22 - * by Sun in the GPL Version 2 section of the License file that
3219.23 + * by Oracle in the GPL Version 2 section of the License file that
3219.24 * accompanied this code. If applicable, add the following below the
3219.25 * License Header, with the fields enclosed by brackets [] replaced by
3219.26 * your own identifying information:
3220.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/DivBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3220.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/DivBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3220.3 @@ -2,7 +2,10 @@
3220.4 /*
3220.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3220.6 *
3220.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3220.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3220.9 + *
3220.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3220.11 + * Other names may be trademarks of their respective owners.
3220.12 *
3220.13 * The contents of this file are subject to the terms of either the GNU
3220.14 * General Public License Version 2 only ("GPL") or the Common
3220.15 @@ -14,9 +17,9 @@
3220.16 * specific language governing permissions and limitations under the
3220.17 * License. When distributing the software, include this License Header
3220.18 * Notice in each file and include the License file at
3220.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3220.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3220.21 * particular file as subject to the "Classpath" exception as provided
3220.22 - * by Sun in the GPL Version 2 section of the License file that
3220.23 + * by Oracle in the GPL Version 2 section of the License file that
3220.24 * accompanied this code. If applicable, add the following below the
3220.25 * License Header, with the fields enclosed by brackets [] replaced by
3220.26 * your own identifying information:
3221.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/DivDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3221.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/DivDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3221.3 @@ -1,7 +1,10 @@
3221.4 /*
3221.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3221.6 *
3221.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3221.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3221.9 + *
3221.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3221.11 + * Other names may be trademarks of their respective owners.
3221.12 *
3221.13 * The contents of this file are subject to the terms of either the GNU
3221.14 * General Public License Version 2 only ("GPL") or the Common
3221.15 @@ -13,9 +16,9 @@
3221.16 * specific language governing permissions and limitations under the
3221.17 * License. When distributing the software, include this License Header
3221.18 * Notice in each file and include the License file at
3221.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3221.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3221.21 * particular file as subject to the "Classpath" exception as provided
3221.22 - * by Sun in the GPL Version 2 section of the License file that
3221.23 + * by Oracle in the GPL Version 2 section of the License file that
3221.24 * accompanied this code. If applicable, add the following below the
3221.25 * License Header, with the fields enclosed by brackets [] replaced by
3221.26 * your own identifying information:
3222.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dl.java Fri Jul 16 11:47:36 2010 -0400
3222.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dl.java Fri Jul 16 14:21:50 2010 -0400
3222.3 @@ -1,7 +1,10 @@
3222.4 /*
3222.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3222.6 *
3222.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3222.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3222.9 + *
3222.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3222.11 + * Other names may be trademarks of their respective owners.
3222.12 *
3222.13 * The contents of this file are subject to the terms of either the GNU
3222.14 * General Public License Version 2 only ("GPL") or the Common
3222.15 @@ -13,9 +16,9 @@
3222.16 * specific language governing permissions and limitations under the
3222.17 * License. When distributing the software, include this License Header
3222.18 * Notice in each file and include the License file at
3222.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3222.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3222.21 * particular file as subject to the "Classpath" exception as provided
3222.22 - * by Sun in the GPL Version 2 section of the License file that
3222.23 + * by Oracle in the GPL Version 2 section of the License file that
3222.24 * accompanied this code. If applicable, add the following below the
3222.25 * License Header, with the fields enclosed by brackets [] replaced by
3222.26 * your own identifying information:
3223.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dt.java Fri Jul 16 11:47:36 2010 -0400
3223.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Dt.java Fri Jul 16 14:21:50 2010 -0400
3223.3 @@ -1,7 +1,10 @@
3223.4 /*
3223.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3223.6 *
3223.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3223.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3223.9 + *
3223.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3223.11 + * Other names may be trademarks of their respective owners.
3223.12 *
3223.13 * The contents of this file are subject to the terms of either the GNU
3223.14 * General Public License Version 2 only ("GPL") or the Common
3223.15 @@ -13,9 +16,9 @@
3223.16 * specific language governing permissions and limitations under the
3223.17 * License. When distributing the software, include this License Header
3223.18 * Notice in each file and include the License file at
3223.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3223.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3223.21 * particular file as subject to the "Classpath" exception as provided
3223.22 - * by Sun in the GPL Version 2 section of the License file that
3223.23 + * by Oracle in the GPL Version 2 section of the License file that
3223.24 * accompanied this code. If applicable, add the following below the
3223.25 * License Header, with the fields enclosed by brackets [] replaced by
3223.26 * your own identifying information:
3224.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Em.java Fri Jul 16 11:47:36 2010 -0400
3224.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Em.java Fri Jul 16 14:21:50 2010 -0400
3224.3 @@ -1,7 +1,10 @@
3224.4 /*
3224.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3224.6 *
3224.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3224.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3224.9 + *
3224.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3224.11 + * Other names may be trademarks of their respective owners.
3224.12 *
3224.13 * The contents of this file are subject to the terms of either the GNU
3224.14 * General Public License Version 2 only ("GPL") or the Common
3224.15 @@ -13,9 +16,9 @@
3224.16 * specific language governing permissions and limitations under the
3224.17 * License. When distributing the software, include this License Header
3224.18 * Notice in each file and include the License file at
3224.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3224.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3224.21 * particular file as subject to the "Classpath" exception as provided
3224.22 - * by Sun in the GPL Version 2 section of the License file that
3224.23 + * by Oracle in the GPL Version 2 section of the License file that
3224.24 * accompanied this code. If applicable, add the following below the
3224.25 * License Header, with the fields enclosed by brackets [] replaced by
3224.26 * your own identifying information:
3225.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ActionListener.java Fri Jul 16 11:47:36 2010 -0400
3225.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ActionListener.java Fri Jul 16 14:21:50 2010 -0400
3225.3 @@ -1,7 +1,10 @@
3225.4 /*
3225.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3225.6 *
3225.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3225.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3225.9 + *
3225.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3225.11 + * Other names may be trademarks of their respective owners.
3225.12 *
3225.13 * The contents of this file are subject to the terms of either the GNU
3225.14 * General Public License Version 2 only ("GPL") or the Common
3225.15 @@ -13,9 +16,9 @@
3225.16 * specific language governing permissions and limitations under the
3225.17 * License. When distributing the software, include this License Header
3225.18 * Notice in each file and include the License file at
3225.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3225.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3225.21 * particular file as subject to the "Classpath" exception as provided
3225.22 - * by Sun in the GPL Version 2 section of the License file that
3225.23 + * by Oracle in the GPL Version 2 section of the License file that
3225.24 * accompanied this code. If applicable, add the following below the
3225.25 * License Header, with the fields enclosed by brackets [] replaced by
3225.26 * your own identifying information:
3226.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ActionListenerBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3226.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ActionListenerBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3226.3 @@ -2,7 +2,10 @@
3226.4 /*
3226.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3226.6 *
3226.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3226.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3226.9 + *
3226.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3226.11 + * Other names may be trademarks of their respective owners.
3226.12 *
3226.13 * The contents of this file are subject to the terms of either the GNU
3226.14 * General Public License Version 2 only ("GPL") or the Common
3226.15 @@ -14,9 +17,9 @@
3226.16 * specific language governing permissions and limitations under the
3226.17 * License. When distributing the software, include this License Header
3226.18 * Notice in each file and include the License file at
3226.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3226.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3226.21 * particular file as subject to the "Classpath" exception as provided
3226.22 - * by Sun in the GPL Version 2 section of the License file that
3226.23 + * by Oracle in the GPL Version 2 section of the License file that
3226.24 * accompanied this code. If applicable, add the following below the
3226.25 * License Header, with the fields enclosed by brackets [] replaced by
3226.26 * your own identifying information:
3227.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_Converter.java Fri Jul 16 11:47:36 2010 -0400
3227.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_Converter.java Fri Jul 16 14:21:50 2010 -0400
3227.3 @@ -1,7 +1,10 @@
3227.4 /*
3227.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3227.6 *
3227.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3227.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3227.9 + *
3227.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3227.11 + * Other names may be trademarks of their respective owners.
3227.12 *
3227.13 * The contents of this file are subject to the terms of either the GNU
3227.14 * General Public License Version 2 only ("GPL") or the Common
3227.15 @@ -13,9 +16,9 @@
3227.16 * specific language governing permissions and limitations under the
3227.17 * License. When distributing the software, include this License Header
3227.18 * Notice in each file and include the License file at
3227.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3227.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3227.21 * particular file as subject to the "Classpath" exception as provided
3227.22 - * by Sun in the GPL Version 2 section of the License file that
3227.23 + * by Oracle in the GPL Version 2 section of the License file that
3227.24 * accompanied this code. If applicable, add the following below the
3227.25 * License Header, with the fields enclosed by brackets [] replaced by
3227.26 * your own identifying information:
3228.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ConverterBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3228.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ConverterBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3228.3 @@ -2,7 +2,10 @@
3228.4 /*
3228.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3228.6 *
3228.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3228.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3228.9 + *
3228.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3228.11 + * Other names may be trademarks of their respective owners.
3228.12 *
3228.13 * The contents of this file are subject to the terms of either the GNU
3228.14 * General Public License Version 2 only ("GPL") or the Common
3228.15 @@ -14,9 +17,9 @@
3228.16 * specific language governing permissions and limitations under the
3228.17 * License. When distributing the software, include this License Header
3228.18 * Notice in each file and include the License file at
3228.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3228.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3228.21 * particular file as subject to the "Classpath" exception as provided
3228.22 - * by Sun in the GPL Version 2 section of the License file that
3228.23 + * by Oracle in the GPL Version 2 section of the License file that
3228.24 * accompanied this code. If applicable, add the following below the
3228.25 * License Header, with the fields enclosed by brackets [] replaced by
3228.26 * your own identifying information:
3229.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_LoadBundle.java Fri Jul 16 11:47:36 2010 -0400
3229.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_LoadBundle.java Fri Jul 16 14:21:50 2010 -0400
3229.3 @@ -1,7 +1,10 @@
3229.4 /*
3229.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3229.6 *
3229.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3229.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3229.9 + *
3229.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3229.11 + * Other names may be trademarks of their respective owners.
3229.12 *
3229.13 * The contents of this file are subject to the terms of either the GNU
3229.14 * General Public License Version 2 only ("GPL") or the Common
3229.15 @@ -13,9 +16,9 @@
3229.16 * specific language governing permissions and limitations under the
3229.17 * License. When distributing the software, include this License Header
3229.18 * Notice in each file and include the License file at
3229.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3229.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3229.21 * particular file as subject to the "Classpath" exception as provided
3229.22 - * by Sun in the GPL Version 2 section of the License file that
3229.23 + * by Oracle in the GPL Version 2 section of the License file that
3229.24 * accompanied this code. If applicable, add the following below the
3229.25 * License Header, with the fields enclosed by brackets [] replaced by
3229.26 * your own identifying information:
3230.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_LoadBundleBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3230.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_LoadBundleBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3230.3 @@ -2,7 +2,10 @@
3230.4 /*
3230.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3230.6 *
3230.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3230.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3230.9 + *
3230.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3230.11 + * Other names may be trademarks of their respective owners.
3230.12 *
3230.13 * The contents of this file are subject to the terms of either the GNU
3230.14 * General Public License Version 2 only ("GPL") or the Common
3230.15 @@ -14,9 +17,9 @@
3230.16 * specific language governing permissions and limitations under the
3230.17 * License. When distributing the software, include this License Header
3230.18 * Notice in each file and include the License file at
3230.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3230.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3230.21 * particular file as subject to the "Classpath" exception as provided
3230.22 - * by Sun in the GPL Version 2 section of the License file that
3230.23 + * by Oracle in the GPL Version 2 section of the License file that
3230.24 * accompanied this code. If applicable, add the following below the
3230.25 * License Header, with the fields enclosed by brackets [] replaced by
3230.26 * your own identifying information:
3231.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_LoadBundleDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3231.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_LoadBundleDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3231.3 @@ -1,7 +1,10 @@
3231.4 /*
3231.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3231.6 *
3231.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3231.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3231.9 + *
3231.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3231.11 + * Other names may be trademarks of their respective owners.
3231.12 *
3231.13 * The contents of this file are subject to the terms of either the GNU
3231.14 * General Public License Version 2 only ("GPL") or the Common
3231.15 @@ -13,9 +16,9 @@
3231.16 * specific language governing permissions and limitations under the
3231.17 * License. When distributing the software, include this License Header
3231.18 * Notice in each file and include the License file at
3231.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3231.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3231.21 * particular file as subject to the "Classpath" exception as provided
3231.22 - * by Sun in the GPL Version 2 section of the License file that
3231.23 + * by Oracle in the GPL Version 2 section of the License file that
3231.24 * accompanied this code. If applicable, add the following below the
3231.25 * License Header, with the fields enclosed by brackets [] replaced by
3231.26 * your own identifying information:
3232.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_Subview.java Fri Jul 16 11:47:36 2010 -0400
3232.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_Subview.java Fri Jul 16 14:21:50 2010 -0400
3232.3 @@ -1,7 +1,10 @@
3232.4 /*
3232.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3232.6 *
3232.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3232.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3232.9 + *
3232.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3232.11 + * Other names may be trademarks of their respective owners.
3232.12 *
3232.13 * The contents of this file are subject to the terms of either the GNU
3232.14 * General Public License Version 2 only ("GPL") or the Common
3232.15 @@ -13,9 +16,9 @@
3232.16 * specific language governing permissions and limitations under the
3232.17 * License. When distributing the software, include this License Header
3232.18 * Notice in each file and include the License file at
3232.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3232.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3232.21 * particular file as subject to the "Classpath" exception as provided
3232.22 - * by Sun in the GPL Version 2 section of the License file that
3232.23 + * by Oracle in the GPL Version 2 section of the License file that
3232.24 * accompanied this code. If applicable, add the following below the
3232.25 * License Header, with the fields enclosed by brackets [] replaced by
3232.26 * your own identifying information:
3233.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_SubviewBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3233.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_SubviewBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3233.3 @@ -2,7 +2,10 @@
3233.4 /*
3233.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3233.6 *
3233.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3233.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3233.9 + *
3233.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3233.11 + * Other names may be trademarks of their respective owners.
3233.12 *
3233.13 * The contents of this file are subject to the terms of either the GNU
3233.14 * General Public License Version 2 only ("GPL") or the Common
3233.15 @@ -14,9 +17,9 @@
3233.16 * specific language governing permissions and limitations under the
3233.17 * License. When distributing the software, include this License Header
3233.18 * Notice in each file and include the License file at
3233.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3233.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3233.21 * particular file as subject to the "Classpath" exception as provided
3233.22 - * by Sun in the GPL Version 2 section of the License file that
3233.23 + * by Oracle in the GPL Version 2 section of the License file that
3233.24 * accompanied this code. If applicable, add the following below the
3233.25 * License Header, with the fields enclosed by brackets [] replaced by
3233.26 * your own identifying information:
3234.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_Validator.java Fri Jul 16 11:47:36 2010 -0400
3234.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_Validator.java Fri Jul 16 14:21:50 2010 -0400
3234.3 @@ -1,7 +1,10 @@
3234.4 /*
3234.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3234.6 *
3234.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3234.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3234.9 + *
3234.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3234.11 + * Other names may be trademarks of their respective owners.
3234.12 *
3234.13 * The contents of this file are subject to the terms of either the GNU
3234.14 * General Public License Version 2 only ("GPL") or the Common
3234.15 @@ -13,9 +16,9 @@
3234.16 * specific language governing permissions and limitations under the
3234.17 * License. When distributing the software, include this License Header
3234.18 * Notice in each file and include the License file at
3234.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3234.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3234.21 * particular file as subject to the "Classpath" exception as provided
3234.22 - * by Sun in the GPL Version 2 section of the License file that
3234.23 + * by Oracle in the GPL Version 2 section of the License file that
3234.24 * accompanied this code. If applicable, add the following below the
3234.25 * License Header, with the fields enclosed by brackets [] replaced by
3234.26 * your own identifying information:
3235.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ValidatorBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3235.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ValidatorBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3235.3 @@ -2,7 +2,10 @@
3235.4 /*
3235.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3235.6 *
3235.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3235.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3235.9 + *
3235.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3235.11 + * Other names may be trademarks of their respective owners.
3235.12 *
3235.13 * The contents of this file are subject to the terms of either the GNU
3235.14 * General Public License Version 2 only ("GPL") or the Common
3235.15 @@ -14,9 +17,9 @@
3235.16 * specific language governing permissions and limitations under the
3235.17 * License. When distributing the software, include this License Header
3235.18 * Notice in each file and include the License file at
3235.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3235.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3235.21 * particular file as subject to the "Classpath" exception as provided
3235.22 - * by Sun in the GPL Version 2 section of the License file that
3235.23 + * by Oracle in the GPL Version 2 section of the License file that
3235.24 * accompanied this code. If applicable, add the following below the
3235.25 * License Header, with the fields enclosed by brackets [] replaced by
3235.26 * your own identifying information:
3236.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ValueChangeListener.java Fri Jul 16 11:47:36 2010 -0400
3236.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ValueChangeListener.java Fri Jul 16 14:21:50 2010 -0400
3236.3 @@ -1,7 +1,10 @@
3236.4 /*
3236.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3236.6 *
3236.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3236.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3236.9 + *
3236.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3236.11 + * Other names may be trademarks of their respective owners.
3236.12 *
3236.13 * The contents of this file are subject to the terms of either the GNU
3236.14 * General Public License Version 2 only ("GPL") or the Common
3236.15 @@ -13,9 +16,9 @@
3236.16 * specific language governing permissions and limitations under the
3236.17 * License. When distributing the software, include this License Header
3236.18 * Notice in each file and include the License file at
3236.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3236.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3236.21 * particular file as subject to the "Classpath" exception as provided
3236.22 - * by Sun in the GPL Version 2 section of the License file that
3236.23 + * by Oracle in the GPL Version 2 section of the License file that
3236.24 * accompanied this code. If applicable, add the following below the
3236.25 * License Header, with the fields enclosed by brackets [] replaced by
3236.26 * your own identifying information:
3237.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ValueChangeListenerBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3237.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_ValueChangeListenerBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3237.3 @@ -2,7 +2,10 @@
3237.4 /*
3237.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3237.6 *
3237.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3237.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3237.9 + *
3237.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3237.11 + * Other names may be trademarks of their respective owners.
3237.12 *
3237.13 * The contents of this file are subject to the terms of either the GNU
3237.14 * General Public License Version 2 only ("GPL") or the Common
3237.15 @@ -14,9 +17,9 @@
3237.16 * specific language governing permissions and limitations under the
3237.17 * License. When distributing the software, include this License Header
3237.18 * Notice in each file and include the License file at
3237.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3237.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3237.21 * particular file as subject to the "Classpath" exception as provided
3237.22 - * by Sun in the GPL Version 2 section of the License file that
3237.23 + * by Oracle in the GPL Version 2 section of the License file that
3237.24 * accompanied this code. If applicable, add the following below the
3237.25 * License Header, with the fields enclosed by brackets [] replaced by
3237.26 * your own identifying information:
3238.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_Verbatim.java Fri Jul 16 11:47:36 2010 -0400
3238.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_Verbatim.java Fri Jul 16 14:21:50 2010 -0400
3238.3 @@ -1,7 +1,10 @@
3238.4 /*
3238.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3238.6 *
3238.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3238.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3238.9 + *
3238.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3238.11 + * Other names may be trademarks of their respective owners.
3238.12 *
3238.13 * The contents of this file are subject to the terms of either the GNU
3238.14 * General Public License Version 2 only ("GPL") or the Common
3238.15 @@ -13,9 +16,9 @@
3238.16 * specific language governing permissions and limitations under the
3238.17 * License. When distributing the software, include this License Header
3238.18 * Notice in each file and include the License file at
3238.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3238.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3238.21 * particular file as subject to the "Classpath" exception as provided
3238.22 - * by Sun in the GPL Version 2 section of the License file that
3238.23 + * by Oracle in the GPL Version 2 section of the License file that
3238.24 * accompanied this code. If applicable, add the following below the
3238.25 * License Header, with the fields enclosed by brackets [] replaced by
3238.26 * your own identifying information:
3239.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_VerbatimBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3239.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/F_VerbatimBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3239.3 @@ -2,7 +2,10 @@
3239.4 /*
3239.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3239.6 *
3239.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3239.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3239.9 + *
3239.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3239.11 + * Other names may be trademarks of their respective owners.
3239.12 *
3239.13 * The contents of this file are subject to the terms of either the GNU
3239.14 * General Public License Version 2 only ("GPL") or the Common
3239.15 @@ -14,9 +17,9 @@
3239.16 * specific language governing permissions and limitations under the
3239.17 * License. When distributing the software, include this License Header
3239.18 * Notice in each file and include the License file at
3239.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3239.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3239.21 * particular file as subject to the "Classpath" exception as provided
3239.22 - * by Sun in the GPL Version 2 section of the License file that
3239.23 + * by Oracle in the GPL Version 2 section of the License file that
3239.24 * accompanied this code. If applicable, add the following below the
3239.25 * License Header, with the fields enclosed by brackets [] replaced by
3239.26 * your own identifying information:
3240.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Fieldset.java Fri Jul 16 11:47:36 2010 -0400
3240.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Fieldset.java Fri Jul 16 14:21:50 2010 -0400
3240.3 @@ -1,7 +1,10 @@
3240.4 /*
3240.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3240.6 *
3240.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3240.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3240.9 + *
3240.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3240.11 + * Other names may be trademarks of their respective owners.
3240.12 *
3240.13 * The contents of this file are subject to the terms of either the GNU
3240.14 * General Public License Version 2 only ("GPL") or the Common
3240.15 @@ -13,9 +16,9 @@
3240.16 * specific language governing permissions and limitations under the
3240.17 * License. When distributing the software, include this License Header
3240.18 * Notice in each file and include the License file at
3240.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3240.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3240.21 * particular file as subject to the "Classpath" exception as provided
3240.22 - * by Sun in the GPL Version 2 section of the License file that
3240.23 + * by Oracle in the GPL Version 2 section of the License file that
3240.24 * accompanied this code. If applicable, add the following below the
3240.25 * License Header, with the fields enclosed by brackets [] replaced by
3240.26 * your own identifying information:
3241.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Font.java Fri Jul 16 11:47:36 2010 -0400
3241.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Font.java Fri Jul 16 14:21:50 2010 -0400
3241.3 @@ -1,7 +1,10 @@
3241.4 /*
3241.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3241.6 *
3241.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3241.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3241.9 + *
3241.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3241.11 + * Other names may be trademarks of their respective owners.
3241.12 *
3241.13 * The contents of this file are subject to the terms of either the GNU
3241.14 * General Public License Version 2 only ("GPL") or the Common
3241.15 @@ -13,9 +16,9 @@
3241.16 * specific language governing permissions and limitations under the
3241.17 * License. When distributing the software, include this License Header
3241.18 * Notice in each file and include the License file at
3241.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3241.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3241.21 * particular file as subject to the "Classpath" exception as provided
3241.22 - * by Sun in the GPL Version 2 section of the License file that
3241.23 + * by Oracle in the GPL Version 2 section of the License file that
3241.24 * accompanied this code. If applicable, add the following below the
3241.25 * License Header, with the fields enclosed by brackets [] replaced by
3241.26 * your own identifying information:
3242.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Form.java Fri Jul 16 11:47:36 2010 -0400
3242.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Form.java Fri Jul 16 14:21:50 2010 -0400
3242.3 @@ -1,7 +1,10 @@
3242.4 /*
3242.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3242.6 *
3242.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3242.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3242.9 + *
3242.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3242.11 + * Other names may be trademarks of their respective owners.
3242.12 *
3242.13 * The contents of this file are subject to the terms of either the GNU
3242.14 * General Public License Version 2 only ("GPL") or the Common
3242.15 @@ -13,9 +16,9 @@
3242.16 * specific language governing permissions and limitations under the
3242.17 * License. When distributing the software, include this License Header
3242.18 * Notice in each file and include the License file at
3242.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3242.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3242.21 * particular file as subject to the "Classpath" exception as provided
3242.22 - * by Sun in the GPL Version 2 section of the License file that
3242.23 + * by Oracle in the GPL Version 2 section of the License file that
3242.24 * accompanied this code. If applicable, add the following below the
3242.25 * License Header, with the fields enclosed by brackets [] replaced by
3242.26 * your own identifying information:
3243.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FormNamePanel.java Fri Jul 16 11:47:36 2010 -0400
3243.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FormNamePanel.java Fri Jul 16 14:21:50 2010 -0400
3243.3 @@ -1,7 +1,10 @@
3243.4 /*
3243.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3243.6 *
3243.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3243.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3243.9 + *
3243.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3243.11 + * Other names may be trademarks of their respective owners.
3243.12 *
3243.13 * The contents of this file are subject to the terms of either the GNU
3243.14 * General Public License Version 2 only ("GPL") or the Common
3243.15 @@ -13,9 +16,9 @@
3243.16 * specific language governing permissions and limitations under the
3243.17 * License. When distributing the software, include this License Header
3243.18 * Notice in each file and include the License file at
3243.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3243.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3243.21 * particular file as subject to the "Classpath" exception as provided
3243.22 - * by Sun in the GPL Version 2 section of the License file that
3243.23 + * by Oracle in the GPL Version 2 section of the License file that
3243.24 * accompanied this code. If applicable, add the following below the
3243.25 * License Header, with the fields enclosed by brackets [] replaced by
3243.26 * your own identifying information:
3244.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FragmentCustomizer.java Fri Jul 16 11:47:36 2010 -0400
3244.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FragmentCustomizer.java Fri Jul 16 14:21:50 2010 -0400
3244.3 @@ -1,7 +1,10 @@
3244.4 /*
3244.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3244.6 *
3244.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3244.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3244.9 + *
3244.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3244.11 + * Other names may be trademarks of their respective owners.
3244.12 *
3244.13 * The contents of this file are subject to the terms of either the GNU
3244.14 * General Public License Version 2 only ("GPL") or the Common
3244.15 @@ -13,9 +16,9 @@
3244.16 * specific language governing permissions and limitations under the
3244.17 * License. When distributing the software, include this License Header
3244.18 * Notice in each file and include the License file at
3244.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3244.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3244.21 * particular file as subject to the "Classpath" exception as provided
3244.22 - * by Sun in the GPL Version 2 section of the License file that
3244.23 + * by Oracle in the GPL Version 2 section of the License file that
3244.24 * accompanied this code. If applicable, add the following below the
3244.25 * License Header, with the fields enclosed by brackets [] replaced by
3244.26 * your own identifying information:
3245.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FragmentCustomizerAction.java Fri Jul 16 11:47:36 2010 -0400
3245.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FragmentCustomizerAction.java Fri Jul 16 14:21:50 2010 -0400
3245.3 @@ -1,7 +1,10 @@
3245.4 /*
3245.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3245.6 *
3245.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3245.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3245.9 + *
3245.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3245.11 + * Other names may be trademarks of their respective owners.
3245.12 *
3245.13 * The contents of this file are subject to the terms of either the GNU
3245.14 * General Public License Version 2 only ("GPL") or the Common
3245.15 @@ -13,9 +16,9 @@
3245.16 * specific language governing permissions and limitations under the
3245.17 * License. When distributing the software, include this License Header
3245.18 * Notice in each file and include the License file at
3245.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3245.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3245.21 * particular file as subject to the "Classpath" exception as provided
3245.22 - * by Sun in the GPL Version 2 section of the License file that
3245.23 + * by Oracle in the GPL Version 2 section of the License file that
3245.24 * accompanied this code. If applicable, add the following below the
3245.25 * License Header, with the fields enclosed by brackets [] replaced by
3245.26 * your own identifying information:
3246.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FragmentPanel.java Fri Jul 16 11:47:36 2010 -0400
3246.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FragmentPanel.java Fri Jul 16 14:21:50 2010 -0400
3246.3 @@ -1,7 +1,10 @@
3246.4 /*
3246.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3246.6 *
3246.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3246.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3246.9 + *
3246.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3246.11 + * Other names may be trademarks of their respective owners.
3246.12 *
3246.13 * The contents of this file are subject to the terms of either the GNU
3246.14 * General Public License Version 2 only ("GPL") or the Common
3246.15 @@ -13,9 +16,9 @@
3246.16 * specific language governing permissions and limitations under the
3246.17 * License. When distributing the software, include this License Header
3246.18 * Notice in each file and include the License file at
3246.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3246.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3246.21 * particular file as subject to the "Classpath" exception as provided
3246.22 - * by Sun in the GPL Version 2 section of the License file that
3246.23 + * by Oracle in the GPL Version 2 section of the License file that
3246.24 * accompanied this code. If applicable, add the following below the
3246.25 * License Header, with the fields enclosed by brackets [] replaced by
3246.26 * your own identifying information:
3247.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Frame.java Fri Jul 16 11:47:36 2010 -0400
3247.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Frame.java Fri Jul 16 14:21:50 2010 -0400
3247.3 @@ -1,7 +1,10 @@
3247.4 /*
3247.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3247.6 *
3247.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3247.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3247.9 + *
3247.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3247.11 + * Other names may be trademarks of their respective owners.
3247.12 *
3247.13 * The contents of this file are subject to the terms of either the GNU
3247.14 * General Public License Version 2 only ("GPL") or the Common
3247.15 @@ -13,9 +16,9 @@
3247.16 * specific language governing permissions and limitations under the
3247.17 * License. When distributing the software, include this License Header
3247.18 * Notice in each file and include the License file at
3247.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3247.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3247.21 * particular file as subject to the "Classpath" exception as provided
3247.22 - * by Sun in the GPL Version 2 section of the License file that
3247.23 + * by Oracle in the GPL Version 2 section of the License file that
3247.24 * accompanied this code. If applicable, add the following below the
3247.25 * License Header, with the fields enclosed by brackets [] replaced by
3247.26 * your own identifying information:
3248.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FramesetFrameset.java Fri Jul 16 11:47:36 2010 -0400
3248.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FramesetFrameset.java Fri Jul 16 14:21:50 2010 -0400
3248.3 @@ -1,7 +1,10 @@
3248.4 /*
3248.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3248.6 *
3248.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3248.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3248.9 + *
3248.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3248.11 + * Other names may be trademarks of their respective owners.
3248.12 *
3248.13 * The contents of this file are subject to the terms of either the GNU
3248.14 * General Public License Version 2 only ("GPL") or the Common
3248.15 @@ -13,9 +16,9 @@
3248.16 * specific language governing permissions and limitations under the
3248.17 * License. When distributing the software, include this License Header
3248.18 * Notice in each file and include the License file at
3248.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3248.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3248.21 * particular file as subject to the "Classpath" exception as provided
3248.22 - * by Sun in the GPL Version 2 section of the License file that
3248.23 + * by Oracle in the GPL Version 2 section of the License file that
3248.24 * accompanied this code. If applicable, add the following below the
3248.25 * License Header, with the fields enclosed by brackets [] replaced by
3248.26 * your own identifying information:
3249.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FramesetFramesetChoice.java Fri Jul 16 11:47:36 2010 -0400
3249.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/FramesetFramesetChoice.java Fri Jul 16 14:21:50 2010 -0400
3249.3 @@ -1,7 +1,10 @@
3249.4 /*
3249.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3249.6 *
3249.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3249.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3249.9 + *
3249.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3249.11 + * Other names may be trademarks of their respective owners.
3249.12 *
3249.13 * The contents of this file are subject to the terms of either the GNU
3249.14 * General Public License Version 2 only ("GPL") or the Common
3249.15 @@ -13,9 +16,9 @@
3249.16 * specific language governing permissions and limitations under the
3249.17 * License. When distributing the software, include this License Header
3249.18 * Notice in each file and include the License file at
3249.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3249.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3249.21 * particular file as subject to the "Classpath" exception as provided
3249.22 - * by Sun in the GPL Version 2 section of the License file that
3249.23 + * by Oracle in the GPL Version 2 section of the License file that
3249.24 * accompanied this code. If applicable, add the following below the
3249.25 * License Header, with the fields enclosed by brackets [] replaced by
3249.26 * your own identifying information:
3250.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H1.java Fri Jul 16 11:47:36 2010 -0400
3250.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H1.java Fri Jul 16 14:21:50 2010 -0400
3250.3 @@ -1,7 +1,10 @@
3250.4 /*
3250.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3250.6 *
3250.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3250.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3250.9 + *
3250.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3250.11 + * Other names may be trademarks of their respective owners.
3250.12 *
3250.13 * The contents of this file are subject to the terms of either the GNU
3250.14 * General Public License Version 2 only ("GPL") or the Common
3250.15 @@ -13,9 +16,9 @@
3250.16 * specific language governing permissions and limitations under the
3250.17 * License. When distributing the software, include this License Header
3250.18 * Notice in each file and include the License file at
3250.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3250.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3250.21 * particular file as subject to the "Classpath" exception as provided
3250.22 - * by Sun in the GPL Version 2 section of the License file that
3250.23 + * by Oracle in the GPL Version 2 section of the License file that
3250.24 * accompanied this code. If applicable, add the following below the
3250.25 * License Header, with the fields enclosed by brackets [] replaced by
3250.26 * your own identifying information:
3251.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H1BeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3251.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H1BeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3251.3 @@ -2,7 +2,10 @@
3251.4 /*
3251.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3251.6 *
3251.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3251.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3251.9 + *
3251.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3251.11 + * Other names may be trademarks of their respective owners.
3251.12 *
3251.13 * The contents of this file are subject to the terms of either the GNU
3251.14 * General Public License Version 2 only ("GPL") or the Common
3251.15 @@ -14,9 +17,9 @@
3251.16 * specific language governing permissions and limitations under the
3251.17 * License. When distributing the software, include this License Header
3251.18 * Notice in each file and include the License file at
3251.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3251.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3251.21 * particular file as subject to the "Classpath" exception as provided
3251.22 - * by Sun in the GPL Version 2 section of the License file that
3251.23 + * by Oracle in the GPL Version 2 section of the License file that
3251.24 * accompanied this code. If applicable, add the following below the
3251.25 * License Header, with the fields enclosed by brackets [] replaced by
3251.26 * your own identifying information:
3252.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H1DesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3252.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H1DesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3252.3 @@ -1,7 +1,10 @@
3252.4 /*
3252.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3252.6 *
3252.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3252.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3252.9 + *
3252.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3252.11 + * Other names may be trademarks of their respective owners.
3252.12 *
3252.13 * The contents of this file are subject to the terms of either the GNU
3252.14 * General Public License Version 2 only ("GPL") or the Common
3252.15 @@ -13,9 +16,9 @@
3252.16 * specific language governing permissions and limitations under the
3252.17 * License. When distributing the software, include this License Header
3252.18 * Notice in each file and include the License file at
3252.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3252.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3252.21 * particular file as subject to the "Classpath" exception as provided
3252.22 - * by Sun in the GPL Version 2 section of the License file that
3252.23 + * by Oracle in the GPL Version 2 section of the License file that
3252.24 * accompanied this code. If applicable, add the following below the
3252.25 * License Header, with the fields enclosed by brackets [] replaced by
3252.26 * your own identifying information:
3253.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H2.java Fri Jul 16 11:47:36 2010 -0400
3253.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H2.java Fri Jul 16 14:21:50 2010 -0400
3253.3 @@ -1,7 +1,10 @@
3253.4 /*
3253.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3253.6 *
3253.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3253.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3253.9 + *
3253.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3253.11 + * Other names may be trademarks of their respective owners.
3253.12 *
3253.13 * The contents of this file are subject to the terms of either the GNU
3253.14 * General Public License Version 2 only ("GPL") or the Common
3253.15 @@ -13,9 +16,9 @@
3253.16 * specific language governing permissions and limitations under the
3253.17 * License. When distributing the software, include this License Header
3253.18 * Notice in each file and include the License file at
3253.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3253.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3253.21 * particular file as subject to the "Classpath" exception as provided
3253.22 - * by Sun in the GPL Version 2 section of the License file that
3253.23 + * by Oracle in the GPL Version 2 section of the License file that
3253.24 * accompanied this code. If applicable, add the following below the
3253.25 * License Header, with the fields enclosed by brackets [] replaced by
3253.26 * your own identifying information:
3254.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H2BeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3254.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H2BeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3254.3 @@ -2,7 +2,10 @@
3254.4 /*
3254.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3254.6 *
3254.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3254.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3254.9 + *
3254.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3254.11 + * Other names may be trademarks of their respective owners.
3254.12 *
3254.13 * The contents of this file are subject to the terms of either the GNU
3254.14 * General Public License Version 2 only ("GPL") or the Common
3254.15 @@ -14,9 +17,9 @@
3254.16 * specific language governing permissions and limitations under the
3254.17 * License. When distributing the software, include this License Header
3254.18 * Notice in each file and include the License file at
3254.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3254.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3254.21 * particular file as subject to the "Classpath" exception as provided
3254.22 - * by Sun in the GPL Version 2 section of the License file that
3254.23 + * by Oracle in the GPL Version 2 section of the License file that
3254.24 * accompanied this code. If applicable, add the following below the
3254.25 * License Header, with the fields enclosed by brackets [] replaced by
3254.26 * your own identifying information:
3255.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H2DesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3255.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H2DesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3255.3 @@ -1,7 +1,10 @@
3255.4 /*
3255.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3255.6 *
3255.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3255.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3255.9 + *
3255.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3255.11 + * Other names may be trademarks of their respective owners.
3255.12 *
3255.13 * The contents of this file are subject to the terms of either the GNU
3255.14 * General Public License Version 2 only ("GPL") or the Common
3255.15 @@ -13,9 +16,9 @@
3255.16 * specific language governing permissions and limitations under the
3255.17 * License. When distributing the software, include this License Header
3255.18 * Notice in each file and include the License file at
3255.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3255.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3255.21 * particular file as subject to the "Classpath" exception as provided
3255.22 - * by Sun in the GPL Version 2 section of the License file that
3255.23 + * by Oracle in the GPL Version 2 section of the License file that
3255.24 * accompanied this code. If applicable, add the following below the
3255.25 * License Header, with the fields enclosed by brackets [] replaced by
3255.26 * your own identifying information:
3256.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H3.java Fri Jul 16 11:47:36 2010 -0400
3256.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H3.java Fri Jul 16 14:21:50 2010 -0400
3256.3 @@ -1,7 +1,10 @@
3256.4 /*
3256.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3256.6 *
3256.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3256.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3256.9 + *
3256.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3256.11 + * Other names may be trademarks of their respective owners.
3256.12 *
3256.13 * The contents of this file are subject to the terms of either the GNU
3256.14 * General Public License Version 2 only ("GPL") or the Common
3256.15 @@ -13,9 +16,9 @@
3256.16 * specific language governing permissions and limitations under the
3256.17 * License. When distributing the software, include this License Header
3256.18 * Notice in each file and include the License file at
3256.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3256.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3256.21 * particular file as subject to the "Classpath" exception as provided
3256.22 - * by Sun in the GPL Version 2 section of the License file that
3256.23 + * by Oracle in the GPL Version 2 section of the License file that
3256.24 * accompanied this code. If applicable, add the following below the
3256.25 * License Header, with the fields enclosed by brackets [] replaced by
3256.26 * your own identifying information:
3257.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H3DesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3257.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H3DesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3257.3 @@ -1,7 +1,10 @@
3257.4 /*
3257.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3257.6 *
3257.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3257.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3257.9 + *
3257.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3257.11 + * Other names may be trademarks of their respective owners.
3257.12 *
3257.13 * The contents of this file are subject to the terms of either the GNU
3257.14 * General Public License Version 2 only ("GPL") or the Common
3257.15 @@ -13,9 +16,9 @@
3257.16 * specific language governing permissions and limitations under the
3257.17 * License. When distributing the software, include this License Header
3257.18 * Notice in each file and include the License file at
3257.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3257.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3257.21 * particular file as subject to the "Classpath" exception as provided
3257.22 - * by Sun in the GPL Version 2 section of the License file that
3257.23 + * by Oracle in the GPL Version 2 section of the License file that
3257.24 * accompanied this code. If applicable, add the following below the
3257.25 * License Header, with the fields enclosed by brackets [] replaced by
3257.26 * your own identifying information:
3258.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H4.java Fri Jul 16 11:47:36 2010 -0400
3258.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H4.java Fri Jul 16 14:21:50 2010 -0400
3258.3 @@ -1,7 +1,10 @@
3258.4 /*
3258.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3258.6 *
3258.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3258.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3258.9 + *
3258.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3258.11 + * Other names may be trademarks of their respective owners.
3258.12 *
3258.13 * The contents of this file are subject to the terms of either the GNU
3258.14 * General Public License Version 2 only ("GPL") or the Common
3258.15 @@ -13,9 +16,9 @@
3258.16 * specific language governing permissions and limitations under the
3258.17 * License. When distributing the software, include this License Header
3258.18 * Notice in each file and include the License file at
3258.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3258.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3258.21 * particular file as subject to the "Classpath" exception as provided
3258.22 - * by Sun in the GPL Version 2 section of the License file that
3258.23 + * by Oracle in the GPL Version 2 section of the License file that
3258.24 * accompanied this code. If applicable, add the following below the
3258.25 * License Header, with the fields enclosed by brackets [] replaced by
3258.26 * your own identifying information:
3259.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H4DesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3259.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H4DesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3259.3 @@ -1,7 +1,10 @@
3259.4 /*
3259.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3259.6 *
3259.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3259.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3259.9 + *
3259.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3259.11 + * Other names may be trademarks of their respective owners.
3259.12 *
3259.13 * The contents of this file are subject to the terms of either the GNU
3259.14 * General Public License Version 2 only ("GPL") or the Common
3259.15 @@ -13,9 +16,9 @@
3259.16 * specific language governing permissions and limitations under the
3259.17 * License. When distributing the software, include this License Header
3259.18 * Notice in each file and include the License file at
3259.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3259.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3259.21 * particular file as subject to the "Classpath" exception as provided
3259.22 - * by Sun in the GPL Version 2 section of the License file that
3259.23 + * by Oracle in the GPL Version 2 section of the License file that
3259.24 * accompanied this code. If applicable, add the following below the
3259.25 * License Header, with the fields enclosed by brackets [] replaced by
3259.26 * your own identifying information:
3260.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H5.java Fri Jul 16 11:47:36 2010 -0400
3260.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H5.java Fri Jul 16 14:21:50 2010 -0400
3260.3 @@ -1,7 +1,10 @@
3260.4 /*
3260.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3260.6 *
3260.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3260.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3260.9 + *
3260.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3260.11 + * Other names may be trademarks of their respective owners.
3260.12 *
3260.13 * The contents of this file are subject to the terms of either the GNU
3260.14 * General Public License Version 2 only ("GPL") or the Common
3260.15 @@ -13,9 +16,9 @@
3260.16 * specific language governing permissions and limitations under the
3260.17 * License. When distributing the software, include this License Header
3260.18 * Notice in each file and include the License file at
3260.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3260.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3260.21 * particular file as subject to the "Classpath" exception as provided
3260.22 - * by Sun in the GPL Version 2 section of the License file that
3260.23 + * by Oracle in the GPL Version 2 section of the License file that
3260.24 * accompanied this code. If applicable, add the following below the
3260.25 * License Header, with the fields enclosed by brackets [] replaced by
3260.26 * your own identifying information:
3261.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H5DesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3261.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H5DesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3261.3 @@ -1,7 +1,10 @@
3261.4 /*
3261.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3261.6 *
3261.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3261.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3261.9 + *
3261.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3261.11 + * Other names may be trademarks of their respective owners.
3261.12 *
3261.13 * The contents of this file are subject to the terms of either the GNU
3261.14 * General Public License Version 2 only ("GPL") or the Common
3261.15 @@ -13,9 +16,9 @@
3261.16 * specific language governing permissions and limitations under the
3261.17 * License. When distributing the software, include this License Header
3261.18 * Notice in each file and include the License file at
3261.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3261.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3261.21 * particular file as subject to the "Classpath" exception as provided
3261.22 - * by Sun in the GPL Version 2 section of the License file that
3261.23 + * by Oracle in the GPL Version 2 section of the License file that
3261.24 * accompanied this code. If applicable, add the following below the
3261.25 * License Header, with the fields enclosed by brackets [] replaced by
3261.26 * your own identifying information:
3262.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H6.java Fri Jul 16 11:47:36 2010 -0400
3262.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H6.java Fri Jul 16 14:21:50 2010 -0400
3262.3 @@ -1,7 +1,10 @@
3262.4 /*
3262.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3262.6 *
3262.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3262.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3262.9 + *
3262.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3262.11 + * Other names may be trademarks of their respective owners.
3262.12 *
3262.13 * The contents of this file are subject to the terms of either the GNU
3262.14 * General Public License Version 2 only ("GPL") or the Common
3262.15 @@ -13,9 +16,9 @@
3262.16 * specific language governing permissions and limitations under the
3262.17 * License. When distributing the software, include this License Header
3262.18 * Notice in each file and include the License file at
3262.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3262.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3262.21 * particular file as subject to the "Classpath" exception as provided
3262.22 - * by Sun in the GPL Version 2 section of the License file that
3262.23 + * by Oracle in the GPL Version 2 section of the License file that
3262.24 * accompanied this code. If applicable, add the following below the
3262.25 * License Header, with the fields enclosed by brackets [] replaced by
3262.26 * your own identifying information:
3263.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H6DesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3263.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/H6DesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3263.3 @@ -1,7 +1,10 @@
3263.4 /*
3263.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3263.6 *
3263.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3263.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3263.9 + *
3263.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3263.11 + * Other names may be trademarks of their respective owners.
3263.12 *
3263.13 * The contents of this file are subject to the terms of either the GNU
3263.14 * General Public License Version 2 only ("GPL") or the Common
3263.15 @@ -13,9 +16,9 @@
3263.16 * specific language governing permissions and limitations under the
3263.17 * License. When distributing the software, include this License Header
3263.18 * Notice in each file and include the License file at
3263.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3263.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3263.21 * particular file as subject to the "Classpath" exception as provided
3263.22 - * by Sun in the GPL Version 2 section of the License file that
3263.23 + * by Oracle in the GPL Version 2 section of the License file that
3263.24 * accompanied this code. If applicable, add the following below the
3263.25 * License Header, with the fields enclosed by brackets [] replaced by
3263.26 * your own identifying information:
3264.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Head.java Fri Jul 16 11:47:36 2010 -0400
3264.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Head.java Fri Jul 16 14:21:50 2010 -0400
3264.3 @@ -1,7 +1,10 @@
3264.4 /*
3264.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3264.6 *
3264.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3264.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3264.9 + *
3264.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3264.11 + * Other names may be trademarks of their respective owners.
3264.12 *
3264.13 * The contents of this file are subject to the terms of either the GNU
3264.14 * General Public License Version 2 only ("GPL") or the Common
3264.15 @@ -13,9 +16,9 @@
3264.16 * specific language governing permissions and limitations under the
3264.17 * License. When distributing the software, include this License Header
3264.18 * Notice in each file and include the License file at
3264.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3264.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3264.21 * particular file as subject to the "Classpath" exception as provided
3264.22 - * by Sun in the GPL Version 2 section of the License file that
3264.23 + * by Oracle in the GPL Version 2 section of the License file that
3264.24 * accompanied this code. If applicable, add the following below the
3264.25 * License Header, with the fields enclosed by brackets [] replaced by
3264.26 * your own identifying information:
3265.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Hr.java Fri Jul 16 11:47:36 2010 -0400
3265.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Hr.java Fri Jul 16 14:21:50 2010 -0400
3265.3 @@ -1,7 +1,10 @@
3265.4 /*
3265.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3265.6 *
3265.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3265.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3265.9 + *
3265.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3265.11 + * Other names may be trademarks of their respective owners.
3265.12 *
3265.13 * The contents of this file are subject to the terms of either the GNU
3265.14 * General Public License Version 2 only ("GPL") or the Common
3265.15 @@ -13,9 +16,9 @@
3265.16 * specific language governing permissions and limitations under the
3265.17 * License. When distributing the software, include this License Header
3265.18 * Notice in each file and include the License file at
3265.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3265.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3265.21 * particular file as subject to the "Classpath" exception as provided
3265.22 - * by Sun in the GPL Version 2 section of the License file that
3265.23 + * by Oracle in the GPL Version 2 section of the License file that
3265.24 * accompanied this code. If applicable, add the following below the
3265.25 * License Header, with the fields enclosed by brackets [] replaced by
3265.26 * your own identifying information:
3266.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/HrBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3266.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/HrBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3266.3 @@ -2,7 +2,10 @@
3266.4 /*
3266.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3266.6 *
3266.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3266.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3266.9 + *
3266.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3266.11 + * Other names may be trademarks of their respective owners.
3266.12 *
3266.13 * The contents of this file are subject to the terms of either the GNU
3266.14 * General Public License Version 2 only ("GPL") or the Common
3266.15 @@ -14,9 +17,9 @@
3266.16 * specific language governing permissions and limitations under the
3266.17 * License. When distributing the software, include this License Header
3266.18 * Notice in each file and include the License file at
3266.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3266.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3266.21 * particular file as subject to the "Classpath" exception as provided
3266.22 - * by Sun in the GPL Version 2 section of the License file that
3266.23 + * by Oracle in the GPL Version 2 section of the License file that
3266.24 * accompanied this code. If applicable, add the following below the
3266.25 * License Header, with the fields enclosed by brackets [] replaced by
3266.26 * your own identifying information:
3267.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/HrDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3267.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/HrDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3267.3 @@ -1,7 +1,10 @@
3267.4 /*
3267.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3267.6 *
3267.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3267.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3267.9 + *
3267.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3267.11 + * Other names may be trademarks of their respective owners.
3267.12 *
3267.13 * The contents of this file are subject to the terms of either the GNU
3267.14 * General Public License Version 2 only ("GPL") or the Common
3267.15 @@ -13,9 +16,9 @@
3267.16 * specific language governing permissions and limitations under the
3267.17 * License. When distributing the software, include this License Header
3267.18 * Notice in each file and include the License file at
3267.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3267.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3267.21 * particular file as subject to the "Classpath" exception as provided
3267.22 - * by Sun in the GPL Version 2 section of the License file that
3267.23 + * by Oracle in the GPL Version 2 section of the License file that
3267.24 * accompanied this code. If applicable, add the following below the
3267.25 * License Header, with the fields enclosed by brackets [] replaced by
3267.26 * your own identifying information:
3268.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Html.java Fri Jul 16 11:47:36 2010 -0400
3268.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Html.java Fri Jul 16 14:21:50 2010 -0400
3268.3 @@ -1,7 +1,10 @@
3268.4 /*
3268.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3268.6 *
3268.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3268.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3268.9 + *
3268.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3268.11 + * Other names may be trademarks of their respective owners.
3268.12 *
3268.13 * The contents of this file are subject to the terms of either the GNU
3268.14 * General Public License Version 2 only ("GPL") or the Common
3268.15 @@ -13,9 +16,9 @@
3268.16 * specific language governing permissions and limitations under the
3268.17 * License. When distributing the software, include this License Header
3268.18 * Notice in each file and include the License file at
3268.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3268.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3268.21 * particular file as subject to the "Classpath" exception as provided
3268.22 - * by Sun in the GPL Version 2 section of the License file that
3268.23 + * by Oracle in the GPL Version 2 section of the License file that
3268.24 * accompanied this code. If applicable, add the following below the
3268.25 * License Header, with the fields enclosed by brackets [] replaced by
3268.26 * your own identifying information:
3269.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/I.java Fri Jul 16 11:47:36 2010 -0400
3269.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/I.java Fri Jul 16 14:21:50 2010 -0400
3269.3 @@ -1,7 +1,10 @@
3269.4 /*
3269.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3269.6 *
3269.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3269.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3269.9 + *
3269.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3269.11 + * Other names may be trademarks of their respective owners.
3269.12 *
3269.13 * The contents of this file are subject to the terms of either the GNU
3269.14 * General Public License Version 2 only ("GPL") or the Common
3269.15 @@ -13,9 +16,9 @@
3269.16 * specific language governing permissions and limitations under the
3269.17 * License. When distributing the software, include this License Header
3269.18 * Notice in each file and include the License file at
3269.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3269.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3269.21 * particular file as subject to the "Classpath" exception as provided
3269.22 - * by Sun in the GPL Version 2 section of the License file that
3269.23 + * by Oracle in the GPL Version 2 section of the License file that
3269.24 * accompanied this code. If applicable, add the following below the
3269.25 * License Header, with the fields enclosed by brackets [] replaced by
3269.26 * your own identifying information:
3270.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IBlockMixMixed.java Fri Jul 16 11:47:36 2010 -0400
3270.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IBlockMixMixed.java Fri Jul 16 14:21:50 2010 -0400
3270.3 @@ -1,7 +1,10 @@
3270.4 /*
3270.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3270.6 *
3270.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3270.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3270.9 + *
3270.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3270.11 + * Other names may be trademarks of their respective owners.
3270.12 *
3270.13 * The contents of this file are subject to the terms of either the GNU
3270.14 * General Public License Version 2 only ("GPL") or the Common
3270.15 @@ -13,9 +16,9 @@
3270.16 * specific language governing permissions and limitations under the
3270.17 * License. When distributing the software, include this License Header
3270.18 * Notice in each file and include the License file at
3270.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3270.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3270.21 * particular file as subject to the "Classpath" exception as provided
3270.22 - * by Sun in the GPL Version 2 section of the License file that
3270.23 + * by Oracle in the GPL Version 2 section of the License file that
3270.24 * accompanied this code. If applicable, add the following below the
3270.25 * License Header, with the fields enclosed by brackets [] replaced by
3270.26 * your own identifying information:
3271.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IFlowModelMixed.java Fri Jul 16 11:47:36 2010 -0400
3271.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IFlowModelMixed.java Fri Jul 16 14:21:50 2010 -0400
3271.3 @@ -1,7 +1,10 @@
3271.4 /*
3271.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3271.6 *
3271.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3271.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3271.9 + *
3271.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3271.11 + * Other names may be trademarks of their respective owners.
3271.12 *
3271.13 * The contents of this file are subject to the terms of either the GNU
3271.14 * General Public License Version 2 only ("GPL") or the Common
3271.15 @@ -13,9 +16,9 @@
3271.16 * specific language governing permissions and limitations under the
3271.17 * License. When distributing the software, include this License Header
3271.18 * Notice in each file and include the License file at
3271.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3271.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3271.21 * particular file as subject to the "Classpath" exception as provided
3271.22 - * by Sun in the GPL Version 2 section of the License file that
3271.23 + * by Oracle in the GPL Version 2 section of the License file that
3271.24 * accompanied this code. If applicable, add the following below the
3271.25 * License Header, with the fields enclosed by brackets [] replaced by
3271.26 * your own identifying information:
3272.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IFramesetChoice.java Fri Jul 16 11:47:36 2010 -0400
3272.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IFramesetChoice.java Fri Jul 16 14:21:50 2010 -0400
3272.3 @@ -1,7 +1,10 @@
3272.4 /*
3272.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3272.6 *
3272.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3272.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3272.9 + *
3272.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3272.11 + * Other names may be trademarks of their respective owners.
3272.12 *
3272.13 * The contents of this file are subject to the terms of either the GNU
3272.14 * General Public License Version 2 only ("GPL") or the Common
3272.15 @@ -13,9 +16,9 @@
3272.16 * specific language governing permissions and limitations under the
3272.17 * License. When distributing the software, include this License Header
3272.18 * Notice in each file and include the License file at
3272.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3272.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3272.21 * particular file as subject to the "Classpath" exception as provided
3272.22 - * by Sun in the GPL Version 2 section of the License file that
3272.23 + * by Oracle in the GPL Version 2 section of the License file that
3272.24 * accompanied this code. If applicable, add the following below the
3272.25 * License Header, with the fields enclosed by brackets [] replaced by
3272.26 * your own identifying information:
3273.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IFramesetFramesetChoiceChoice.java Fri Jul 16 11:47:36 2010 -0400
3273.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IFramesetFramesetChoiceChoice.java Fri Jul 16 14:21:50 2010 -0400
3273.3 @@ -1,7 +1,10 @@
3273.4 /*
3273.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3273.6 *
3273.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3273.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3273.9 + *
3273.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3273.11 + * Other names may be trademarks of their respective owners.
3273.12 *
3273.13 * The contents of this file are subject to the terms of either the GNU
3273.14 * General Public License Version 2 only ("GPL") or the Common
3273.15 @@ -13,9 +16,9 @@
3273.16 * specific language governing permissions and limitations under the
3273.17 * License. When distributing the software, include this License Header
3273.18 * Notice in each file and include the License file at
3273.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3273.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3273.21 * particular file as subject to the "Classpath" exception as provided
3273.22 - * by Sun in the GPL Version 2 section of the License file that
3273.23 + * by Oracle in the GPL Version 2 section of the License file that
3273.24 * accompanied this code. If applicable, add the following below the
3273.25 * License Header, with the fields enclosed by brackets [] replaced by
3273.26 * your own identifying information:
3274.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IInlineModelMixed.java Fri Jul 16 11:47:36 2010 -0400
3274.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IInlineModelMixed.java Fri Jul 16 14:21:50 2010 -0400
3274.3 @@ -1,7 +1,10 @@
3274.4 /*
3274.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3274.6 *
3274.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3274.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3274.9 + *
3274.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3274.11 + * Other names may be trademarks of their respective owners.
3274.12 *
3274.13 * The contents of this file are subject to the terms of either the GNU
3274.14 * General Public License Version 2 only ("GPL") or the Common
3274.15 @@ -13,9 +16,9 @@
3274.16 * specific language governing permissions and limitations under the
3274.17 * License. When distributing the software, include this License Header
3274.18 * Notice in each file and include the License file at
3274.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3274.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3274.21 * particular file as subject to the "Classpath" exception as provided
3274.22 - * by Sun in the GPL Version 2 section of the License file that
3274.23 + * by Oracle in the GPL Version 2 section of the License file that
3274.24 * accompanied this code. If applicable, add the following below the
3274.25 * License Header, with the fields enclosed by brackets [] replaced by
3274.26 * your own identifying information:
3275.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IMapChoice.java Fri Jul 16 11:47:36 2010 -0400
3275.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IMapChoice.java Fri Jul 16 14:21:50 2010 -0400
3275.3 @@ -1,7 +1,10 @@
3275.4 /*
3275.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3275.6 *
3275.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3275.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3275.9 + *
3275.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3275.11 + * Other names may be trademarks of their respective owners.
3275.12 *
3275.13 * The contents of this file are subject to the terms of either the GNU
3275.14 * General Public License Version 2 only ("GPL") or the Common
3275.15 @@ -13,9 +16,9 @@
3275.16 * specific language governing permissions and limitations under the
3275.17 * License. When distributing the software, include this License Header
3275.18 * Notice in each file and include the License file at
3275.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3275.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3275.21 * particular file as subject to the "Classpath" exception as provided
3275.22 - * by Sun in the GPL Version 2 section of the License file that
3275.23 + * by Oracle in the GPL Version 2 section of the License file that
3275.24 * accompanied this code. If applicable, add the following below the
3275.25 * License Header, with the fields enclosed by brackets [] replaced by
3275.26 * your own identifying information:
3276.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ISelectChoice.java Fri Jul 16 11:47:36 2010 -0400
3276.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ISelectChoice.java Fri Jul 16 14:21:50 2010 -0400
3276.3 @@ -1,7 +1,10 @@
3276.4 /*
3276.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3276.6 *
3276.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3276.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3276.9 + *
3276.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3276.11 + * Other names may be trademarks of their respective owners.
3276.12 *
3276.13 * The contents of this file are subject to the terms of either the GNU
3276.14 * General Public License Version 2 only ("GPL") or the Common
3276.15 @@ -13,9 +16,9 @@
3276.16 * specific language governing permissions and limitations under the
3276.17 * License. When distributing the software, include this License Header
3276.18 * Notice in each file and include the License file at
3276.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3276.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3276.21 * particular file as subject to the "Classpath" exception as provided
3276.22 - * by Sun in the GPL Version 2 section of the License file that
3276.23 + * by Oracle in the GPL Version 2 section of the License file that
3276.24 * accompanied this code. If applicable, add the following below the
3276.25 * License Header, with the fields enclosed by brackets [] replaced by
3276.26 * your own identifying information:
3277.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ITableChoice1.java Fri Jul 16 11:47:36 2010 -0400
3277.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ITableChoice1.java Fri Jul 16 14:21:50 2010 -0400
3277.3 @@ -1,7 +1,10 @@
3277.4 /*
3277.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3277.6 *
3277.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3277.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3277.9 + *
3277.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3277.11 + * Other names may be trademarks of their respective owners.
3277.12 *
3277.13 * The contents of this file are subject to the terms of either the GNU
3277.14 * General Public License Version 2 only ("GPL") or the Common
3277.15 @@ -13,9 +16,9 @@
3277.16 * specific language governing permissions and limitations under the
3277.17 * License. When distributing the software, include this License Header
3277.18 * Notice in each file and include the License file at
3277.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3277.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3277.21 * particular file as subject to the "Classpath" exception as provided
3277.22 - * by Sun in the GPL Version 2 section of the License file that
3277.23 + * by Oracle in the GPL Version 2 section of the License file that
3277.24 * accompanied this code. If applicable, add the following below the
3277.25 * License Header, with the fields enclosed by brackets [] replaced by
3277.26 * your own identifying information:
3278.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ITableChoice2.java Fri Jul 16 11:47:36 2010 -0400
3278.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ITableChoice2.java Fri Jul 16 14:21:50 2010 -0400
3278.3 @@ -1,7 +1,10 @@
3278.4 /*
3278.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3278.6 *
3278.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3278.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3278.9 + *
3278.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3278.11 + * Other names may be trademarks of their respective owners.
3278.12 *
3278.13 * The contents of this file are subject to the terms of either the GNU
3278.14 * General Public License Version 2 only ("GPL") or the Common
3278.15 @@ -13,9 +16,9 @@
3278.16 * specific language governing permissions and limitations under the
3278.17 * License. When distributing the software, include this License Header
3278.18 * Notice in each file and include the License file at
3278.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3278.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3278.21 * particular file as subject to the "Classpath" exception as provided
3278.22 - * by Sun in the GPL Version 2 section of the License file that
3278.23 + * by Oracle in the GPL Version 2 section of the License file that
3278.24 * accompanied this code. If applicable, add the following below the
3278.25 * License Header, with the fields enclosed by brackets [] replaced by
3278.26 * your own identifying information:
3279.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ITrChoice.java Fri Jul 16 11:47:36 2010 -0400
3279.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ITrChoice.java Fri Jul 16 14:21:50 2010 -0400
3279.3 @@ -1,7 +1,10 @@
3279.4 /*
3279.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3279.6 *
3279.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3279.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3279.9 + *
3279.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3279.11 + * Other names may be trademarks of their respective owners.
3279.12 *
3279.13 * The contents of this file are subject to the terms of either the GNU
3279.14 * General Public License Version 2 only ("GPL") or the Common
3279.15 @@ -13,9 +16,9 @@
3279.16 * specific language governing permissions and limitations under the
3279.17 * License. When distributing the software, include this License Header
3279.18 * Notice in each file and include the License file at
3279.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3279.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3279.21 * particular file as subject to the "Classpath" exception as provided
3279.22 - * by Sun in the GPL Version 2 section of the License file that
3279.23 + * by Oracle in the GPL Version 2 section of the License file that
3279.24 * accompanied this code. If applicable, add the following below the
3279.25 * License Header, with the fields enclosed by brackets [] replaced by
3279.26 * your own identifying information:
3280.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Iframe.java Fri Jul 16 11:47:36 2010 -0400
3280.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Iframe.java Fri Jul 16 14:21:50 2010 -0400
3280.3 @@ -1,7 +1,10 @@
3280.4 /*
3280.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3280.6 *
3280.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3280.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3280.9 + *
3280.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3280.11 + * Other names may be trademarks of their respective owners.
3280.12 *
3280.13 * The contents of this file are subject to the terms of either the GNU
3280.14 * General Public License Version 2 only ("GPL") or the Common
3280.15 @@ -13,9 +16,9 @@
3280.16 * specific language governing permissions and limitations under the
3280.17 * License. When distributing the software, include this License Header
3280.18 * Notice in each file and include the License file at
3280.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3280.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3280.21 * particular file as subject to the "Classpath" exception as provided
3280.22 - * by Sun in the GPL Version 2 section of the License file that
3280.23 + * by Oracle in the GPL Version 2 section of the License file that
3280.24 * accompanied this code. If applicable, add the following below the
3280.25 * License Header, with the fields enclosed by brackets [] replaced by
3280.26 * your own identifying information:
3281.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IframeBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3281.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/IframeBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3281.3 @@ -2,7 +2,10 @@
3281.4 /*
3281.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3281.6 *
3281.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3281.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3281.9 + *
3281.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3281.11 + * Other names may be trademarks of their respective owners.
3281.12 *
3281.13 * The contents of this file are subject to the terms of either the GNU
3281.14 * General Public License Version 2 only ("GPL") or the Common
3281.15 @@ -14,9 +17,9 @@
3281.16 * specific language governing permissions and limitations under the
3281.17 * License. When distributing the software, include this License Header
3281.18 * Notice in each file and include the License file at
3281.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3281.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3281.21 * particular file as subject to the "Classpath" exception as provided
3281.22 - * by Sun in the GPL Version 2 section of the License file that
3281.23 + * by Oracle in the GPL Version 2 section of the License file that
3281.24 * accompanied this code. If applicable, add the following below the
3281.25 * License Header, with the fields enclosed by brackets [] replaced by
3281.26 * your own identifying information:
3282.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Img.java Fri Jul 16 11:47:36 2010 -0400
3282.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Img.java Fri Jul 16 14:21:50 2010 -0400
3282.3 @@ -1,7 +1,10 @@
3282.4 /*
3282.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3282.6 *
3282.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3282.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3282.9 + *
3282.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3282.11 + * Other names may be trademarks of their respective owners.
3282.12 *
3282.13 * The contents of this file are subject to the terms of either the GNU
3282.14 * General Public License Version 2 only ("GPL") or the Common
3282.15 @@ -13,9 +16,9 @@
3282.16 * specific language governing permissions and limitations under the
3282.17 * License. When distributing the software, include this License Header
3282.18 * Notice in each file and include the License file at
3282.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3282.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3282.21 * particular file as subject to the "Classpath" exception as provided
3282.22 - * by Sun in the GPL Version 2 section of the License file that
3282.23 + * by Oracle in the GPL Version 2 section of the License file that
3282.24 * accompanied this code. If applicable, add the following below the
3282.25 * License Header, with the fields enclosed by brackets [] replaced by
3282.26 * your own identifying information:
3283.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ImgBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3283.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ImgBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3283.3 @@ -2,7 +2,10 @@
3283.4 /*
3283.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3283.6 *
3283.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3283.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3283.9 + *
3283.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3283.11 + * Other names may be trademarks of their respective owners.
3283.12 *
3283.13 * The contents of this file are subject to the terms of either the GNU
3283.14 * General Public License Version 2 only ("GPL") or the Common
3283.15 @@ -14,9 +17,9 @@
3283.16 * specific language governing permissions and limitations under the
3283.17 * License. When distributing the software, include this License Header
3283.18 * Notice in each file and include the License file at
3283.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3283.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3283.21 * particular file as subject to the "Classpath" exception as provided
3283.22 - * by Sun in the GPL Version 2 section of the License file that
3283.23 + * by Oracle in the GPL Version 2 section of the License file that
3283.24 * accompanied this code. If applicable, add the following below the
3283.25 * License Header, with the fields enclosed by brackets [] replaced by
3283.26 * your own identifying information:
3284.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ImgDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3284.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/ImgDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3284.3 @@ -1,7 +1,10 @@
3284.4 /*
3284.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3284.6 *
3284.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3284.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3284.9 + *
3284.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3284.11 + * Other names may be trademarks of their respective owners.
3284.12 *
3284.13 * The contents of this file are subject to the terms of either the GNU
3284.14 * General Public License Version 2 only ("GPL") or the Common
3284.15 @@ -13,9 +16,9 @@
3284.16 * specific language governing permissions and limitations under the
3284.17 * License. When distributing the software, include this License Header
3284.18 * Notice in each file and include the License file at
3284.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3284.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3284.21 * particular file as subject to the "Classpath" exception as provided
3284.22 - * by Sun in the GPL Version 2 section of the License file that
3284.23 + * by Oracle in the GPL Version 2 section of the License file that
3284.24 * accompanied this code. If applicable, add the following below the
3284.25 * License Header, with the fields enclosed by brackets [] replaced by
3284.26 * your own identifying information:
3285.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Input.java Fri Jul 16 11:47:36 2010 -0400
3285.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Input.java Fri Jul 16 14:21:50 2010 -0400
3285.3 @@ -1,7 +1,10 @@
3285.4 /*
3285.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3285.6 *
3285.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3285.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3285.9 + *
3285.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3285.11 + * Other names may be trademarks of their respective owners.
3285.12 *
3285.13 * The contents of this file are subject to the terms of either the GNU
3285.14 * General Public License Version 2 only ("GPL") or the Common
3285.15 @@ -13,9 +16,9 @@
3285.16 * specific language governing permissions and limitations under the
3285.17 * License. When distributing the software, include this License Header
3285.18 * Notice in each file and include the License file at
3285.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3285.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3285.21 * particular file as subject to the "Classpath" exception as provided
3285.22 - * by Sun in the GPL Version 2 section of the License file that
3285.23 + * by Oracle in the GPL Version 2 section of the License file that
3285.24 * accompanied this code. If applicable, add the following below the
3285.25 * License Header, with the fields enclosed by brackets [] replaced by
3285.26 * your own identifying information:
3286.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Ins.java Fri Jul 16 11:47:36 2010 -0400
3286.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Ins.java Fri Jul 16 14:21:50 2010 -0400
3286.3 @@ -1,7 +1,10 @@
3286.4 /*
3286.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3286.6 *
3286.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3286.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3286.9 + *
3286.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3286.11 + * Other names may be trademarks of their respective owners.
3286.12 *
3286.13 * The contents of this file are subject to the terms of either the GNU
3286.14 * General Public License Version 2 only ("GPL") or the Common
3286.15 @@ -13,9 +16,9 @@
3286.16 * specific language governing permissions and limitations under the
3286.17 * License. When distributing the software, include this License Header
3286.18 * Notice in each file and include the License file at
3286.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3286.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3286.21 * particular file as subject to the "Classpath" exception as provided
3286.22 - * by Sun in the GPL Version 2 section of the License file that
3286.23 + * by Oracle in the GPL Version 2 section of the License file that
3286.24 * accompanied this code. If applicable, add the following below the
3286.25 * License Header, with the fields enclosed by brackets [] replaced by
3286.26 * your own identifying information:
3287.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Isindex.java Fri Jul 16 11:47:36 2010 -0400
3287.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Isindex.java Fri Jul 16 14:21:50 2010 -0400
3287.3 @@ -1,7 +1,10 @@
3287.4 /*
3287.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3287.6 *
3287.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3287.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3287.9 + *
3287.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3287.11 + * Other names may be trademarks of their respective owners.
3287.12 *
3287.13 * The contents of this file are subject to the terms of either the GNU
3287.14 * General Public License Version 2 only ("GPL") or the Common
3287.15 @@ -13,9 +16,9 @@
3287.16 * specific language governing permissions and limitations under the
3287.17 * License. When distributing the software, include this License Header
3287.18 * Notice in each file and include the License file at
3287.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3287.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3287.21 * particular file as subject to the "Classpath" exception as provided
3287.22 - * by Sun in the GPL Version 2 section of the License file that
3287.23 + * by Oracle in the GPL Version 2 section of the License file that
3287.24 * accompanied this code. If applicable, add the following below the
3287.25 * License Header, with the fields enclosed by brackets [] replaced by
3287.26 * your own identifying information:
3288.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_Directive_Include.java Fri Jul 16 11:47:36 2010 -0400
3288.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_Directive_Include.java Fri Jul 16 14:21:50 2010 -0400
3288.3 @@ -1,7 +1,10 @@
3288.4 /*
3288.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3288.6 *
3288.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3288.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3288.9 + *
3288.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3288.11 + * Other names may be trademarks of their respective owners.
3288.12 *
3288.13 * The contents of this file are subject to the terms of either the GNU
3288.14 * General Public License Version 2 only ("GPL") or the Common
3288.15 @@ -13,9 +16,9 @@
3288.16 * specific language governing permissions and limitations under the
3288.17 * License. When distributing the software, include this License Header
3288.18 * Notice in each file and include the License file at
3288.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3288.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3288.21 * particular file as subject to the "Classpath" exception as provided
3288.22 - * by Sun in the GPL Version 2 section of the License file that
3288.23 + * by Oracle in the GPL Version 2 section of the License file that
3288.24 * accompanied this code. If applicable, add the following below the
3288.25 * License Header, with the fields enclosed by brackets [] replaced by
3288.26 * your own identifying information:
3289.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_Directive_IncludeBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3289.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_Directive_IncludeBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3289.3 @@ -2,7 +2,10 @@
3289.4 /*
3289.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3289.6 *
3289.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3289.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3289.9 + *
3289.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3289.11 + * Other names may be trademarks of their respective owners.
3289.12 *
3289.13 * The contents of this file are subject to the terms of either the GNU
3289.14 * General Public License Version 2 only ("GPL") or the Common
3289.15 @@ -14,9 +17,9 @@
3289.16 * specific language governing permissions and limitations under the
3289.17 * License. When distributing the software, include this License Header
3289.18 * Notice in each file and include the License file at
3289.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3289.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3289.21 * particular file as subject to the "Classpath" exception as provided
3289.22 - * by Sun in the GPL Version 2 section of the License file that
3289.23 + * by Oracle in the GPL Version 2 section of the License file that
3289.24 * accompanied this code. If applicable, add the following below the
3289.25 * License Header, with the fields enclosed by brackets [] replaced by
3289.26 * your own identifying information:
3290.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_Directive_IncludeDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3290.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_Directive_IncludeDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3290.3 @@ -1,7 +1,10 @@
3290.4 /*
3290.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3290.6 *
3290.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3290.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3290.9 + *
3290.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3290.11 + * Other names may be trademarks of their respective owners.
3290.12 *
3290.13 * The contents of this file are subject to the terms of either the GNU
3290.14 * General Public License Version 2 only ("GPL") or the Common
3290.15 @@ -13,9 +16,9 @@
3290.16 * specific language governing permissions and limitations under the
3290.17 * License. When distributing the software, include this License Header
3290.18 * Notice in each file and include the License file at
3290.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3290.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3290.21 * particular file as subject to the "Classpath" exception as provided
3290.22 - * by Sun in the GPL Version 2 section of the License file that
3290.23 + * by Oracle in the GPL Version 2 section of the License file that
3290.24 * accompanied this code. If applicable, add the following below the
3290.25 * License Header, with the fields enclosed by brackets [] replaced by
3290.26 * your own identifying information:
3291.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_Include.java Fri Jul 16 11:47:36 2010 -0400
3291.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_Include.java Fri Jul 16 14:21:50 2010 -0400
3291.3 @@ -1,7 +1,10 @@
3291.4 /*
3291.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3291.6 *
3291.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3291.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3291.9 + *
3291.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3291.11 + * Other names may be trademarks of their respective owners.
3291.12 *
3291.13 * The contents of this file are subject to the terms of either the GNU
3291.14 * General Public License Version 2 only ("GPL") or the Common
3291.15 @@ -13,9 +16,9 @@
3291.16 * specific language governing permissions and limitations under the
3291.17 * License. When distributing the software, include this License Header
3291.18 * Notice in each file and include the License file at
3291.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3291.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3291.21 * particular file as subject to the "Classpath" exception as provided
3291.22 - * by Sun in the GPL Version 2 section of the License file that
3291.23 + * by Oracle in the GPL Version 2 section of the License file that
3291.24 * accompanied this code. If applicable, add the following below the
3291.25 * License Header, with the fields enclosed by brackets [] replaced by
3291.26 * your own identifying information:
3292.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_IncludeBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3292.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Jsp_IncludeBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3292.3 @@ -2,7 +2,10 @@
3292.4 /*
3292.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3292.6 *
3292.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3292.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3292.9 + *
3292.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3292.11 + * Other names may be trademarks of their respective owners.
3292.12 *
3292.13 * The contents of this file are subject to the terms of either the GNU
3292.14 * General Public License Version 2 only ("GPL") or the Common
3292.15 @@ -14,9 +17,9 @@
3292.16 * specific language governing permissions and limitations under the
3292.17 * License. When distributing the software, include this License Header
3292.18 * Notice in each file and include the License file at
3292.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3292.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3292.21 * particular file as subject to the "Classpath" exception as provided
3292.22 - * by Sun in the GPL Version 2 section of the License file that
3292.23 + * by Oracle in the GPL Version 2 section of the License file that
3292.24 * accompanied this code. If applicable, add the following below the
3292.25 * License Header, with the fields enclosed by brackets [] replaced by
3292.26 * your own identifying information:
3293.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Kbd.java Fri Jul 16 11:47:36 2010 -0400
3293.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Kbd.java Fri Jul 16 14:21:50 2010 -0400
3293.3 @@ -1,7 +1,10 @@
3293.4 /*
3293.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3293.6 *
3293.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3293.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3293.9 + *
3293.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3293.11 + * Other names may be trademarks of their respective owners.
3293.12 *
3293.13 * The contents of this file are subject to the terms of either the GNU
3293.14 * General Public License Version 2 only ("GPL") or the Common
3293.15 @@ -13,9 +16,9 @@
3293.16 * specific language governing permissions and limitations under the
3293.17 * License. When distributing the software, include this License Header
3293.18 * Notice in each file and include the License file at
3293.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3293.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3293.21 * particular file as subject to the "Classpath" exception as provided
3293.22 - * by Sun in the GPL Version 2 section of the License file that
3293.23 + * by Oracle in the GPL Version 2 section of the License file that
3293.24 * accompanied this code. If applicable, add the following below the
3293.25 * License Header, with the fields enclosed by brackets [] replaced by
3293.26 * your own identifying information:
3294.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Label.java Fri Jul 16 11:47:36 2010 -0400
3294.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Label.java Fri Jul 16 14:21:50 2010 -0400
3294.3 @@ -1,7 +1,10 @@
3294.4 /*
3294.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3294.6 *
3294.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3294.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3294.9 + *
3294.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3294.11 + * Other names may be trademarks of their respective owners.
3294.12 *
3294.13 * The contents of this file are subject to the terms of either the GNU
3294.14 * General Public License Version 2 only ("GPL") or the Common
3294.15 @@ -13,9 +16,9 @@
3294.16 * specific language governing permissions and limitations under the
3294.17 * License. When distributing the software, include this License Header
3294.18 * Notice in each file and include the License file at
3294.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3294.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3294.21 * particular file as subject to the "Classpath" exception as provided
3294.22 - * by Sun in the GPL Version 2 section of the License file that
3294.23 + * by Oracle in the GPL Version 2 section of the License file that
3294.24 * accompanied this code. If applicable, add the following below the
3294.25 * License Header, with the fields enclosed by brackets [] replaced by
3294.26 * your own identifying information:
3295.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Legend.java Fri Jul 16 11:47:36 2010 -0400
3295.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Legend.java Fri Jul 16 14:21:50 2010 -0400
3295.3 @@ -1,7 +1,10 @@
3295.4 /*
3295.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3295.6 *
3295.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3295.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3295.9 + *
3295.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3295.11 + * Other names may be trademarks of their respective owners.
3295.12 *
3295.13 * The contents of this file are subject to the terms of either the GNU
3295.14 * General Public License Version 2 only ("GPL") or the Common
3295.15 @@ -13,9 +16,9 @@
3295.16 * specific language governing permissions and limitations under the
3295.17 * License. When distributing the software, include this License Header
3295.18 * Notice in each file and include the License file at
3295.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3295.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3295.21 * particular file as subject to the "Classpath" exception as provided
3295.22 - * by Sun in the GPL Version 2 section of the License file that
3295.23 + * by Oracle in the GPL Version 2 section of the License file that
3295.24 * accompanied this code. If applicable, add the following below the
3295.25 * License Header, with the fields enclosed by brackets [] replaced by
3295.26 * your own identifying information:
3296.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Li.java Fri Jul 16 11:47:36 2010 -0400
3296.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Li.java Fri Jul 16 14:21:50 2010 -0400
3296.3 @@ -1,7 +1,10 @@
3296.4 /*
3296.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3296.6 *
3296.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3296.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3296.9 + *
3296.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3296.11 + * Other names may be trademarks of their respective owners.
3296.12 *
3296.13 * The contents of this file are subject to the terms of either the GNU
3296.14 * General Public License Version 2 only ("GPL") or the Common
3296.15 @@ -13,9 +16,9 @@
3296.16 * specific language governing permissions and limitations under the
3296.17 * License. When distributing the software, include this License Header
3296.18 * Notice in each file and include the License file at
3296.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3296.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3296.21 * particular file as subject to the "Classpath" exception as provided
3296.22 - * by Sun in the GPL Version 2 section of the License file that
3296.23 + * by Oracle in the GPL Version 2 section of the License file that
3296.24 * accompanied this code. If applicable, add the following below the
3296.25 * License Header, with the fields enclosed by brackets [] replaced by
3296.26 * your own identifying information:
3297.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/LiNoblock.java Fri Jul 16 11:47:36 2010 -0400
3297.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/LiNoblock.java Fri Jul 16 14:21:50 2010 -0400
3297.3 @@ -1,7 +1,10 @@
3297.4 /*
3297.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3297.6 *
3297.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3297.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3297.9 + *
3297.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3297.11 + * Other names may be trademarks of their respective owners.
3297.12 *
3297.13 * The contents of this file are subject to the terms of either the GNU
3297.14 * General Public License Version 2 only ("GPL") or the Common
3297.15 @@ -13,9 +16,9 @@
3297.16 * specific language governing permissions and limitations under the
3297.17 * License. When distributing the software, include this License Header
3297.18 * Notice in each file and include the License file at
3297.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3297.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3297.21 * particular file as subject to the "Classpath" exception as provided
3297.22 - * by Sun in the GPL Version 2 section of the License file that
3297.23 + * by Oracle in the GPL Version 2 section of the License file that
3297.24 * accompanied this code. If applicable, add the following below the
3297.25 * License Header, with the fields enclosed by brackets [] replaced by
3297.26 * your own identifying information:
3298.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Link.java Fri Jul 16 11:47:36 2010 -0400
3298.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Link.java Fri Jul 16 14:21:50 2010 -0400
3298.3 @@ -1,7 +1,10 @@
3298.4 /*
3298.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3298.6 *
3298.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3298.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3298.9 + *
3298.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3298.11 + * Other names may be trademarks of their respective owners.
3298.12 *
3298.13 * The contents of this file are subject to the terms of either the GNU
3298.14 * General Public License Version 2 only ("GPL") or the Common
3298.15 @@ -13,9 +16,9 @@
3298.16 * specific language governing permissions and limitations under the
3298.17 * License. When distributing the software, include this License Header
3298.18 * Notice in each file and include the License file at
3298.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3298.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3298.21 * particular file as subject to the "Classpath" exception as provided
3298.22 - * by Sun in the GPL Version 2 section of the License file that
3298.23 + * by Oracle in the GPL Version 2 section of the License file that
3298.24 * accompanied this code. If applicable, add the following below the
3298.25 * License Header, with the fields enclosed by brackets [] replaced by
3298.26 * your own identifying information:
3299.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Map.java Fri Jul 16 11:47:36 2010 -0400
3299.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Map.java Fri Jul 16 14:21:50 2010 -0400
3299.3 @@ -1,7 +1,10 @@
3299.4 /*
3299.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3299.6 *
3299.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3299.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3299.9 + *
3299.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3299.11 + * Other names may be trademarks of their respective owners.
3299.12 *
3299.13 * The contents of this file are subject to the terms of either the GNU
3299.14 * General Public License Version 2 only ("GPL") or the Common
3299.15 @@ -13,9 +16,9 @@
3299.16 * specific language governing permissions and limitations under the
3299.17 * License. When distributing the software, include this License Header
3299.18 * Notice in each file and include the License file at
3299.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3299.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3299.21 * particular file as subject to the "Classpath" exception as provided
3299.22 - * by Sun in the GPL Version 2 section of the License file that
3299.23 + * by Oracle in the GPL Version 2 section of the License file that
3299.24 * accompanied this code. If applicable, add the following below the
3299.25 * License Header, with the fields enclosed by brackets [] replaced by
3299.26 * your own identifying information:
3300.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Menu.java Fri Jul 16 11:47:36 2010 -0400
3300.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Menu.java Fri Jul 16 14:21:50 2010 -0400
3300.3 @@ -1,7 +1,10 @@
3300.4 /*
3300.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3300.6 *
3300.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3300.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3300.9 + *
3300.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3300.11 + * Other names may be trademarks of their respective owners.
3300.12 *
3300.13 * The contents of this file are subject to the terms of either the GNU
3300.14 * General Public License Version 2 only ("GPL") or the Common
3300.15 @@ -13,9 +16,9 @@
3300.16 * specific language governing permissions and limitations under the
3300.17 * License. When distributing the software, include this License Header
3300.18 * Notice in each file and include the License file at
3300.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3300.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3300.21 * particular file as subject to the "Classpath" exception as provided
3300.22 - * by Sun in the GPL Version 2 section of the License file that
3300.23 + * by Oracle in the GPL Version 2 section of the License file that
3300.24 * accompanied this code. If applicable, add the following below the
3300.25 * License Header, with the fields enclosed by brackets [] replaced by
3300.26 * your own identifying information:
3301.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Meta.java Fri Jul 16 11:47:36 2010 -0400
3301.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Meta.java Fri Jul 16 14:21:50 2010 -0400
3301.3 @@ -1,7 +1,10 @@
3301.4 /*
3301.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3301.6 *
3301.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3301.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3301.9 + *
3301.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3301.11 + * Other names may be trademarks of their respective owners.
3301.12 *
3301.13 * The contents of this file are subject to the terms of either the GNU
3301.14 * General Public License Version 2 only ("GPL") or the Common
3301.15 @@ -13,9 +16,9 @@
3301.16 * specific language governing permissions and limitations under the
3301.17 * License. When distributing the software, include this License Header
3301.18 * Notice in each file and include the License file at
3301.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3301.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3301.21 * particular file as subject to the "Classpath" exception as provided
3301.22 - * by Sun in the GPL Version 2 section of the License file that
3301.23 + * by Oracle in the GPL Version 2 section of the License file that
3301.24 * accompanied this code. If applicable, add the following below the
3301.25 * License Header, with the fields enclosed by brackets [] replaced by
3301.26 * your own identifying information:
3302.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Noframes.java Fri Jul 16 11:47:36 2010 -0400
3302.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Noframes.java Fri Jul 16 14:21:50 2010 -0400
3302.3 @@ -1,7 +1,10 @@
3302.4 /*
3302.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3302.6 *
3302.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3302.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3302.9 + *
3302.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3302.11 + * Other names may be trademarks of their respective owners.
3302.12 *
3302.13 * The contents of this file are subject to the terms of either the GNU
3302.14 * General Public License Version 2 only ("GPL") or the Common
3302.15 @@ -13,9 +16,9 @@
3302.16 * specific language governing permissions and limitations under the
3302.17 * License. When distributing the software, include this License Header
3302.18 * Notice in each file and include the License file at
3302.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3302.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3302.21 * particular file as subject to the "Classpath" exception as provided
3302.22 - * by Sun in the GPL Version 2 section of the License file that
3302.23 + * by Oracle in the GPL Version 2 section of the License file that
3302.24 * accompanied this code. If applicable, add the following below the
3302.25 * License Header, with the fields enclosed by brackets [] replaced by
3302.26 * your own identifying information:
3303.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Noscript.java Fri Jul 16 11:47:36 2010 -0400
3303.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Noscript.java Fri Jul 16 14:21:50 2010 -0400
3303.3 @@ -1,7 +1,10 @@
3303.4 /*
3303.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3303.6 *
3303.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3303.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3303.9 + *
3303.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3303.11 + * Other names may be trademarks of their respective owners.
3303.12 *
3303.13 * The contents of this file are subject to the terms of either the GNU
3303.14 * General Public License Version 2 only ("GPL") or the Common
3303.15 @@ -13,9 +16,9 @@
3303.16 * specific language governing permissions and limitations under the
3303.17 * License. When distributing the software, include this License Header
3303.18 * Notice in each file and include the License file at
3303.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3303.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3303.21 * particular file as subject to the "Classpath" exception as provided
3303.22 - * by Sun in the GPL Version 2 section of the License file that
3303.23 + * by Oracle in the GPL Version 2 section of the License file that
3303.24 * accompanied this code. If applicable, add the following below the
3303.25 * License Header, with the fields enclosed by brackets [] replaced by
3303.26 * your own identifying information:
3304.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Object.java Fri Jul 16 11:47:36 2010 -0400
3304.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Object.java Fri Jul 16 14:21:50 2010 -0400
3304.3 @@ -1,7 +1,10 @@
3304.4 /*
3304.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3304.6 *
3304.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3304.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3304.9 + *
3304.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3304.11 + * Other names may be trademarks of their respective owners.
3304.12 *
3304.13 * The contents of this file are subject to the terms of either the GNU
3304.14 * General Public License Version 2 only ("GPL") or the Common
3304.15 @@ -13,9 +16,9 @@
3304.16 * specific language governing permissions and limitations under the
3304.17 * License. When distributing the software, include this License Header
3304.18 * Notice in each file and include the License file at
3304.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3304.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3304.21 * particular file as subject to the "Classpath" exception as provided
3304.22 - * by Sun in the GPL Version 2 section of the License file that
3304.23 + * by Oracle in the GPL Version 2 section of the License file that
3304.24 * accompanied this code. If applicable, add the following below the
3304.25 * License Header, with the fields enclosed by brackets [] replaced by
3304.26 * your own identifying information:
3305.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Ol.java Fri Jul 16 11:47:36 2010 -0400
3305.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Ol.java Fri Jul 16 14:21:50 2010 -0400
3305.3 @@ -1,7 +1,10 @@
3305.4 /*
3305.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3305.6 *
3305.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3305.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3305.9 + *
3305.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3305.11 + * Other names may be trademarks of their respective owners.
3305.12 *
3305.13 * The contents of this file are subject to the terms of either the GNU
3305.14 * General Public License Version 2 only ("GPL") or the Common
3305.15 @@ -13,9 +16,9 @@
3305.16 * specific language governing permissions and limitations under the
3305.17 * License. When distributing the software, include this License Header
3305.18 * Notice in each file and include the License file at
3305.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3305.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3305.21 * particular file as subject to the "Classpath" exception as provided
3305.22 - * by Sun in the GPL Version 2 section of the License file that
3305.23 + * by Oracle in the GPL Version 2 section of the License file that
3305.24 * accompanied this code. If applicable, add the following below the
3305.25 * License Header, with the fields enclosed by brackets [] replaced by
3305.26 * your own identifying information:
3306.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/OlBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3306.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/OlBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3306.3 @@ -2,7 +2,10 @@
3306.4 /*
3306.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3306.6 *
3306.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3306.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3306.9 + *
3306.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3306.11 + * Other names may be trademarks of their respective owners.
3306.12 *
3306.13 * The contents of this file are subject to the terms of either the GNU
3306.14 * General Public License Version 2 only ("GPL") or the Common
3306.15 @@ -14,9 +17,9 @@
3306.16 * specific language governing permissions and limitations under the
3306.17 * License. When distributing the software, include this License Header
3306.18 * Notice in each file and include the License file at
3306.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3306.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3306.21 * particular file as subject to the "Classpath" exception as provided
3306.22 - * by Sun in the GPL Version 2 section of the License file that
3306.23 + * by Oracle in the GPL Version 2 section of the License file that
3306.24 * accompanied this code. If applicable, add the following below the
3306.25 * License Header, with the fields enclosed by brackets [] replaced by
3306.26 * your own identifying information:
3307.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/OlDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3307.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/OlDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3307.3 @@ -1,7 +1,10 @@
3307.4 /*
3307.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3307.6 *
3307.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3307.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3307.9 + *
3307.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3307.11 + * Other names may be trademarks of their respective owners.
3307.12 *
3307.13 * The contents of this file are subject to the terms of either the GNU
3307.14 * General Public License Version 2 only ("GPL") or the Common
3307.15 @@ -13,9 +16,9 @@
3307.16 * specific language governing permissions and limitations under the
3307.17 * License. When distributing the software, include this License Header
3307.18 * Notice in each file and include the License file at
3307.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3307.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3307.21 * particular file as subject to the "Classpath" exception as provided
3307.22 - * by Sun in the GPL Version 2 section of the License file that
3307.23 + * by Oracle in the GPL Version 2 section of the License file that
3307.24 * accompanied this code. If applicable, add the following below the
3307.25 * License Header, with the fields enclosed by brackets [] replaced by
3307.26 * your own identifying information:
3308.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Optgroup.java Fri Jul 16 11:47:36 2010 -0400
3308.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Optgroup.java Fri Jul 16 14:21:50 2010 -0400
3308.3 @@ -1,7 +1,10 @@
3308.4 /*
3308.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3308.6 *
3308.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3308.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3308.9 + *
3308.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3308.11 + * Other names may be trademarks of their respective owners.
3308.12 *
3308.13 * The contents of this file are subject to the terms of either the GNU
3308.14 * General Public License Version 2 only ("GPL") or the Common
3308.15 @@ -13,9 +16,9 @@
3308.16 * specific language governing permissions and limitations under the
3308.17 * License. When distributing the software, include this License Header
3308.18 * Notice in each file and include the License file at
3308.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3308.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3308.21 * particular file as subject to the "Classpath" exception as provided
3308.22 - * by Sun in the GPL Version 2 section of the License file that
3308.23 + * by Oracle in the GPL Version 2 section of the License file that
3308.24 * accompanied this code. If applicable, add the following below the
3308.25 * License Header, with the fields enclosed by brackets [] replaced by
3308.26 * your own identifying information:
3309.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Option.java Fri Jul 16 11:47:36 2010 -0400
3309.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Option.java Fri Jul 16 14:21:50 2010 -0400
3309.3 @@ -1,7 +1,10 @@
3309.4 /*
3309.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3309.6 *
3309.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3309.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3309.9 + *
3309.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3309.11 + * Other names may be trademarks of their respective owners.
3309.12 *
3309.13 * The contents of this file are subject to the terms of either the GNU
3309.14 * General Public License Version 2 only ("GPL") or the Common
3309.15 @@ -13,9 +16,9 @@
3309.16 * specific language governing permissions and limitations under the
3309.17 * License. When distributing the software, include this License Header
3309.18 * Notice in each file and include the License file at
3309.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3309.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3309.21 * particular file as subject to the "Classpath" exception as provided
3309.22 - * by Sun in the GPL Version 2 section of the License file that
3309.23 + * by Oracle in the GPL Version 2 section of the License file that
3309.24 * accompanied this code. If applicable, add the following below the
3309.25 * License Header, with the fields enclosed by brackets [] replaced by
3309.26 * your own identifying information:
3310.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/P.java Fri Jul 16 11:47:36 2010 -0400
3310.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/P.java Fri Jul 16 14:21:50 2010 -0400
3310.3 @@ -1,7 +1,10 @@
3310.4 /*
3310.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3310.6 *
3310.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3310.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3310.9 + *
3310.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3310.11 + * Other names may be trademarks of their respective owners.
3310.12 *
3310.13 * The contents of this file are subject to the terms of either the GNU
3310.14 * General Public License Version 2 only ("GPL") or the Common
3310.15 @@ -13,9 +16,9 @@
3310.16 * specific language governing permissions and limitations under the
3310.17 * License. When distributing the software, include this License Header
3310.18 * Notice in each file and include the License file at
3310.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3310.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3310.21 * particular file as subject to the "Classpath" exception as provided
3310.22 - * by Sun in the GPL Version 2 section of the License file that
3310.23 + * by Oracle in the GPL Version 2 section of the License file that
3310.24 * accompanied this code. If applicable, add the following below the
3310.25 * License Header, with the fields enclosed by brackets [] replaced by
3310.26 * your own identifying information:
3311.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/PBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3311.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/PBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3311.3 @@ -2,7 +2,10 @@
3311.4 /*
3311.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3311.6 *
3311.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3311.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3311.9 + *
3311.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3311.11 + * Other names may be trademarks of their respective owners.
3311.12 *
3311.13 * The contents of this file are subject to the terms of either the GNU
3311.14 * General Public License Version 2 only ("GPL") or the Common
3311.15 @@ -14,9 +17,9 @@
3311.16 * specific language governing permissions and limitations under the
3311.17 * License. When distributing the software, include this License Header
3311.18 * Notice in each file and include the License file at
3311.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3311.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3311.21 * particular file as subject to the "Classpath" exception as provided
3311.22 - * by Sun in the GPL Version 2 section of the License file that
3311.23 + * by Oracle in the GPL Version 2 section of the License file that
3311.24 * accompanied this code. If applicable, add the following below the
3311.25 * License Header, with the fields enclosed by brackets [] replaced by
3311.26 * your own identifying information:
3312.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Param.java Fri Jul 16 11:47:36 2010 -0400
3312.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Param.java Fri Jul 16 14:21:50 2010 -0400
3312.3 @@ -1,7 +1,10 @@
3312.4 /*
3312.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3312.6 *
3312.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3312.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3312.9 + *
3312.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3312.11 + * Other names may be trademarks of their respective owners.
3312.12 *
3312.13 * The contents of this file are subject to the terms of either the GNU
3312.14 * General Public License Version 2 only ("GPL") or the Common
3312.15 @@ -13,9 +16,9 @@
3312.16 * specific language governing permissions and limitations under the
3312.17 * License. When distributing the software, include this License Header
3312.18 * Notice in each file and include the License file at
3312.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3312.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3312.21 * particular file as subject to the "Classpath" exception as provided
3312.22 - * by Sun in the GPL Version 2 section of the License file that
3312.23 + * by Oracle in the GPL Version 2 section of the License file that
3312.24 * accompanied this code. If applicable, add the following below the
3312.25 * License Header, with the fields enclosed by brackets [] replaced by
3312.26 * your own identifying information:
3313.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Pre.java Fri Jul 16 11:47:36 2010 -0400
3313.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Pre.java Fri Jul 16 14:21:50 2010 -0400
3313.3 @@ -1,7 +1,10 @@
3313.4 /*
3313.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3313.6 *
3313.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3313.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3313.9 + *
3313.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3313.11 + * Other names may be trademarks of their respective owners.
3313.12 *
3313.13 * The contents of this file are subject to the terms of either the GNU
3313.14 * General Public License Version 2 only ("GPL") or the Common
3313.15 @@ -13,9 +16,9 @@
3313.16 * specific language governing permissions and limitations under the
3313.17 * License. When distributing the software, include this License Header
3313.18 * Notice in each file and include the License file at
3313.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3313.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3313.21 * particular file as subject to the "Classpath" exception as provided
3313.22 - * by Sun in the GPL Version 2 section of the License file that
3313.23 + * by Oracle in the GPL Version 2 section of the License file that
3313.24 * accompanied this code. If applicable, add the following below the
3313.25 * License Header, with the fields enclosed by brackets [] replaced by
3313.26 * your own identifying information:
3314.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Q.java Fri Jul 16 11:47:36 2010 -0400
3314.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Q.java Fri Jul 16 14:21:50 2010 -0400
3314.3 @@ -1,7 +1,10 @@
3314.4 /*
3314.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3314.6 *
3314.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3314.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3314.9 + *
3314.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3314.11 + * Other names may be trademarks of their respective owners.
3314.12 *
3314.13 * The contents of this file are subject to the terms of either the GNU
3314.14 * General Public License Version 2 only ("GPL") or the Common
3314.15 @@ -13,9 +16,9 @@
3314.16 * specific language governing permissions and limitations under the
3314.17 * License. When distributing the software, include this License Header
3314.18 * Notice in each file and include the License file at
3314.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3314.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3314.21 * particular file as subject to the "Classpath" exception as provided
3314.22 - * by Sun in the GPL Version 2 section of the License file that
3314.23 + * by Oracle in the GPL Version 2 section of the License file that
3314.24 * accompanied this code. If applicable, add the following below the
3314.25 * License Header, with the fields enclosed by brackets [] replaced by
3314.26 * your own identifying information:
3315.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/RString.java Fri Jul 16 11:47:36 2010 -0400
3315.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/RString.java Fri Jul 16 14:21:50 2010 -0400
3315.3 @@ -1,7 +1,10 @@
3315.4 /*
3315.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3315.6 *
3315.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3315.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3315.9 + *
3315.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3315.11 + * Other names may be trademarks of their respective owners.
3315.12 *
3315.13 * The contents of this file are subject to the terms of either the GNU
3315.14 * General Public License Version 2 only ("GPL") or the Common
3315.15 @@ -13,9 +16,9 @@
3315.16 * specific language governing permissions and limitations under the
3315.17 * License. When distributing the software, include this License Header
3315.18 * Notice in each file and include the License file at
3315.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3315.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3315.21 * particular file as subject to the "Classpath" exception as provided
3315.22 - * by Sun in the GPL Version 2 section of the License file that
3315.23 + * by Oracle in the GPL Version 2 section of the License file that
3315.24 * accompanied this code. If applicable, add the following below the
3315.25 * License Header, with the fields enclosed by brackets [] replaced by
3315.26 * your own identifying information:
3316.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/S.java Fri Jul 16 11:47:36 2010 -0400
3316.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/S.java Fri Jul 16 14:21:50 2010 -0400
3316.3 @@ -1,7 +1,10 @@
3316.4 /*
3316.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3316.6 *
3316.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3316.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3316.9 + *
3316.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3316.11 + * Other names may be trademarks of their respective owners.
3316.12 *
3316.13 * The contents of this file are subject to the terms of either the GNU
3316.14 * General Public License Version 2 only ("GPL") or the Common
3316.15 @@ -13,9 +16,9 @@
3316.16 * specific language governing permissions and limitations under the
3316.17 * License. When distributing the software, include this License Header
3316.18 * Notice in each file and include the License file at
3316.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3316.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3316.21 * particular file as subject to the "Classpath" exception as provided
3316.22 - * by Sun in the GPL Version 2 section of the License file that
3316.23 + * by Oracle in the GPL Version 2 section of the License file that
3316.24 * accompanied this code. If applicable, add the following below the
3316.25 * License Header, with the fields enclosed by brackets [] replaced by
3316.26 * your own identifying information:
3317.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Samp.java Fri Jul 16 11:47:36 2010 -0400
3317.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Samp.java Fri Jul 16 14:21:50 2010 -0400
3317.3 @@ -1,7 +1,10 @@
3317.4 /*
3317.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3317.6 *
3317.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3317.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3317.9 + *
3317.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3317.11 + * Other names may be trademarks of their respective owners.
3317.12 *
3317.13 * The contents of this file are subject to the terms of either the GNU
3317.14 * General Public License Version 2 only ("GPL") or the Common
3317.15 @@ -13,9 +16,9 @@
3317.16 * specific language governing permissions and limitations under the
3317.17 * License. When distributing the software, include this License Header
3317.18 * Notice in each file and include the License file at
3317.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3317.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3317.21 * particular file as subject to the "Classpath" exception as provided
3317.22 - * by Sun in the GPL Version 2 section of the License file that
3317.23 + * by Oracle in the GPL Version 2 section of the License file that
3317.24 * accompanied this code. If applicable, add the following below the
3317.25 * License Header, with the fields enclosed by brackets [] replaced by
3317.26 * your own identifying information:
3318.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Script.java Fri Jul 16 11:47:36 2010 -0400
3318.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Script.java Fri Jul 16 14:21:50 2010 -0400
3318.3 @@ -1,7 +1,10 @@
3318.4 /*
3318.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3318.6 *
3318.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3318.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3318.9 + *
3318.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3318.11 + * Other names may be trademarks of their respective owners.
3318.12 *
3318.13 * The contents of this file are subject to the terms of either the GNU
3318.14 * General Public License Version 2 only ("GPL") or the Common
3318.15 @@ -13,9 +16,9 @@
3318.16 * specific language governing permissions and limitations under the
3318.17 * License. When distributing the software, include this License Header
3318.18 * Notice in each file and include the License file at
3318.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3318.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3318.21 * particular file as subject to the "Classpath" exception as provided
3318.22 - * by Sun in the GPL Version 2 section of the License file that
3318.23 + * by Oracle in the GPL Version 2 section of the License file that
3318.24 * accompanied this code. If applicable, add the following below the
3318.25 * License Header, with the fields enclosed by brackets [] replaced by
3318.26 * your own identifying information:
3319.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Select.java Fri Jul 16 11:47:36 2010 -0400
3319.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Select.java Fri Jul 16 14:21:50 2010 -0400
3319.3 @@ -1,7 +1,10 @@
3319.4 /*
3319.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3319.6 *
3319.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3319.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3319.9 + *
3319.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3319.11 + * Other names may be trademarks of their respective owners.
3319.12 *
3319.13 * The contents of this file are subject to the terms of either the GNU
3319.14 * General Public License Version 2 only ("GPL") or the Common
3319.15 @@ -13,9 +16,9 @@
3319.16 * specific language governing permissions and limitations under the
3319.17 * License. When distributing the software, include this License Header
3319.18 * Notice in each file and include the License file at
3319.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3319.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3319.21 * particular file as subject to the "Classpath" exception as provided
3319.22 - * by Sun in the GPL Version 2 section of the License file that
3319.23 + * by Oracle in the GPL Version 2 section of the License file that
3319.24 * accompanied this code. If applicable, add the following below the
3319.25 * License Header, with the fields enclosed by brackets [] replaced by
3319.26 * your own identifying information:
3320.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Small.java Fri Jul 16 11:47:36 2010 -0400
3320.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Small.java Fri Jul 16 14:21:50 2010 -0400
3320.3 @@ -1,7 +1,10 @@
3320.4 /*
3320.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3320.6 *
3320.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3320.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3320.9 + *
3320.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3320.11 + * Other names may be trademarks of their respective owners.
3320.12 *
3320.13 * The contents of this file are subject to the terms of either the GNU
3320.14 * General Public License Version 2 only ("GPL") or the Common
3320.15 @@ -13,9 +16,9 @@
3320.16 * specific language governing permissions and limitations under the
3320.17 * License. When distributing the software, include this License Header
3320.18 * Notice in each file and include the License file at
3320.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3320.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3320.21 * particular file as subject to the "Classpath" exception as provided
3320.22 - * by Sun in the GPL Version 2 section of the License file that
3320.23 + * by Oracle in the GPL Version 2 section of the License file that
3320.24 * accompanied this code. If applicable, add the following below the
3320.25 * License Header, with the fields enclosed by brackets [] replaced by
3320.26 * your own identifying information:
3321.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Span.java Fri Jul 16 11:47:36 2010 -0400
3321.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Span.java Fri Jul 16 14:21:50 2010 -0400
3321.3 @@ -1,7 +1,10 @@
3321.4 /*
3321.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3321.6 *
3321.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3321.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3321.9 + *
3321.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3321.11 + * Other names may be trademarks of their respective owners.
3321.12 *
3321.13 * The contents of this file are subject to the terms of either the GNU
3321.14 * General Public License Version 2 only ("GPL") or the Common
3321.15 @@ -13,9 +16,9 @@
3321.16 * specific language governing permissions and limitations under the
3321.17 * License. When distributing the software, include this License Header
3321.18 * Notice in each file and include the License file at
3321.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3321.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3321.21 * particular file as subject to the "Classpath" exception as provided
3321.22 - * by Sun in the GPL Version 2 section of the License file that
3321.23 + * by Oracle in the GPL Version 2 section of the License file that
3321.24 * accompanied this code. If applicable, add the following below the
3321.25 * License Header, with the fields enclosed by brackets [] replaced by
3321.26 * your own identifying information:
3322.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/SpanBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3322.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/SpanBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3322.3 @@ -2,7 +2,10 @@
3322.4 /*
3322.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3322.6 *
3322.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3322.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3322.9 + *
3322.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3322.11 + * Other names may be trademarks of their respective owners.
3322.12 *
3322.13 * The contents of this file are subject to the terms of either the GNU
3322.14 * General Public License Version 2 only ("GPL") or the Common
3322.15 @@ -14,9 +17,9 @@
3322.16 * specific language governing permissions and limitations under the
3322.17 * License. When distributing the software, include this License Header
3322.18 * Notice in each file and include the License file at
3322.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3322.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3322.21 * particular file as subject to the "Classpath" exception as provided
3322.22 - * by Sun in the GPL Version 2 section of the License file that
3322.23 + * by Oracle in the GPL Version 2 section of the License file that
3322.24 * accompanied this code. If applicable, add the following below the
3322.25 * License Header, with the fields enclosed by brackets [] replaced by
3322.26 * your own identifying information:
3323.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Strike.java Fri Jul 16 11:47:36 2010 -0400
3323.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Strike.java Fri Jul 16 14:21:50 2010 -0400
3323.3 @@ -1,7 +1,10 @@
3323.4 /*
3323.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3323.6 *
3323.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3323.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3323.9 + *
3323.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3323.11 + * Other names may be trademarks of their respective owners.
3323.12 *
3323.13 * The contents of this file are subject to the terms of either the GNU
3323.14 * General Public License Version 2 only ("GPL") or the Common
3323.15 @@ -13,9 +16,9 @@
3323.16 * specific language governing permissions and limitations under the
3323.17 * License. When distributing the software, include this License Header
3323.18 * Notice in each file and include the License file at
3323.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3323.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3323.21 * particular file as subject to the "Classpath" exception as provided
3323.22 - * by Sun in the GPL Version 2 section of the License file that
3323.23 + * by Oracle in the GPL Version 2 section of the License file that
3323.24 * accompanied this code. If applicable, add the following below the
3323.25 * License Header, with the fields enclosed by brackets [] replaced by
3323.26 * your own identifying information:
3324.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Strong.java Fri Jul 16 11:47:36 2010 -0400
3324.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Strong.java Fri Jul 16 14:21:50 2010 -0400
3324.3 @@ -1,7 +1,10 @@
3324.4 /*
3324.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3324.6 *
3324.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3324.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3324.9 + *
3324.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3324.11 + * Other names may be trademarks of their respective owners.
3324.12 *
3324.13 * The contents of this file are subject to the terms of either the GNU
3324.14 * General Public License Version 2 only ("GPL") or the Common
3324.15 @@ -13,9 +16,9 @@
3324.16 * specific language governing permissions and limitations under the
3324.17 * License. When distributing the software, include this License Header
3324.18 * Notice in each file and include the License file at
3324.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3324.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3324.21 * particular file as subject to the "Classpath" exception as provided
3324.22 - * by Sun in the GPL Version 2 section of the License file that
3324.23 + * by Oracle in the GPL Version 2 section of the License file that
3324.24 * accompanied this code. If applicable, add the following below the
3324.25 * License Header, with the fields enclosed by brackets [] replaced by
3324.26 * your own identifying information:
3325.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Style.java Fri Jul 16 11:47:36 2010 -0400
3325.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Style.java Fri Jul 16 14:21:50 2010 -0400
3325.3 @@ -1,7 +1,10 @@
3325.4 /*
3325.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3325.6 *
3325.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3325.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3325.9 + *
3325.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3325.11 + * Other names may be trademarks of their respective owners.
3325.12 *
3325.13 * The contents of this file are subject to the terms of either the GNU
3325.14 * General Public License Version 2 only ("GPL") or the Common
3325.15 @@ -13,9 +16,9 @@
3325.16 * specific language governing permissions and limitations under the
3325.17 * License. When distributing the software, include this License Header
3325.18 * Notice in each file and include the License file at
3325.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3325.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3325.21 * particular file as subject to the "Classpath" exception as provided
3325.22 - * by Sun in the GPL Version 2 section of the License file that
3325.23 + * by Oracle in the GPL Version 2 section of the License file that
3325.24 * accompanied this code. If applicable, add the following below the
3325.25 * License Header, with the fields enclosed by brackets [] replaced by
3325.26 * your own identifying information:
3326.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Sub.java Fri Jul 16 11:47:36 2010 -0400
3326.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Sub.java Fri Jul 16 14:21:50 2010 -0400
3326.3 @@ -1,7 +1,10 @@
3326.4 /*
3326.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3326.6 *
3326.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3326.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3326.9 + *
3326.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3326.11 + * Other names may be trademarks of their respective owners.
3326.12 *
3326.13 * The contents of this file are subject to the terms of either the GNU
3326.14 * General Public License Version 2 only ("GPL") or the Common
3326.15 @@ -13,9 +16,9 @@
3326.16 * specific language governing permissions and limitations under the
3326.17 * License. When distributing the software, include this License Header
3326.18 * Notice in each file and include the License file at
3326.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3326.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3326.21 * particular file as subject to the "Classpath" exception as provided
3326.22 - * by Sun in the GPL Version 2 section of the License file that
3326.23 + * by Oracle in the GPL Version 2 section of the License file that
3326.24 * accompanied this code. If applicable, add the following below the
3326.25 * License Header, with the fields enclosed by brackets [] replaced by
3326.26 * your own identifying information:
3327.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Sup.java Fri Jul 16 11:47:36 2010 -0400
3327.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Sup.java Fri Jul 16 14:21:50 2010 -0400
3327.3 @@ -1,7 +1,10 @@
3327.4 /*
3327.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3327.6 *
3327.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3327.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3327.9 + *
3327.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3327.11 + * Other names may be trademarks of their respective owners.
3327.12 *
3327.13 * The contents of this file are subject to the terms of either the GNU
3327.14 * General Public License Version 2 only ("GPL") or the Common
3327.15 @@ -13,9 +16,9 @@
3327.16 * specific language governing permissions and limitations under the
3327.17 * License. When distributing the software, include this License Header
3327.18 * Notice in each file and include the License file at
3327.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3327.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3327.21 * particular file as subject to the "Classpath" exception as provided
3327.22 - * by Sun in the GPL Version 2 section of the License file that
3327.23 + * by Oracle in the GPL Version 2 section of the License file that
3327.24 * accompanied this code. If applicable, add the following below the
3327.25 * License Header, with the fields enclosed by brackets [] replaced by
3327.26 * your own identifying information:
3328.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Table.java Fri Jul 16 11:47:36 2010 -0400
3328.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Table.java Fri Jul 16 14:21:50 2010 -0400
3328.3 @@ -1,7 +1,10 @@
3328.4 /*
3328.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3328.6 *
3328.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3328.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3328.9 + *
3328.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3328.11 + * Other names may be trademarks of their respective owners.
3328.12 *
3328.13 * The contents of this file are subject to the terms of either the GNU
3328.14 * General Public License Version 2 only ("GPL") or the Common
3328.15 @@ -13,9 +16,9 @@
3328.16 * specific language governing permissions and limitations under the
3328.17 * License. When distributing the software, include this License Header
3328.18 * Notice in each file and include the License file at
3328.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3328.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3328.21 * particular file as subject to the "Classpath" exception as provided
3328.22 - * by Sun in the GPL Version 2 section of the License file that
3328.23 + * by Oracle in the GPL Version 2 section of the License file that
3328.24 * accompanied this code. If applicable, add the following below the
3328.25 * License Header, with the fields enclosed by brackets [] replaced by
3328.26 * your own identifying information:
3329.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/TableBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3329.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/TableBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3329.3 @@ -2,7 +2,10 @@
3329.4 /*
3329.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3329.6 *
3329.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3329.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3329.9 + *
3329.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3329.11 + * Other names may be trademarks of their respective owners.
3329.12 *
3329.13 * The contents of this file are subject to the terms of either the GNU
3329.14 * General Public License Version 2 only ("GPL") or the Common
3329.15 @@ -14,9 +17,9 @@
3329.16 * specific language governing permissions and limitations under the
3329.17 * License. When distributing the software, include this License Header
3329.18 * Notice in each file and include the License file at
3329.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3329.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3329.21 * particular file as subject to the "Classpath" exception as provided
3329.22 - * by Sun in the GPL Version 2 section of the License file that
3329.23 + * by Oracle in the GPL Version 2 section of the License file that
3329.24 * accompanied this code. If applicable, add the following below the
3329.25 * License Header, with the fields enclosed by brackets [] replaced by
3329.26 * your own identifying information:
3330.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/TableDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3330.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/TableDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3330.3 @@ -1,7 +1,10 @@
3330.4 /*
3330.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3330.6 *
3330.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3330.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3330.9 + *
3330.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3330.11 + * Other names may be trademarks of their respective owners.
3330.12 *
3330.13 * The contents of this file are subject to the terms of either the GNU
3330.14 * General Public License Version 2 only ("GPL") or the Common
3330.15 @@ -13,9 +16,9 @@
3330.16 * specific language governing permissions and limitations under the
3330.17 * License. When distributing the software, include this License Header
3330.18 * Notice in each file and include the License file at
3330.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3330.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3330.21 * particular file as subject to the "Classpath" exception as provided
3330.22 - * by Sun in the GPL Version 2 section of the License file that
3330.23 + * by Oracle in the GPL Version 2 section of the License file that
3330.24 * accompanied this code. If applicable, add the following below the
3330.25 * License Header, with the fields enclosed by brackets [] replaced by
3330.26 * your own identifying information:
3331.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/TableSequence.java Fri Jul 16 11:47:36 2010 -0400
3331.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/TableSequence.java Fri Jul 16 14:21:50 2010 -0400
3331.3 @@ -1,7 +1,10 @@
3331.4 /*
3331.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3331.6 *
3331.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3331.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3331.9 + *
3331.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3331.11 + * Other names may be trademarks of their respective owners.
3331.12 *
3331.13 * The contents of this file are subject to the terms of either the GNU
3331.14 * General Public License Version 2 only ("GPL") or the Common
3331.15 @@ -13,9 +16,9 @@
3331.16 * specific language governing permissions and limitations under the
3331.17 * License. When distributing the software, include this License Header
3331.18 * Notice in each file and include the License file at
3331.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3331.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3331.21 * particular file as subject to the "Classpath" exception as provided
3331.22 - * by Sun in the GPL Version 2 section of the License file that
3331.23 + * by Oracle in the GPL Version 2 section of the License file that
3331.24 * accompanied this code. If applicable, add the following below the
3331.25 * License Header, with the fields enclosed by brackets [] replaced by
3331.26 * your own identifying information:
3332.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Tbody.java Fri Jul 16 11:47:36 2010 -0400
3332.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Tbody.java Fri Jul 16 14:21:50 2010 -0400
3332.3 @@ -1,7 +1,10 @@
3332.4 /*
3332.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3332.6 *
3332.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3332.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3332.9 + *
3332.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3332.11 + * Other names may be trademarks of their respective owners.
3332.12 *
3332.13 * The contents of this file are subject to the terms of either the GNU
3332.14 * General Public License Version 2 only ("GPL") or the Common
3332.15 @@ -13,9 +16,9 @@
3332.16 * specific language governing permissions and limitations under the
3332.17 * License. When distributing the software, include this License Header
3332.18 * Notice in each file and include the License file at
3332.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3332.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3332.21 * particular file as subject to the "Classpath" exception as provided
3332.22 - * by Sun in the GPL Version 2 section of the License file that
3332.23 + * by Oracle in the GPL Version 2 section of the License file that
3332.24 * accompanied this code. If applicable, add the following below the
3332.25 * License Header, with the fields enclosed by brackets [] replaced by
3332.26 * your own identifying information:
3333.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Td.java Fri Jul 16 11:47:36 2010 -0400
3333.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Td.java Fri Jul 16 14:21:50 2010 -0400
3333.3 @@ -1,7 +1,10 @@
3333.4 /*
3333.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3333.6 *
3333.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3333.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3333.9 + *
3333.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3333.11 + * Other names may be trademarks of their respective owners.
3333.12 *
3333.13 * The contents of this file are subject to the terms of either the GNU
3333.14 * General Public License Version 2 only ("GPL") or the Common
3333.15 @@ -13,9 +16,9 @@
3333.16 * specific language governing permissions and limitations under the
3333.17 * License. When distributing the software, include this License Header
3333.18 * Notice in each file and include the License file at
3333.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3333.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3333.21 * particular file as subject to the "Classpath" exception as provided
3333.22 - * by Sun in the GPL Version 2 section of the License file that
3333.23 + * by Oracle in the GPL Version 2 section of the License file that
3333.24 * accompanied this code. If applicable, add the following below the
3333.25 * License Header, with the fields enclosed by brackets [] replaced by
3333.26 * your own identifying information:
3334.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Textarea.java Fri Jul 16 11:47:36 2010 -0400
3334.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Textarea.java Fri Jul 16 14:21:50 2010 -0400
3334.3 @@ -1,7 +1,10 @@
3334.4 /*
3334.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3334.6 *
3334.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3334.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3334.9 + *
3334.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3334.11 + * Other names may be trademarks of their respective owners.
3334.12 *
3334.13 * The contents of this file are subject to the terms of either the GNU
3334.14 * General Public License Version 2 only ("GPL") or the Common
3334.15 @@ -13,9 +16,9 @@
3334.16 * specific language governing permissions and limitations under the
3334.17 * License. When distributing the software, include this License Header
3334.18 * Notice in each file and include the License file at
3334.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3334.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3334.21 * particular file as subject to the "Classpath" exception as provided
3334.22 - * by Sun in the GPL Version 2 section of the License file that
3334.23 + * by Oracle in the GPL Version 2 section of the License file that
3334.24 * accompanied this code. If applicable, add the following below the
3334.25 * License Header, with the fields enclosed by brackets [] replaced by
3334.26 * your own identifying information:
3335.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Tfoot.java Fri Jul 16 11:47:36 2010 -0400
3335.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Tfoot.java Fri Jul 16 14:21:50 2010 -0400
3335.3 @@ -1,7 +1,10 @@
3335.4 /*
3335.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3335.6 *
3335.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3335.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3335.9 + *
3335.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3335.11 + * Other names may be trademarks of their respective owners.
3335.12 *
3335.13 * The contents of this file are subject to the terms of either the GNU
3335.14 * General Public License Version 2 only ("GPL") or the Common
3335.15 @@ -13,9 +16,9 @@
3335.16 * specific language governing permissions and limitations under the
3335.17 * License. When distributing the software, include this License Header
3335.18 * Notice in each file and include the License file at
3335.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3335.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3335.21 * particular file as subject to the "Classpath" exception as provided
3335.22 - * by Sun in the GPL Version 2 section of the License file that
3335.23 + * by Oracle in the GPL Version 2 section of the License file that
3335.24 * accompanied this code. If applicable, add the following below the
3335.25 * License Header, with the fields enclosed by brackets [] replaced by
3335.26 * your own identifying information:
3336.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Th.java Fri Jul 16 11:47:36 2010 -0400
3336.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Th.java Fri Jul 16 14:21:50 2010 -0400
3336.3 @@ -1,7 +1,10 @@
3336.4 /*
3336.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3336.6 *
3336.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3336.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3336.9 + *
3336.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3336.11 + * Other names may be trademarks of their respective owners.
3336.12 *
3336.13 * The contents of this file are subject to the terms of either the GNU
3336.14 * General Public License Version 2 only ("GPL") or the Common
3336.15 @@ -13,9 +16,9 @@
3336.16 * specific language governing permissions and limitations under the
3336.17 * License. When distributing the software, include this License Header
3336.18 * Notice in each file and include the License file at
3336.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3336.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3336.21 * particular file as subject to the "Classpath" exception as provided
3336.22 - * by Sun in the GPL Version 2 section of the License file that
3336.23 + * by Oracle in the GPL Version 2 section of the License file that
3336.24 * accompanied this code. If applicable, add the following below the
3336.25 * License Header, with the fields enclosed by brackets [] replaced by
3336.26 * your own identifying information:
3337.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Thead.java Fri Jul 16 11:47:36 2010 -0400
3337.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Thead.java Fri Jul 16 14:21:50 2010 -0400
3337.3 @@ -1,7 +1,10 @@
3337.4 /*
3337.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3337.6 *
3337.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3337.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3337.9 + *
3337.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3337.11 + * Other names may be trademarks of their respective owners.
3337.12 *
3337.13 * The contents of this file are subject to the terms of either the GNU
3337.14 * General Public License Version 2 only ("GPL") or the Common
3337.15 @@ -13,9 +16,9 @@
3337.16 * specific language governing permissions and limitations under the
3337.17 * License. When distributing the software, include this License Header
3337.18 * Notice in each file and include the License file at
3337.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3337.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3337.21 * particular file as subject to the "Classpath" exception as provided
3337.22 - * by Sun in the GPL Version 2 section of the License file that
3337.23 + * by Oracle in the GPL Version 2 section of the License file that
3337.24 * accompanied this code. If applicable, add the following below the
3337.25 * License Header, with the fields enclosed by brackets [] replaced by
3337.26 * your own identifying information:
3338.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Title.java Fri Jul 16 11:47:36 2010 -0400
3338.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Title.java Fri Jul 16 14:21:50 2010 -0400
3338.3 @@ -1,7 +1,10 @@
3338.4 /*
3338.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3338.6 *
3338.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3338.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3338.9 + *
3338.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3338.11 + * Other names may be trademarks of their respective owners.
3338.12 *
3338.13 * The contents of this file are subject to the terms of either the GNU
3338.14 * General Public License Version 2 only ("GPL") or the Common
3338.15 @@ -13,9 +16,9 @@
3338.16 * specific language governing permissions and limitations under the
3338.17 * License. When distributing the software, include this License Header
3338.18 * Notice in each file and include the License file at
3338.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3338.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3338.21 * particular file as subject to the "Classpath" exception as provided
3338.22 - * by Sun in the GPL Version 2 section of the License file that
3338.23 + * by Oracle in the GPL Version 2 section of the License file that
3338.24 * accompanied this code. If applicable, add the following below the
3338.25 * License Header, with the fields enclosed by brackets [] replaced by
3338.26 * your own identifying information:
3339.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Tr.java Fri Jul 16 11:47:36 2010 -0400
3339.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Tr.java Fri Jul 16 14:21:50 2010 -0400
3339.3 @@ -1,7 +1,10 @@
3339.4 /*
3339.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3339.6 *
3339.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3339.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3339.9 + *
3339.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3339.11 + * Other names may be trademarks of their respective owners.
3339.12 *
3339.13 * The contents of this file are subject to the terms of either the GNU
3339.14 * General Public License Version 2 only ("GPL") or the Common
3339.15 @@ -13,9 +16,9 @@
3339.16 * specific language governing permissions and limitations under the
3339.17 * License. When distributing the software, include this License Header
3339.18 * Notice in each file and include the License file at
3339.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3339.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3339.21 * particular file as subject to the "Classpath" exception as provided
3339.22 - * by Sun in the GPL Version 2 section of the License file that
3339.23 + * by Oracle in the GPL Version 2 section of the License file that
3339.24 * accompanied this code. If applicable, add the following below the
3339.25 * License Header, with the fields enclosed by brackets [] replaced by
3339.26 * your own identifying information:
3340.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Tt.java Fri Jul 16 11:47:36 2010 -0400
3340.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Tt.java Fri Jul 16 14:21:50 2010 -0400
3340.3 @@ -1,7 +1,10 @@
3340.4 /*
3340.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3340.6 *
3340.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3340.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3340.9 + *
3340.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3340.11 + * Other names may be trademarks of their respective owners.
3340.12 *
3340.13 * The contents of this file are subject to the terms of either the GNU
3340.14 * General Public License Version 2 only ("GPL") or the Common
3340.15 @@ -13,9 +16,9 @@
3340.16 * specific language governing permissions and limitations under the
3340.17 * License. When distributing the software, include this License Header
3340.18 * Notice in each file and include the License file at
3340.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3340.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3340.21 * particular file as subject to the "Classpath" exception as provided
3340.22 - * by Sun in the GPL Version 2 section of the License file that
3340.23 + * by Oracle in the GPL Version 2 section of the License file that
3340.24 * accompanied this code. If applicable, add the following below the
3340.25 * License Header, with the fields enclosed by brackets [] replaced by
3340.26 * your own identifying information:
3341.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/U.java Fri Jul 16 11:47:36 2010 -0400
3341.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/U.java Fri Jul 16 14:21:50 2010 -0400
3341.3 @@ -1,7 +1,10 @@
3341.4 /*
3341.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3341.6 *
3341.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3341.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3341.9 + *
3341.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3341.11 + * Other names may be trademarks of their respective owners.
3341.12 *
3341.13 * The contents of this file are subject to the terms of either the GNU
3341.14 * General Public License Version 2 only ("GPL") or the Common
3341.15 @@ -13,9 +16,9 @@
3341.16 * specific language governing permissions and limitations under the
3341.17 * License. When distributing the software, include this License Header
3341.18 * Notice in each file and include the License file at
3341.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3341.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3341.21 * particular file as subject to the "Classpath" exception as provided
3341.22 - * by Sun in the GPL Version 2 section of the License file that
3341.23 + * by Oracle in the GPL Version 2 section of the License file that
3341.24 * accompanied this code. If applicable, add the following below the
3341.25 * License Header, with the fields enclosed by brackets [] replaced by
3341.26 * your own identifying information:
3342.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Ul.java Fri Jul 16 11:47:36 2010 -0400
3342.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Ul.java Fri Jul 16 14:21:50 2010 -0400
3342.3 @@ -1,7 +1,10 @@
3342.4 /*
3342.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3342.6 *
3342.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3342.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3342.9 + *
3342.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3342.11 + * Other names may be trademarks of their respective owners.
3342.12 *
3342.13 * The contents of this file are subject to the terms of either the GNU
3342.14 * General Public License Version 2 only ("GPL") or the Common
3342.15 @@ -13,9 +16,9 @@
3342.16 * specific language governing permissions and limitations under the
3342.17 * License. When distributing the software, include this License Header
3342.18 * Notice in each file and include the License file at
3342.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3342.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3342.21 * particular file as subject to the "Classpath" exception as provided
3342.22 - * by Sun in the GPL Version 2 section of the License file that
3342.23 + * by Oracle in the GPL Version 2 section of the License file that
3342.24 * accompanied this code. If applicable, add the following below the
3342.25 * License Header, with the fields enclosed by brackets [] replaced by
3342.26 * your own identifying information:
3343.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/UlBeanInfo.java Fri Jul 16 11:47:36 2010 -0400
3343.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/UlBeanInfo.java Fri Jul 16 14:21:50 2010 -0400
3343.3 @@ -2,7 +2,10 @@
3343.4 /*
3343.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3343.6 *
3343.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3343.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3343.9 + *
3343.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3343.11 + * Other names may be trademarks of their respective owners.
3343.12 *
3343.13 * The contents of this file are subject to the terms of either the GNU
3343.14 * General Public License Version 2 only ("GPL") or the Common
3343.15 @@ -14,9 +17,9 @@
3343.16 * specific language governing permissions and limitations under the
3343.17 * License. When distributing the software, include this License Header
3343.18 * Notice in each file and include the License file at
3343.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3343.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3343.21 * particular file as subject to the "Classpath" exception as provided
3343.22 - * by Sun in the GPL Version 2 section of the License file that
3343.23 + * by Oracle in the GPL Version 2 section of the License file that
3343.24 * accompanied this code. If applicable, add the following below the
3343.25 * License Header, with the fields enclosed by brackets [] replaced by
3343.26 * your own identifying information:
3344.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/UlDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3344.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/UlDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3344.3 @@ -1,7 +1,10 @@
3344.4 /*
3344.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3344.6 *
3344.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3344.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3344.9 + *
3344.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3344.11 + * Other names may be trademarks of their respective owners.
3344.12 *
3344.13 * The contents of this file are subject to the terms of either the GNU
3344.14 * General Public License Version 2 only ("GPL") or the Common
3344.15 @@ -13,9 +16,9 @@
3344.16 * specific language governing permissions and limitations under the
3344.17 * License. When distributing the software, include this License Header
3344.18 * Notice in each file and include the License file at
3344.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3344.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3344.21 * particular file as subject to the "Classpath" exception as provided
3344.22 - * by Sun in the GPL Version 2 section of the License file that
3344.23 + * by Oracle in the GPL Version 2 section of the License file that
3344.24 * accompanied this code. If applicable, add the following below the
3344.25 * License Header, with the fields enclosed by brackets [] replaced by
3344.26 * your own identifying information:
3345.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Var.java Fri Jul 16 11:47:36 2010 -0400
3345.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/Var.java Fri Jul 16 14:21:50 2010 -0400
3345.3 @@ -1,7 +1,10 @@
3345.4 /*
3345.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3345.6 *
3345.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3345.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3345.9 + *
3345.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3345.11 + * Other names may be trademarks of their respective owners.
3345.12 *
3345.13 * The contents of this file are subject to the terms of either the GNU
3345.14 * General Public License Version 2 only ("GPL") or the Common
3345.15 @@ -13,9 +16,9 @@
3345.16 * specific language governing permissions and limitations under the
3345.17 * License. When distributing the software, include this License Header
3345.18 * Notice in each file and include the License file at
3345.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3345.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3345.21 * particular file as subject to the "Classpath" exception as provided
3345.22 - * by Sun in the GPL Version 2 section of the License file that
3345.23 + * by Oracle in the GPL Version 2 section of the License file that
3345.24 * accompanied this code. If applicable, add the following below the
3345.25 * License Header, with the fields enclosed by brackets [] replaced by
3345.26 * your own identifying information:
3346.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/XhtmlDesignInfo.java Fri Jul 16 11:47:36 2010 -0400
3346.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/XhtmlDesignInfo.java Fri Jul 16 14:21:50 2010 -0400
3346.3 @@ -1,7 +1,10 @@
3346.4 /*
3346.5 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3346.6 *
3346.7 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3346.8 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3346.9 + *
3346.10 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3346.11 + * Other names may be trademarks of their respective owners.
3346.12 *
3346.13 * The contents of this file are subject to the terms of either the GNU
3346.14 * General Public License Version 2 only ("GPL") or the Common
3346.15 @@ -13,9 +16,9 @@
3346.16 * specific language governing permissions and limitations under the
3346.17 * License. When distributing the software, include this License Header
3346.18 * Notice in each file and include the License file at
3346.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3346.20 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3346.21 * particular file as subject to the "Classpath" exception as provided
3346.22 - * by Sun in the GPL Version 2 section of the License file that
3346.23 + * by Oracle in the GPL Version 2 section of the License file that
3346.24 * accompanied this code. If applicable, add the following below the
3346.25 * License Header, with the fields enclosed by brackets [] replaced by
3346.26 * your own identifying information:
3347.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/layer.xml Fri Jul 16 11:47:36 2010 -0400
3347.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/layer.xml Fri Jul 16 14:21:50 2010 -0400
3347.3 @@ -2,7 +2,10 @@
3347.4 <!--
3347.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3347.6
3347.7 -Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3347.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3347.9 +
3347.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3347.11 +Other names may be trademarks of their respective owners.
3347.12
3347.13
3347.14 The contents of this file are subject to the terms of either the GNU
3347.15 @@ -15,9 +18,9 @@
3347.16 specific language governing permissions and limitations under the
3347.17 License. When distributing the software, include this License Header
3347.18 Notice in each file and include the License file at
3347.19 -nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3347.20 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3347.21 particular file as subject to the "Classpath" exception as provided
3347.22 -by Sun in the GPL Version 2 section of the License file that
3347.23 +by Oracle in the GPL Version 2 section of the License file that
3347.24 accompanied this code. If applicable, add the following below the
3347.25 License Header, with the fields enclosed by brackets [] replaced by
3347.26 your own identifying information:
3348.1 --- a/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/resources/Bundle.properties Fri Jul 16 11:47:36 2010 -0400
3348.2 +++ b/visualweb.xhtml/src/org/netbeans/modules/visualweb/xhtml/resources/Bundle.properties Fri Jul 16 14:21:50 2010 -0400
3348.3 @@ -1,6 +1,9 @@
3348.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3348.5 #
3348.6 -# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3348.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3348.8 +#
3348.9 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3348.10 +# Other names may be trademarks of their respective owners.
3348.11 #
3348.12 # The contents of this file are subject to the terms of either the GNU
3348.13 # General Public License Version 2 only ("GPL") or the Common
3348.14 @@ -12,9 +15,9 @@
3348.15 # specific language governing permissions and limitations under the
3348.16 # License. When distributing the software, include this License Header
3348.17 # Notice in each file and include the License file at
3348.18 -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3348.19 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3348.20 # particular file as subject to the "Classpath" exception as provided
3348.21 -# by Sun in the GPL Version 2 section of the License file that
3348.22 +# by Oracle in the GPL Version 2 section of the License file that
3348.23 # accompanied this code. If applicable, add the following below the
3348.24 # License Header, with the fields enclosed by brackets [] replaced by
3348.25 # your own identifying information:
3349.1 --- a/visualweb.xhtml/test/unit/src/org/netbeans/modules/visualweb/xhtml/XhtmlTest.java Fri Jul 16 11:47:36 2010 -0400
3349.2 +++ b/visualweb.xhtml/test/unit/src/org/netbeans/modules/visualweb/xhtml/XhtmlTest.java Fri Jul 16 14:21:50 2010 -0400
3349.3 @@ -1,9 +1,12 @@
3349.4 package org.netbeans.modules.visualweb.xhtml;
3349.5 /*
3349.6 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3349.7 - *
3349.8 - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
3349.9 - *
3349.10 + *
3349.11 + * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
3349.12 + *
3349.13 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3349.14 + * Other names may be trademarks of their respective owners.
3349.15 + *
3349.16 * The contents of this file are subject to the terms of either the GNU
3349.17 * General Public License Version 2 only ("GPL") or the Common
3349.18 * Development and Distribution License("CDDL") (collectively, the
3349.19 @@ -14,9 +17,9 @@
3349.20 * specific language governing permissions and limitations under the
3349.21 * License. When distributing the software, include this License Header
3349.22 * Notice in each file and include the License file at
3349.23 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3349.24 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3349.25 * particular file as subject to the "Classpath" exception as provided
3349.26 - * by Sun in the GPL Version 2 section of the License file that
3349.27 + * by Oracle in the GPL Version 2 section of the License file that
3349.28 * accompanied this code. If applicable, add the following below the
3349.29 * License Header, with the fields enclosed by brackets [] replaced by
3349.30 * your own identifying information: