diff --git a/jdk/make/netbeans/jmx/build.properties b/jdk/make/netbeans/jmx/build.properties index fc36497359e..e998e58a17f 100644 --- a/jdk/make/netbeans/jmx/build.properties +++ b/jdk/make/netbeans/jmx/build.properties @@ -48,8 +48,8 @@ jar.jmx.name = jmx.jar jar.jmx.sealed = true jar.jmx.spec.title = JSR 003, 160, 255 - JMX API jar.jmx.spec.version = ${project.spec.version} -jar.jmx.spec.vendor = Sun Microsystems, Inc. -jar.jmx.impl.title = JSR 003, 160, 255 - OpenJDK 7 JMX API +jar.jmx.spec.vendor = Oracle Corporation +jar.jmx.impl.title = JSR 003, 160, 255 - OpenJDK 7 JMX API jar.jmx.impl.vendor = Project OpenJDK javadoc.options=-J-Xmx256m diff --git a/jdk/src/share/classes/com/sun/jmx/defaults/ServiceName.java b/jdk/src/share/classes/com/sun/jmx/defaults/ServiceName.java index aa0a46fe2ac..8f742dff0f8 100644 --- a/jdk/src/share/classes/com/sun/jmx/defaults/ServiceName.java +++ b/jdk/src/share/classes/com/sun/jmx/defaults/ServiceName.java @@ -76,9 +76,9 @@ public class ServiceName { /** * The vendor of the JMX specification implemented by this product. *
- * The value is Sun Microsystems. + * The value is Oracle Corporation. */ - public static final String JMX_SPEC_VENDOR = "Sun Microsystems"; + public static final String JMX_SPEC_VENDOR = "Oracle Corporation"; /** * The name of this product implementing the JMX specification. @@ -91,7 +91,7 @@ public class ServiceName { * The name of the vendor of this product implementing the * JMX specification. *
- * The value is Sun Microsystems. + * The value is Oracle Corporation. */ - public static final String JMX_IMPL_VENDOR = "Sun Microsystems"; + public static final String JMX_IMPL_VENDOR = "Oracle Corporation"; } diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/ServiceName.java b/jdk/src/share/classes/com/sun/jmx/snmp/ServiceName.java index 0301389aa56..edf77073ee8 100644 --- a/jdk/src/share/classes/com/sun/jmx/snmp/ServiceName.java +++ b/jdk/src/share/classes/com/sun/jmx/snmp/ServiceName.java @@ -27,7 +27,7 @@ package com.sun.jmx.snmp; /** * Used for storing default values used by SNMP Runtime services. - *

This API is a Sun Microsystems internal API and is subject + *

This API is an Oracle Corporation internal API and is subject * to change without notice.

*/ public class ServiceName { @@ -144,16 +144,16 @@ public class ServiceName { /** * The vendor of the JMX specification implemented by this product. *
- * The value is Sun Microsystems. + * The value is Oracle Corporation. */ - public static final String JMX_SPEC_VENDOR = "Sun Microsystems"; + public static final String JMX_SPEC_VENDOR = "Oracle Corporation"; /** * The name of the vendor of this product implementing the JMX specification. *
- * The value is Sun Microsystems. + * The value is Oracle Corporation. */ - public static final String JMX_IMPL_VENDOR = "Sun Microsystems"; + public static final String JMX_IMPL_VENDOR = "Oracle Corporation"; /** * The build number of the current product version, of the form rXX. diff --git a/jdk/src/share/classes/com/sun/management/package.html b/jdk/src/share/classes/com/sun/management/package.html index b4c66900c22..c26d4309da6 100644 --- a/jdk/src/share/classes/com/sun/management/package.html +++ b/jdk/src/share/classes/com/sun/management/package.html @@ -30,7 +30,7 @@ questions. -This package contains Sun Microsystem's platform extension to +This package contains Oracle Corporation's platform extension to the implementation of the java.lang.management API and also defines the management diff --git a/jdk/src/share/classes/javax/management/ObjectName.java b/jdk/src/share/classes/javax/management/ObjectName.java index 8d29ade64bf..32b06ccdb5e 100644 --- a/jdk/src/share/classes/javax/management/ObjectName.java +++ b/jdk/src/share/classes/javax/management/ObjectName.java @@ -211,8 +211,8 @@ import java.util.Map; * reverse DNS name of the organization that specifies the MBeans, * followed by a period and a string whose interpretation is * determined by that organization. For example, MBeans specified by - * Sun Microsystems Inc., DNS name sun.com, would have - * domains such as com.sun.MyDomain. This is essentially + * example.com would have + * domains such as com.example.MyDomain. This is essentially * the same convention as for Java-language package names.

* *

The serialVersionUID of this class is 1081892073854801359L. diff --git a/jdk/src/share/classes/javax/management/build.xml b/jdk/src/share/classes/javax/management/build.xml index 24357d694af..e1d263520f0 100644 --- a/jdk/src/share/classes/javax/management/build.xml +++ b/jdk/src/share/classes/javax/management/build.xml @@ -35,18 +35,18 @@ . Please also read the important comment on basedir definition below. --> - - @@ -163,14 +163,14 @@ - + - @@ -183,13 +183,13 @@ @@ -253,7 +253,7 @@ - @@ -269,10 +269,10 @@ - + - - + + @@ -295,16 +295,16 @@ - - - - + + + - diff --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java index 050760377a5..31d9199da18 100644 --- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java +++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java @@ -92,8 +92,6 @@ import javax.management.RuntimeOperationsException; * @since 1.5 */ -// Sun Microsystems, Sept. 2002: Revisited for JMX 1.2 (DF) -// @SuppressWarnings("serial") // serialVersionUID is not constant public class ModelMBeanNotificationInfo extends MBeanNotificationInfo