diff --git a/core/src/main/java/hudson/maven/MavenBuild.java b/core/src/main/java/hudson/maven/MavenBuild.java index fffe85479c..8fe0a7c2f3 100644 --- a/core/src/main/java/hudson/maven/MavenBuild.java +++ b/core/src/main/java/hudson/maven/MavenBuild.java @@ -173,12 +173,18 @@ public class MavenBuild extends AbstractBuild { } } - private static final class getJavaExe implements Callable { + private static final class GetJavaExe implements Callable { public String call() throws IOException { return new File(new File(System.getProperty("java.home")),"bin/java").getPath(); } } + private static final class GetRemotingJar implements Callable { + public String call() throws IOException { + return Which.jarFile(Launcher.class).getPath(); + } + } + private class RunnerImpl extends AbstractRunner { protected Result doRun(BuildListener listener) throws Exception { // pick up a list of reporters to run @@ -239,7 +245,7 @@ public class MavenBuild extends AbstractBuild { slaveRoot = ((Slave)getCurrentNode()).getFilePath(); ArgumentListBuilder args = new ArgumentListBuilder(); - args.add(launcher.getChannel().call(new getJavaExe())); + args.add(launcher.getChannel().call(new GetJavaExe())); //args.add("-Xrunjdwp:transport=dt_socket,server=y,address=8002"); @@ -253,8 +259,8 @@ public class MavenBuild extends AbstractBuild { // M2_HOME args.add(mvn.getMavenHome()); - // remoting.jar - args.add(Which.jarFile(Launcher.class).getPath()); + // remoting.jar // TODO: locate it on remote node + args.add(launcher.getChannel().call(new GetRemotingJar())); // interceptor.jar args.add(isMaster? Which.jarFile(hudson.maven.agent.PluginManagerInterceptor.class).getAbsolutePath():