infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-14 08:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

6991164: pack source needs vendor rebranding changes (jdk7 only)

Browse Source 
Reviewed-by: ohair, jrose
This commit is contained in:
Kumar Srinivasan 2010-10-14 09:36:05 -07:00
parent 2ea1ba10a2
commit e17e251af7
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
View File

@ -216,7 +216,9 @@ class Utils {
// Returns the Max Version String of this implementation
static String getVersionString() {
return "Pack200, Vendor: Sun Microsystems, Version: " +
return "Pack200, Vendor: " +
System.getProperty("java.vendor") +
", Version: " +
Constants.JAVA6_PACKAGE_MAJOR_VERSION + "." +
Constants.JAVA6_PACKAGE_MINOR_VERSION;
}

16
jdk/test/tools/pack200/PackageVersionTest.java
View File

@ -24,7 +24,7 @@
/*
* @test
* @bug 6712743
* @bug 6712743 6991164
* @summary verify package versions
* @compile -XDignore.symbol.file Utils.java PackageVersionTest.java
* @run main PackageVersionTest
@ -40,6 +40,7 @@ import java.io.PrintStream;
import java.util.jar.JarFile;
import java.util.jar.Pack200;
import java.util.jar.Pack200.Packer;
import java.util.jar.Pack200.Unpacker;
public class PackageVersionTest {
private static final File javaHome = new File(System.getProperty("java.home"));
@ -60,6 +61,7 @@ public class PackageVersionTest {
createClassFile("Test6");
createClassFile("Test7");
verify6991164();
verifyPack("Test5.class", JAVA5_PACKAGE_MAJOR_VERSION,
JAVA5_PACKAGE_MINOR_VERSION);
@ -75,6 +77,18 @@ public class PackageVersionTest {
JAVA5_PACKAGE_MINOR_VERSION);
}
static void verify6991164() {
Unpacker unpacker = Pack200.newUnpacker();
String versionStr = unpacker.toString();
String expected = "Pack200, Vendor: " +
System.getProperty("java.vendor") + ", Version: " +
JAVA6_PACKAGE_MAJOR_VERSION + "." + JAVA6_PACKAGE_MINOR_VERSION;
if (!versionStr.equals(expected)) {
System.out.println("Expected: " + expected);
System.out.println("Obtained: " + versionStr);
throw new RuntimeException("did not get expected string " + expected);
}
}
static void createClassFile(String name) {
createJavaFile(name);