Attachment #68528 for bug #172820

Lines 69-74 Link Here

(-)src/org/eclipse/jdt/core/tests/runtime/LocalVMLauncher.java (+3 lines)
69	if ("IBM J9SE VM".equals(vmName)) {	69	if ("IBM J9SE VM".equals(vmName)) {
70	return new SideCarJ9VMLauncher();	70	return new SideCarJ9VMLauncher();
71	}	71	}
		72	if ("DRLVM".equals(vmName)) {
		73	return new DRLVMLauncher();
		74	}
72	return new SideCarVMLauncher();	75	return new SideCarVMLauncher();
73	}	76	}
74	/**	77	/**




            toNativePath(jreDir + "/lib/jclMax/classes.zip")
        };
    }
	if ("DRLVM".equals(vmName)) {
		FilenameFilter jarFilter = new FilenameFilter() {
			public boolean accept(File dir, String name) {
				return name.endsWith(".jar") & !name.endsWith("-src.jar");
			}
		};
		String[] jars = new File(jreDir + "/lib/boot/").list(jarFilter);
		for (int i = 0; i < jars.length; i++) {
			jars[i] = toNativePath(jreDir + "/lib/boot/" + jars[i]);
		}
		return jars;
	}
    ArrayList paths = new ArrayList();
    String[] jarsNames = new String[] {
    		"/lib/vm.jar",




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.core.tests.runtime;

import java.io.File;
import java.util.Vector;

/**
 * This is a new vm launcher to support Apache Harmony 
 * (http://harmony.apache.org) settings
 */
public class DRLVMLauncher extends StandardVMLauncher {

/**
 * @see LocalVMLauncher#getCommandLine
 */
public String[] getCommandLine() {	
	Vector commandLine= new Vector();
	
	// VM binary
	String vmLocation = this.vmPath + 
	    (this.vmPath.endsWith(File.separator) ? "" : File.separator) + 
	    "bin" + 
	    File.separator + 
	    "javaw";
	final String osName = System.getProperty("os.name");
	if (osName.indexOf("win32") == -1 && !new File(vmLocation).exists()) {
	    vmLocation = vmLocation.substring(0, vmLocation.length()-1);
	}
	commandLine.addElement(vmLocation);
	
	// VM arguments
	if (this.vmArguments != null) {
		for (int i = 0; i < this.vmArguments.length; i++) {
			commandLine.addElement(this.vmArguments[i]);
		}
	}

	// boot classpath
	commandLine.addElement("-Xbootclasspath/a:" + buildBootClassPath());

	// debug mode
	if (this.debugPort != -1) {
		commandLine.addElement("-Xdebug");
		commandLine.addElement("-Xnoagent");
		// commandLine.addElement("-Djava.compiler=NONE");
		commandLine.addElement(
			"-Xrunjdwp:transport=dt_socket,address=" +
			this.debugPort +
			",server=y,suspend=n");
	}
	
	// regular classpath
	commandLine.addElement("-classpath");
	commandLine.addElement(buildClassPath());

	// code snippet runner class
	if (this.evalPort != -1) {
		commandLine.addElement(CODE_SNIPPET_RUNNER_CLASS_NAME);
	}
	
	// code snippet runner arguments
	if (this.evalPort != -1) {
		commandLine.addElement(EVALPORT_ARG);
		commandLine.addElement(Integer.toString(this.evalPort));
		if (TARGET_HAS_FILE_SYSTEM) {
			commandLine.addElement(CODESNIPPET_CLASSPATH_ARG);
			commandLine.addElement(this.evalTargetPath + File.separator + REGULAR_CLASSPATH_DIRECTORY);
			commandLine.addElement(CODESNIPPET_BOOTPATH_ARG);
			commandLine.addElement(this.evalTargetPath + File.separator + BOOT_CLASSPATH_DIRECTORY);
		}
	}

	// program class
	if (this.programClass != null) {
		commandLine.addElement(this.programClass);
	}
	
	// program arguments
	if (this.programArguments != null) {
		for (int i=0;i<this.programArguments.length;i++) {
			commandLine.addElement(this.programArguments[i]);
		}
	}

	String[] result;
	if (this.batchFileName!= null) {
		// Write to batch file if specified
		writeBatchFile(this.batchFileName, commandLine);
		result = new String[] {this.batchFileName};
	} else {
		result = new String[commandLine.size()];
		commandLine.copyInto(result);
	}

	// check for spaces in result
	for (int i = 0; i < result.length; i++) {
		String argument = result[i];
		if (argument.indexOf(' ') != -1) {
			result[i] = "\"" + argument + "\"";
		}
	}
	
	return result;
}

/**
 * Builds the actual boot class path that is going to be passed to the VM.
 */
protected String buildBootClassPath() {
	StringBuffer bootPathString = new StringBuffer();
	char pathSeparator = File.pathSeparatorChar;
	
	if (this.bootPath != null) {
		// Add boot class path given by client
		int length = this.bootPath.length;
		for (int i = 0; i < length; i++){
			bootPathString.append(this.bootPath[i]);
			bootPathString.append(pathSeparator);
		}
	}
		
	// Add boot class path directory if needed
	if (this.evalTargetPath != null && TARGET_HAS_FILE_SYSTEM) {
		bootPathString.append(this.evalTargetPath);
		bootPathString.append(File.separatorChar);
		bootPathString.append(BOOT_CLASSPATH_DIRECTORY);
	}

	return bootPathString.toString();
}
}

Return to bug 172820

Lines 653-658 Link Here

