From d85d66d8637382dd09afb448c240fd86e1eb23e5 Mon Sep 17 00:00:00 2001
From: ohair <unknown>
Date: Wed, 22 Sep 2010 11:06:50 -0700
Subject: [PATCH] 6946527: rebranding system properties per Oracle Requirements
 (vendor) Summary: Changes from "Sun Microsystems, Inc." to "Oracle
 Corporation" in the java.vendor, java.specification.vendor and
 java.vendor.url Java system properties. Also change of Windows COMPANY file
 property from "Oracle" to "Oracle Corporation". Reviewed-by: lancea, flar

---
 make/common/shared/Defs.gmk         |  2 +-
 src/share/native/java/lang/System.c | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/make/common/shared/Defs.gmk b/make/common/shared/Defs.gmk
index ed32779c8..dbb0e6669 100644
--- a/make/common/shared/Defs.gmk
+++ b/make/common/shared/Defs.gmk
@@ -219,7 +219,7 @@ else
   PRODUCT_NAME = Java(TM)
   PRODUCT_SUFFIX = SE Runtime Environment
   JDK_RC_PLATFORM_NAME = Platform SE
-  COMPANY_NAME = Oracle
+  COMPANY_NAME = Oracle Corporation
 endif
 
 RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
diff --git a/src/share/native/java/lang/System.c b/src/share/native/java/lang/System.c
index 75ebd79d5..5edb1ae3b 100644
--- a/src/share/native/java/lang/System.c
+++ b/src/share/native/java/lang/System.c
@@ -82,14 +82,20 @@ Java_java_lang_System_identityHashCode(JNIEnv *env, jobject this, jobject x)
     } else ((void) 0)
 
 #ifndef VENDOR /* Third party may overwrite this. */
-#define VENDOR "Sun Microsystems Inc."
-#define VENDOR_URL "http://java.sun.com/"
+#define VENDOR "Oracle Corporation"
+#define VENDOR_URL "http://java.oracle.com/"
 #define VENDOR_URL_BUG "http://java.sun.com/cgi-bin/bugreport.cgi"
 #endif
 
 #define JAVA_MAX_SUPPORTED_VERSION 51
 #define JAVA_MAX_SUPPORTED_MINOR_VERSION 0
 
+#ifdef JAVA_SPECIFICATION_VENDOR /* Third party may NOT overwrite this. */
+  #error "ERROR: No override of JAVA_SPECIFICATION_VENDOR is allowed"
+#else
+  #define JAVA_SPECIFICATION_VENDOR "Oracle Corporation"
+#endif
+
 JNIEXPORT jobject JNICALL
 Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
 {
@@ -106,7 +112,8 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
             JDK_MAJOR_VERSION "." JDK_MINOR_VERSION);
     PUTPROP(props, "java.specification.name",
             "Java Platform API Specification");
-    PUTPROP(props, "java.specification.vendor", "Sun Microsystems Inc.");
+    PUTPROP(props, "java.specification.vendor",
+            JAVA_SPECIFICATION_VENDOR);
 
     PUTPROP(props, "java.version", RELEASE);
     PUTPROP(props, "java.vendor", VENDOR);
@@ -160,7 +167,7 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
     /* Printing properties */
     /* Note: java.awt.printerjob is an implementation private property which
      * just happens to have a java.* name because it is referenced in
-     * a java.awt class. It is the mechanism by which the Sun implementation
+     * a java.awt class. It is the mechanism by which the implementation
      * finds the appropriate class in the JRE for the platform.
      * It is explicitly not designed to be overridden by clients as
      * a way of replacing the implementation class, and in any case
@@ -188,7 +195,7 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
     /* Java2D properties */
     /* Note: java.awt.graphicsenv is an implementation private property which
      * just happens to have a java.* name because it is referenced in
-     * a java.awt class. It is the mechanism by which the Sun implementation
+     * a java.awt class. It is the mechanism by which the implementation
      * finds the appropriate class in the JRE for the platform.
      * It is explicitly not designed to be overridden by clients as
      * a way of replacing the implementation class, and in any case
-- 
GitLab