6943941: Rebranding issues with some tests in jdk/test/java/util
Reviewed-by: ohair
--- a/jdk/test/java/util/Locale/Bug4175998Test.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/Locale/Bug4175998Test.java Mon Apr 19 14:48:46 2010 -0700
@@ -32,16 +32,6 @@
*
* (C) Copyright IBM Corp. 1998 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4083270Test.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4083270Test.java Mon Apr 19 14:48:46 2010 -0700
@@ -31,16 +31,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4165815Test.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4165815Test.java Mon Apr 19 14:48:46 2010 -0700
@@ -34,16 +34,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Class.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Class.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4177489Test.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4177489Test.java Mon Apr 19 14:48:46 2010 -0700
@@ -32,16 +32,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.
--- a/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java Fri Apr 16 13:05:14 2010 +0400
+++ b/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java Mon Apr 19 14:48:46 2010 -0700
@@ -25,16 +25,6 @@
*
* (C) Copyright IBM Corp. 1999 - All Rights Reserved
*
- * Portions Copyright 2007 by Sun Microsystems, Inc.,
- * 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
- * All rights reserved.
- *
- * This software is the confidential and proprietary information
- * of Sun Microsystems, Inc. ("Confidential Information"). You
- * shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement
- * you entered into with Sun.
- *
* The original version of this source code and documentation is
* copyrighted and owned by IBM. These materials are provided
* under terms of a License Agreement between IBM and Sun.