View | Details | Raw Unified | Return to bug 179630 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/jdt/core/tests/util/Util.java (-11 / +22 lines)
Lines 649-673 Link Here
649
	if ("J9".equals(vmName)) {
649
	if ("J9".equals(vmName)) {
650
		return new String[] { toNativePath(jreDir + "/lib/jclMax/classes.zip") };
650
		return new String[] { toNativePath(jreDir + "/lib/jclMax/classes.zip") };
651
	}
651
	}
652
	File file = new File(jreDir + "/lib/rt.jar");
652
	File file = new File(jreDir + "/lib/vm.jar");
653
	if (file.exists()) {
654
		file = new File(jreDir + "/lib/rt.jar");
655
		if (file.exists()) {
656
			// The IBM J2SE 6.0 has put the Java classes in vm.jar, but still has rt.jar
657
			return new String[] { 
658
					toNativePath(jreDir + "/lib/vm.jar"),
659
					toNativePath(jreDir + "/lib/rt.jar")};
660
		} else {
661
			// The IBM J2SE 5.0 has put the java.lang classes in vm.jar.
662
			return new String[] { 
663
					toNativePath(jreDir + "/lib/vm.jar"),
664
					toNativePath(jreDir + "/lib/core.jar"),
665
					toNativePath(jreDir + "/lib/security.jar"),
666
					toNativePath(jreDir + "/lib/graphics.jar"),
667
					toNativePath(jreDir + "/lib/xml.jar")
668
			};
669
		}
670
	}
671
	file = new File(jreDir + "/lib/rt.jar");
653
	if (file.exists()) {
672
	if (file.exists()) {
654
		return new String[] {
673
		return new String[] {
655
			toNativePath(jreDir + "/lib/rt.jar")
674
			toNativePath(jreDir + "/lib/rt.jar")
656
		};
675
		};
657
	}
676
	}
658
	file = new File(jreDir + "/lib/vm.jar");
659
	if (file.exists()) {
660
		// The IBM J2SE 5.0 has put the java.lang classes in vm.jar.
661
		return new String[] { 
662
			toNativePath(jreDir + "/lib/vm.jar"),
663
			toNativePath(jreDir + "/lib/core.jar"),
664
			toNativePath(jreDir + "/lib/security.jar"),
665
			toNativePath(jreDir + "/lib/graphics.jar") };				
666
	}
667
	return new String[] { 
677
	return new String[] { 
668
		toNativePath(jreDir + "/lib/core.jar"),
678
		toNativePath(jreDir + "/lib/core.jar"),
669
		toNativePath(jreDir + "/lib/security.jar"),
679
		toNativePath(jreDir + "/lib/security.jar"),
670
		toNativePath(jreDir + "/lib/graphics.jar")
680
		toNativePath(jreDir + "/lib/graphics.jar"),
681
		toNativePath(jreDir + "/lib/xml.jar")
671
	};
682
	};
672
}
683
}
673
public static String getJavaClassLibsAsString() {
684
public static String getJavaClassLibsAsString() {

Return to bug 179630