Attachment #68539 for bug #172820

Lines 7-12 Link Here

(-)src/org/eclipse/jdt/core/tests/runtime/LocalVMLauncher.java (+5 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Nina Rinskaya
		11	* Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=172820.
10	*******************************************************************************/	12	*******************************************************************************/
11	package org.eclipse.jdt.core.tests.runtime;	13	package org.eclipse.jdt.core.tests.runtime;
12		14
Lines 69-74 Link Here
69	if ("IBM J9SE VM".equals(vmName)) {	71	if ("IBM J9SE VM".equals(vmName)) {
70	return new SideCarJ9VMLauncher();	72	return new SideCarJ9VMLauncher();
71	}	73	}
		74	if ("DRLVM".equals(vmName)) {
		75	return new DRLVMLauncher();
		76	}
72	return new SideCarVMLauncher();	77	return new SideCarVMLauncher();
73	}	78	}
74	/**	79	/**

Lines 7-12 Link Here

(-)src/org/eclipse/jdt/core/tests/util/Util.java (+14 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Nina Rinskaya
		11	* Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=172820.
10	*******************************************************************************/	12	*******************************************************************************/
11	package org.eclipse.jdt.core.tests.util;	13	package org.eclipse.jdt.core.tests.util;
12		14
Lines 653-658 Link Here
653	toNativePath(jreDir + "/lib/jclMax/classes.zip")	655	toNativePath(jreDir + "/lib/jclMax/classes.zip")
654	};	656	};
655	}	657	}
		658	if ("DRLVM".equals(vmName)) {
		659	FilenameFilter jarFilter = new FilenameFilter() {
		660	public boolean accept(File dir, String name) {
		661	return name.endsWith(".jar") & !name.endsWith("-src.jar");
		662	}
		663	};
		664	String[] jars = new File(jreDir + "/lib/boot/").list(jarFilter);
		665	for (int i = 0; i < jars.length; i++) {
		666	jars[i] = toNativePath(jreDir + "/lib/boot/" + jars[i]);
		667	}
		668	return jars;
		669	}
656	ArrayList paths = new ArrayList();	670	ArrayList paths = new ArrayList();
657	String[] jarsNames = new String[] {	671	String[] jarsNames = new String[] {
658	"/lib/vm.jar",	672	"/lib/vm.jar",




/*******************************************************************************
 * Copyright (c) 2000, 2007 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
 *     Nina Rinskaya
 *     		Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=172820.
 *******************************************************************************/
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

Added Link Here

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