(-)src/org/eclipse/jdt/core/tests/util/Util.java (+12 lines)
653	toNativePath(jreDir + "/lib/jclMax/classes.zip")	653	toNativePath(jreDir + "/lib/jclMax/classes.zip")
654	};	654	};
655	}	655	}
		656	if ("DRLVM".equals(vmName)) {
		657	FilenameFilter jarFilter = new FilenameFilter() {
		658	public boolean accept(File dir, String name) {
		659	return name.endsWith(".jar") & !name.endsWith("-src.jar");
		660	}
		661	};
		662	String[] jars = new File(jreDir + "/lib/boot/").list(jarFilter);
		663	for (int i = 0; i < jars.length; i++) {
		664	jars[i] = toNativePath(jreDir + "/lib/boot/" + jars[i]);
		665	}
		666	return jars;
		667	}
656	ArrayList paths = new ArrayList();	668	ArrayList paths = new ArrayList();
657	String[] jarsNames = new String[] {	669	String[] jarsNames = new String[] {
658	"/lib/vm.jar",	670	"/lib/vm.jar",

Added Link Here

(-)src/org/eclipse/jdt/core/tests/runtime/DRLVMLauncher.java (+140 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jdt.core.tests.runtime;
12
13	import java.io.File;
14	import java.util.Vector;
15
16	/**
17	* This is a new vm launcher to support Apache Harmony
18	* (http://harmony.apache.org) settings
19	*/
20	public class DRLVMLauncher extends StandardVMLauncher {
21
22	/**
23	* @see LocalVMLauncher#getCommandLine
24	*/
25	public String[] getCommandLine() {
26	Vector commandLine= new Vector();
27
28	// VM binary
29	String vmLocation = this.vmPath +
30	(this.vmPath.endsWith(File.separator) ? "" : File.separator) +
31	"bin" +
32	File.separator +
33	"javaw";
34	final String osName = System.getProperty("os.name");
35	if (osName.indexOf("win32") == -1 && !new File(vmLocation).exists()) {
36	vmLocation = vmLocation.substring(0, vmLocation.length()-1);
37	}
38	commandLine.addElement(vmLocation);
39
40	// VM arguments
41	if (this.vmArguments != null) {
42	for (int i = 0; i < this.vmArguments.length; i++) {
43	commandLine.addElement(this.vmArguments[i]);
44	}
45	}
46
47	// boot classpath
48	commandLine.addElement("-Xbootclasspath/a:" + buildBootClassPath());
49
50	// debug mode
51	if (this.debugPort != -1) {
52	commandLine.addElement("-Xdebug");
53	commandLine.addElement("-Xnoagent");
54	// commandLine.addElement("-Djava.compiler=NONE");
55	commandLine.addElement(
56	"-Xrunjdwp:transport=dt_socket,address=" +
57	this.debugPort +
58	",server=y,suspend=n");
59	}
60
61	// regular classpath
62	commandLine.addElement("-classpath");
63	commandLine.addElement(buildClassPath());
64
65	// code snippet runner class
66	if (this.evalPort != -1) {
67	commandLine.addElement(CODE_SNIPPET_RUNNER_CLASS_NAME);
68	}
69
70	// code snippet runner arguments
71	if (this.evalPort != -1) {
72	commandLine.addElement(EVALPORT_ARG);
73	commandLine.addElement(Integer.toString(this.evalPort));
74	if (TARGET_HAS_FILE_SYSTEM) {
75	commandLine.addElement(CODESNIPPET_CLASSPATH_ARG);
76	commandLine.addElement(this.evalTargetPath + File.separator + REGULAR_CLASSPATH_DIRECTORY);
77	commandLine.addElement(CODESNIPPET_BOOTPATH_ARG);
78	commandLine.addElement(this.evalTargetPath + File.separator + BOOT_CLASSPATH_DIRECTORY);
79	}
80	}
81
82	// program class
83	if (this.programClass != null) {
84	commandLine.addElement(this.programClass);
85	}
86
87	// program arguments
88	if (this.programArguments != null) {
89	for (int i=0;i<this.programArguments.length;i++) {
90	commandLine.addElement(this.programArguments[i]);
91	}
92	}
93
94	String[] result;
95	if (this.batchFileName!= null) {
96	// Write to batch file if specified
97	writeBatchFile(this.batchFileName, commandLine);
98	result = new String[] {this.batchFileName};
99	} else {
100	result = new String[commandLine.size()];
101	commandLine.copyInto(result);
102	}
103
104	// check for spaces in result
105	for (int i = 0; i < result.length; i++) {
106	String argument = result[i];
107	if (argument.indexOf(' ') != -1) {
108	result[i] = "\"" + argument + "\"";
109	}
110	}
111
112	return result;
113	}
114
115	/**
116	* Builds the actual boot class path that is going to be passed to the VM.
117	*/
118	protected String buildBootClassPath() {
119	StringBuffer bootPathString = new StringBuffer();
120	char pathSeparator = File.pathSeparatorChar;
121
122	if (this.bootPath != null) {
123	// Add boot class path given by client
124	int length = this.bootPath.length;
125	for (int i = 0; i < length; i++){
126	bootPathString.append(this.bootPath[i]);
127	bootPathString.append(pathSeparator);
128	}
129	}
130
131	// Add boot class path directory if needed
132	if (this.evalTargetPath != null && TARGET_HAS_FILE_SYSTEM) {
133	bootPathString.append(this.evalTargetPath);
134	bootPathString.append(File.separatorChar);
135	bootPathString.append(BOOT_CLASSPATH_DIRECTORY);
136	}
137
138	return bootPathString.toString();
139	}
140	}