archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0

Browse source 
Change property value to 1.<major_version> for major_version >= 7

Reviewed-by: dholmes, acorn
This commit is contained in:
Keith McGuigan 2010-11-05 09:32:08 -04:00
parent 596507e5d3
commit d4ca94df32
2 changed files with 89 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -116,7 +116,6 @@ void Arguments::process_sun_java_launcher_properties(JavaVMInitArgs* args) {
// Initialize system properties key and value. // Initialize system properties key and value.
void Arguments::init_system_properties() { void Arguments::init_system_properties() {
PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.version", "1.0", false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name", PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name",
"Java Virtual Machine Specification", false)); "Java Virtual Machine Specification", false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false)); PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false));
@ -151,9 +150,23 @@ void Arguments::init_system_properties() {
// Update/Initialize System properties after JDK version number is known // Update/Initialize System properties after JDK version number is known
void Arguments::init_version_specific_system_properties() { void Arguments::init_version_specific_system_properties() {
PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor", enum { bufsz = 16 };
JDK_Version::is_gte_jdk17x_version() ? "Oracle Corporation" : "Sun Microsystems Inc.", false)); char buffer[bufsz];
PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false)); const char* spec_vendor = "Sun Microsystems Inc.";
uint32_t spec_version = 0;
if (JDK_Version::is_gte_jdk17x_version()) {
spec_vendor = "Oracle Corporation";
spec_version = JDK_Version::current().major_version();
}
jio_snprintf(buffer, bufsz, "1." UINT32_FORMAT, spec_version);
PropertyList_add(&_system_properties,
new SystemProperty("java.vm.specification.vendor", spec_vendor, false));
PropertyList_add(&_system_properties,
new SystemProperty("java.vm.specification.version", buffer, false));
PropertyList_add(&_system_properties,
new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false));
} }
/** /**

72
hotspot/test/runtime/6981737/Test6981737.java Normal file
View file

@ -0,0 +1,72 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test Test6981737.java
* @bug 6981737
* @summary check for correct vm properties
* @run main Test6981737
* @author kamg
*/
public class Test6981737 {
/**
* Check the 'vendor' properties java.vm.specification.version
* property. Before jdk7, they should be "Sun Micro..." and "1.0".
* In jdk7 onwards they should be "Oracle..." and "1.<major_version>"
*/
public static void main(String[] args) throws Exception {
String version = verifyProperty("java.version", "[0-9]+\\.[0-9]+\\..*");
String major_version_spec = version.split("\\.")[1];
int major_version = new Integer(major_version_spec).intValue();
String vendor_re = "Oracle Corporation";
String vm_spec_version_re = "1\\." + major_version_spec;
if (major_version < 7) {
vendor_re = "Sun Microsystems Inc\\.";
vm_spec_version_re = "1\\.0";
}
verifyProperty("java.vendor", vendor_re);
verifyProperty("java.vm.vendor", vendor_re);
verifyProperty("java.vm.specification.vendor", vendor_re);
verifyProperty("java.specification.vendor", vendor_re);
verifyProperty("java.vm.specification.version", vm_spec_version_re);
System.out.println("PASS");
}
public static String verifyProperty(String name, String expected_re) {
String value = System.getProperty(name, "");
System.out.print("Checking " + name + ": \"" + value +
"\".matches(\"" + expected_re + "\")... ");
if (!value.matches(expected_re)) {
System.out.println("no.");
throw new RuntimeException("FAIL: Wrong value for " + name +
" property, \"" + value + "\", expected to be of form: \"" +
expected_re + "\"");
}
System.out.println("yes.");
return value;
}
}