6943941: Rebranding issues with some tests in jdk/test/java/util

Reviewed-by: ohair

6943941: Rebranding issues with some tests in jdk/test/java/util
Reviewed-by: ohair
6b09fc73 · naoto · 1c28997a · 6b09fc73 · 6b09fc73 · 6b09fc73
16 changed file
--- a/test/java/util/Locale/Bug4175998Test.java
+++ b/test/java/util/Locale/Bug4175998Test.java
@@ -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/test/java/util/ResourceBundle/Bug4083270Test.java
+++ b/test/java/util/ResourceBundle/Bug4083270Test.java
@@ -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/test/java/util/ResourceBundle/Bug4165815Test.java
+++ b/test/java/util/ResourceBundle/Bug4165815Test.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Class.java
+++ b/test/java/util/ResourceBundle/Bug4168625Class.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Getter.java
+++ b/test/java/util/ResourceBundle/Bug4168625Getter.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Resource.java
+++ b/test/java/util/ResourceBundle/Bug4168625Resource.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Resource2.java
+++ b/test/java/util/ResourceBundle/Bug4168625Resource2.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java
+++ b/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Resource3.java
+++ b/test/java/util/ResourceBundle/Bug4168625Resource3.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Resource3_en.java
+++ b/test/java/util/ResourceBundle/Bug4168625Resource3_en.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java
+++ b/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java
+++ b/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java
@@ -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/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java
+++ b/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java
@@ -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/test/java/util/ResourceBundle/Bug4177489Test.java
+++ b/test/java/util/ResourceBundle/Bug4177489Test.java
@@ -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/test/java/util/ResourceBundle/Bug4177489_Resource.java
+++ b/test/java/util/ResourceBundle/Bug4177489_Resource.java
@@ -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/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java
+++ b/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java
@@ -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.