From f9a9584c5295c776dc77d26303c715e8cda000ae Mon Sep 17 00:00:00 2001 From: mchung Date: Wed, 22 Sep 2010 21:44:18 -0700 Subject: [PATCH] 6984036: servicetag vendor rebranding issues Summary: Update product_vendor field to use java.vendor system property Reviewed-by: ohair --- src/share/classes/com/sun/servicetag/Installer.java | 10 ++++++---- .../classes/com/sun/servicetag/RegistrationData.java | 4 ++-- src/share/classes/com/sun/servicetag/Registry.java | 2 +- .../com/sun/servicetag/SolarisSystemEnvironment.java | 7 ++++--- test/com/sun/servicetag/JavaServiceTagTest.java | 3 ++- test/com/sun/servicetag/JavaServiceTagTest1.java | 4 +++- test/com/sun/servicetag/Util.java | 2 ++ test/com/sun/servicetag/environ.properties | 4 ++-- test/com/sun/servicetag/missing-environ-field.xml | 4 ++-- test/com/sun/servicetag/newer-registry-version.xml | 2 +- test/com/sun/servicetag/registration.xml | 10 +++++----- test/com/sun/servicetag/servicetag1.properties | 2 +- test/com/sun/servicetag/servicetag2.properties | 2 +- test/com/sun/servicetag/servicetag3.properties | 2 +- test/com/sun/servicetag/servicetag4.properties | 2 +- test/com/sun/servicetag/servicetag5.properties | 2 +- 16 files changed, 35 insertions(+), 27 deletions(-) diff --git a/src/share/classes/com/sun/servicetag/Installer.java b/src/share/classes/com/sun/servicetag/Installer.java index 2c8476e71..ae5ed4bc4 100644 --- a/src/share/classes/com/sun/servicetag/Installer.java +++ b/src/share/classes/com/sun/servicetag/Installer.java @@ -43,7 +43,8 @@ public class Installer { "servicetag.dir.path"; private static String SVCTAG_ENABLE_REGISTRATION = "servicetag.registration.enabled"; - private final static String SUN_VENDOR = "Sun Microsystems"; + private final static String ORACLE = "Oracle"; + private final static String SUN = "Sun Microsystems"; private final static String REGISTRATION_XML = "registration.xml"; private final static String SERVICE_TAG_FILE = "servicetag"; private final static String REGISTRATION_HTML_NAME = "register"; @@ -84,9 +85,10 @@ public class Installer { // Implementation of ServiceTag.getJavaServiceTag(String) method static ServiceTag getJavaServiceTag(String source) throws IOException { - if (!System.getProperty("java.vendor").startsWith(SUN_VENDOR)) { + String vendor = System.getProperty("java.vendor", ""); + if (!vendor.startsWith(SUN) && !vendor.startsWith(ORACLE)) { // Products bundling this implementation may run on - // Mac OS which is not a Sun JDK + // Mac OS which is not a Sun/Oracle JDK return null; } boolean cleanup = false; @@ -365,7 +367,7 @@ public class Installer { props.getProperty("servicetag.parent.name"), props.getProperty("servicetag.parent.urn"), getProductDefinedId(), - SUN_VENDOR, + System.getProperty("java.vendor"), System.getProperty("os.arch"), getZoneName(), svcTagSource); diff --git a/src/share/classes/com/sun/servicetag/RegistrationData.java b/src/share/classes/com/sun/servicetag/RegistrationData.java index 99f5623d1..1c203f412 100644 --- a/src/share/classes/com/sun/servicetag/RegistrationData.java +++ b/src/share/classes/com/sun/servicetag/RegistrationData.java @@ -80,12 +80,12 @@ import static com.sun.servicetag.RegistrationDocument.*; * * systemManufacturer * System manufacturer - * e.g. Sun Microsystems + * e.g. Oracle Corporation * * * cpuManufacturer * CPU manufacturer - * e.g. Sun Microsystems + * e.g. Oracle Corporation * * * serialNumber diff --git a/src/share/classes/com/sun/servicetag/Registry.java b/src/share/classes/com/sun/servicetag/Registry.java index 14ad2fd62..505ac64c6 100644 --- a/src/share/classes/com/sun/servicetag/Registry.java +++ b/src/share/classes/com/sun/servicetag/Registry.java @@ -90,7 +90,7 @@ public class Registry { stclient = getWindowsStClientFile(); } else { if (isVerbose()) { - System.out.println("Running on non-Sun JDK"); + System.out.println("Running on unsupported platform"); } } initialized = true; diff --git a/src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java b/src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java index 3cfd556a1..19cbae0b4 100644 --- a/src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java +++ b/src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java @@ -44,6 +44,7 @@ import java.io.*; * Solaris implementation of the SystemEnvironment class. */ class SolarisSystemEnvironment extends SystemEnvironment { + private static final String ORACLE = "Oracle Corporation"; SolarisSystemEnvironment() { setHostId(getCommandOutput("/usr/bin/hostid")); setSystemModel(getCommandOutput("/usr/bin/uname", "-i")); @@ -59,7 +60,7 @@ class SolarisSystemEnvironment extends SystemEnvironment { private String getSolarisCpuManufacturer() { // not fully accurate, this could be another manufacturer (fujitsu for example) if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) { - return "Sun Microsystems, Inc"; + return ORACLE; } // if we're here, then we'll try smbios (type 4) @@ -73,7 +74,7 @@ class SolarisSystemEnvironment extends SystemEnvironment { private String getSolarisSystemManufacturer() { // not fully accurate, this could be another manufacturer (fujitsu for example) if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) { - return "Sun Microsystems, Inc"; + return ORACLE; } // if we're here, then we'll try smbios (type 1) @@ -117,7 +118,7 @@ class SolarisSystemEnvironment extends SystemEnvironment { // ID SIZE TYPE // 1 150 SMB_TYPE_SYSTEM (system information) // - // Manufacturer: Sun Microsystems + // Manufacturer: Oracle Corporation // Product: Sun Fire X4600 // Version: To Be Filled By O.E.M. // Serial Number: 00:14:4F:45:0C:2A diff --git a/test/com/sun/servicetag/JavaServiceTagTest.java b/test/com/sun/servicetag/JavaServiceTagTest.java index 6ac19cd9f..0ebe0d5d8 100644 --- a/test/com/sun/servicetag/JavaServiceTagTest.java +++ b/test/com/sun/servicetag/JavaServiceTagTest.java @@ -124,8 +124,9 @@ public class JavaServiceTagTest { throw new RuntimeException("Unexpected platform_arch: " + st.getPlatformArch()); } + String vendor = System.getProperty("java.vendor"); if (!st.getProductVendor(). - equals("Sun Microsystems")) { + equals(vendor)) { throw new RuntimeException("Unexpected product_vendor: " + st.getProductVendor()); } diff --git a/test/com/sun/servicetag/JavaServiceTagTest1.java b/test/com/sun/servicetag/JavaServiceTagTest1.java index 00713f999..3bb0328ad 100644 --- a/test/com/sun/servicetag/JavaServiceTagTest1.java +++ b/test/com/sun/servicetag/JavaServiceTagTest1.java @@ -196,8 +196,10 @@ public class JavaServiceTagTest1 { throw new RuntimeException("Unexpected platform_arch: " + st.getPlatformArch()); } + + String vendor = System.getProperty("java.vendor"); if (!st.getProductVendor(). - equals("Sun Microsystems")) { + equals(vendor)) { throw new RuntimeException("Unexpected product_vendor: " + st.getProductVendor()); } diff --git a/test/com/sun/servicetag/Util.java b/test/com/sun/servicetag/Util.java index 77bc7da83..cf75c2c8f 100644 --- a/test/com/sun/servicetag/Util.java +++ b/test/com/sun/servicetag/Util.java @@ -162,6 +162,8 @@ public class Util { for (ServiceTag st : svcTags) { ServiceTag st1 = stMap.get(st.getInstanceURN()); if (!matches(st, st1)) { + System.err.println(st); + System.err.println(st1); throw new RuntimeException("ServiceTag in the registry " + "does not match the one in the map"); } diff --git a/test/com/sun/servicetag/environ.properties b/test/com/sun/servicetag/environ.properties index 0881061b0..22163e587 100644 --- a/test/com/sun/servicetag/environ.properties +++ b/test/com/sun/servicetag/environ.properties @@ -4,6 +4,6 @@ osName=SunOS osVersion=5.10 osArchitecture=sparc systemModel=Sun-Fire-V440 -systemManufacturer=Sun Microsystems -cpuManufacturer=Sun Microsystems +systemManufacturer=Oracle Corporation +cpuManufacturer=Oracle Corporation serialNumber=BEL078932 diff --git a/test/com/sun/servicetag/missing-environ-field.xml b/test/com/sun/servicetag/missing-environ-field.xml index 727288dd1..775bbaab1 100644 --- a/test/com/sun/servicetag/missing-environ-field.xml +++ b/test/com/sun/servicetag/missing-environ-field.xml @@ -19,7 +19,7 @@ urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3 Java Platform Standard Edition 6 (Java SE 6) id=1.6.0-internal-b00 sparc,dir=/myjdk/solaris-sparc -Sun Microsystems +Oracle Corporation sparc 2007-11-12 06:15:11 GMT global @@ -34,7 +34,7 @@ urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3 Java Platform Standard Edition 6 (Java SE 6) id=1.6.0_05-b01 sparc,dir=/myjdk/solaris-i586 -Sun Microsystems +Oracle Corporation i386 2007-11-12 06:15:11 GMT global diff --git a/test/com/sun/servicetag/newer-registry-version.xml b/test/com/sun/servicetag/newer-registry-version.xml index 9ee68ac0a..fe9fdf3bd 100644 --- a/test/com/sun/servicetag/newer-registry-version.xml +++ b/test/com/sun/servicetag/newer-registry-version.xml @@ -20,7 +20,7 @@ urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3 Java Platform Standard Edition 6 (Java SE 6) id=1.6.0-internal-b00 sparc,dir=/myjdk/solaris-sparc -Sun Microsystems +Oracle Corporation sparc 2007-11-13 00:49:01 GMT global diff --git a/test/com/sun/servicetag/registration.xml b/test/com/sun/servicetag/registration.xml index e7a431a0f..287590ab1 100644 --- a/test/com/sun/servicetag/registration.xml +++ b/test/com/sun/servicetag/registration.xml @@ -7,8 +7,8 @@ 5.10 sparc Sun-Fire-V440 -Sun Microsystems -Sun Microsystems +Oracle Corporation +Oracle Corporation BEL078932 @@ -20,7 +20,7 @@ urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3 Java Platform Standard Edition 6 (Java SE 6) id=1.6.0-internal-b00 sparc,dir=/myjdk/solaris-sparc -Sun Microsystems +Oracle Corporation sparc 2007-11-13 00:49:01 GMT global @@ -35,7 +35,7 @@ urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3 Java Platform Standard Edition 6 (Java SE 6) id=1.6.0_05-b01 i386,dir=/myjdk/solaris-i586 -Sun Microsystems +Oracle Corporation i386 2007-11-13 00:49:01 GMT global @@ -50,7 +50,7 @@ urn:uuid:596ffcfa-63d5-11d7-9886-ac816a682f92 Solaris Operating System -Sun Microsystems +Oracle Corporation sparc 2007-11-13 00:49:01 GMT global diff --git a/test/com/sun/servicetag/servicetag1.properties b/test/com/sun/servicetag/servicetag1.properties index 3a1e8acc3..c37bc3652 100644 --- a/test/com/sun/servicetag/servicetag1.properties +++ b/test/com/sun/servicetag/servicetag1.properties @@ -5,7 +5,7 @@ product_urn=urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc product_parent_urn=urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3 product_parent=Java Platform Standard Edition 6 (Java SE 6) product_defined_inst_id=id=1.6.0-internal-b00 sparc,dir=/myjdk/solaris-sparc -product_vendor=Sun Microsystems +product_vendor=Oracle Corporation platform_arch=sparc timestamp=2007-11-12 05:19:40 GMT container=global diff --git a/test/com/sun/servicetag/servicetag2.properties b/test/com/sun/servicetag/servicetag2.properties index d5dbe14f8..54867f7a6 100644 --- a/test/com/sun/servicetag/servicetag2.properties +++ b/test/com/sun/servicetag/servicetag2.properties @@ -5,7 +5,7 @@ product_urn=urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93 product_parent_urn=urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3 product_parent=Java Platform Standard Edition 6 (Java SE 6) product_defined_inst_id=id=1.6.0_05-b01 i386,dir=/myjdk/solaris-i586 -product_vendor=Sun Microsystems +product_vendor=Oracle Corporation platform_arch=i386 timestamp=2007-11-12 06:12:21 GMT container=global diff --git a/test/com/sun/servicetag/servicetag3.properties b/test/com/sun/servicetag/servicetag3.properties index 6ca5dc79d..5bd4e4778 100644 --- a/test/com/sun/servicetag/servicetag3.properties +++ b/test/com/sun/servicetag/servicetag3.properties @@ -5,7 +5,7 @@ product_urn=urn:uuid:5005588c-36f3-11d6-9cec-fc96f718e113 product_parent_urn=urn:uuid:596ffcfa-63d5-11d7-9886-ac816a682f92 product_parent=Solaris Operating System product_defined_inst_id= -product_vendor=Sun Microsystems +product_vendor=Oracle Corporation platform_arch=sparc timestamp=2007-06-20 22:07:11 GMT container=global diff --git a/test/com/sun/servicetag/servicetag4.properties b/test/com/sun/servicetag/servicetag4.properties index ba7c3c526..02892041f 100644 --- a/test/com/sun/servicetag/servicetag4.properties +++ b/test/com/sun/servicetag/servicetag4.properties @@ -5,7 +5,7 @@ product_urn=urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc product_parent_urn=urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3 product_parent=Java Platform Standard Edition 6 (Java SE 6) product_defined_inst_id=id=1.6.0_05-b01 amd64,dir=/myjdk/linux-amd64 -product_vendor=Sun Microsystems +product_vendor=Oracle Corporation platform_arch=x64 timestamp=2007-12-12 05:19:40 GMT container=global diff --git a/test/com/sun/servicetag/servicetag5.properties b/test/com/sun/servicetag/servicetag5.properties index 84e44c324..f7e53bfc0 100644 --- a/test/com/sun/servicetag/servicetag5.properties +++ b/test/com/sun/servicetag/servicetag5.properties @@ -5,7 +5,7 @@ product_urn=urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc product_parent_urn=urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3 product_parent=Java Platform Standard Edition 6 (Java SE 6) product_defined_inst_id=id=1.6.0_06-b06 i386,dir=/w/mchung/bundles/jdk1.6.0_05/jre -product_vendor=Sun Microsystems +product_vendor=Oracle Corporation platform_arch=x86 timestamp=2007-11-29 17:59:42 GMT container=global -- GitLab