提交 d85d66d8 编写于 作者: O ohair

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
上级 7b9c6d55
...@@ -219,7 +219,7 @@ else ...@@ -219,7 +219,7 @@ else
PRODUCT_NAME = Java(TM) PRODUCT_NAME = Java(TM)
PRODUCT_SUFFIX = SE Runtime Environment PRODUCT_SUFFIX = SE Runtime Environment
JDK_RC_PLATFORM_NAME = Platform SE JDK_RC_PLATFORM_NAME = Platform SE
COMPANY_NAME = Oracle COMPANY_NAME = Oracle Corporation
endif endif
RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX) RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
......
...@@ -82,14 +82,20 @@ Java_java_lang_System_identityHashCode(JNIEnv *env, jobject this, jobject x) ...@@ -82,14 +82,20 @@ Java_java_lang_System_identityHashCode(JNIEnv *env, jobject this, jobject x)
} else ((void) 0) } else ((void) 0)
#ifndef VENDOR /* Third party may overwrite this. */ #ifndef VENDOR /* Third party may overwrite this. */
#define VENDOR "Sun Microsystems Inc." #define VENDOR "Oracle Corporation"
#define VENDOR_URL "http://java.sun.com/" #define VENDOR_URL "http://java.oracle.com/"
#define VENDOR_URL_BUG "http://java.sun.com/cgi-bin/bugreport.cgi" #define VENDOR_URL_BUG "http://java.sun.com/cgi-bin/bugreport.cgi"
#endif #endif
#define JAVA_MAX_SUPPORTED_VERSION 51 #define JAVA_MAX_SUPPORTED_VERSION 51
#define JAVA_MAX_SUPPORTED_MINOR_VERSION 0 #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 JNIEXPORT jobject JNICALL
Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props) 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) ...@@ -106,7 +112,8 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
JDK_MAJOR_VERSION "." JDK_MINOR_VERSION); JDK_MAJOR_VERSION "." JDK_MINOR_VERSION);
PUTPROP(props, "java.specification.name", PUTPROP(props, "java.specification.name",
"Java Platform API Specification"); "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.version", RELEASE);
PUTPROP(props, "java.vendor", VENDOR); PUTPROP(props, "java.vendor", VENDOR);
...@@ -160,7 +167,7 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props) ...@@ -160,7 +167,7 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
/* Printing properties */ /* Printing properties */
/* Note: java.awt.printerjob is an implementation private property which /* Note: java.awt.printerjob is an implementation private property which
* just happens to have a java.* name because it is referenced in * 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. * finds the appropriate class in the JRE for the platform.
* It is explicitly not designed to be overridden by clients as * It is explicitly not designed to be overridden by clients as
* a way of replacing the implementation class, and in any case * 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) ...@@ -188,7 +195,7 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
/* Java2D properties */ /* Java2D properties */
/* Note: java.awt.graphicsenv is an implementation private property which /* Note: java.awt.graphicsenv is an implementation private property which
* just happens to have a java.* name because it is referenced in * 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. * finds the appropriate class in the JRE for the platform.
* It is explicitly not designed to be overridden by clients as * It is explicitly not designed to be overridden by clients as
* a way of replacing the implementation class, and in any case * a way of replacing the implementation class, and in any case
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册