Attachment 62170 Details for Bug 179630 – Fixes getJavaClassLibs for IBM JRE

[patch] Fixes getJavaClassLibs for IBM JRE

Utils_for_ibmjava.txt (text/plain), 2.13 KB, created by Corey Ashford

on 2007-03-27 21:22:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Corey Ashford

Created: 2007-03-27 21:22:43 EDT

Size: 2.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/util/Util.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/Util.java,v
>retrieving revision 1.53
>diff -u -r1.53 Util.java
>--- src/org/eclipse/jdt/core/tests/util/Util.java	20 Dec 2006 16:11:25 -0000	1.53
>+++ src/org/eclipse/jdt/core/tests/util/Util.java	28 Mar 2007 00:51:54 -0000
>@@ -649,25 +649,36 @@
> 	if ("J9".equals(vmName)) {
> 		return new String[] { toNativePath(jreDir + "/lib/jclMax/classes.zip") };
> 	}
>-	File file = new File(jreDir + "/lib/rt.jar");
>+	File file = new File(jreDir + "/lib/vm.jar");
>+	if (file.exists()) {
>+		file = new File(jreDir + "/lib/rt.jar");
>+		if (file.exists()) {
>+			// The IBM J2SE 6.0 has put the Java classes in vm.jar, but still has rt.jar
>+			return new String[] { 
>+					toNativePath(jreDir + "/lib/vm.jar"),
>+					toNativePath(jreDir + "/lib/rt.jar")};
>+		} else {
>+			// The IBM J2SE 5.0 has put the java.lang classes in vm.jar.
>+			return new String[] { 
>+					toNativePath(jreDir + "/lib/vm.jar"),
>+					toNativePath(jreDir + "/lib/core.jar"),
>+					toNativePath(jreDir + "/lib/security.jar"),
>+					toNativePath(jreDir + "/lib/graphics.jar"),
>+					toNativePath(jreDir + "/lib/xml.jar")
>+			};
>+		}
>+	}
>+	file = new File(jreDir + "/lib/rt.jar");
> 	if (file.exists()) {
> 		return new String[] {
> 			toNativePath(jreDir + "/lib/rt.jar")
> 		};
> 	}
>-	file = new File(jreDir + "/lib/vm.jar");
>-	if (file.exists()) {
>-		// The IBM J2SE 5.0 has put the java.lang classes in vm.jar.
>-		return new String[] { 
>-			toNativePath(jreDir + "/lib/vm.jar"),
>-			toNativePath(jreDir + "/lib/core.jar"),
>-			toNativePath(jreDir + "/lib/security.jar"),
>-			toNativePath(jreDir + "/lib/graphics.jar") };				
>-	}
> 	return new String[] { 
> 		toNativePath(jreDir + "/lib/core.jar"),
> 		toNativePath(jreDir + "/lib/security.jar"),
>-		toNativePath(jreDir + "/lib/graphics.jar")
>+		toNativePath(jreDir + "/lib/graphics.jar"),
>+		toNativePath(jreDir + "/lib/xml.jar")
> 	};
> }
> public static String getJavaClassLibsAsString() {

Actions: View | Diff

Attachments on bug 179630: 62170 | 62455