From b956eb091abab9f2e7e1e9e5c6907ef5535d594f Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sat, 3 Mar 2007 01:23:12 +0000
Subject: [PATCH] modified to work correctly on slaves.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2301 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/maven/MavenBuild.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/maven/MavenBuild.java b/core/src/main/java/hudson/maven/MavenBuild.java
index df665a4192..dcc36ad22b 100644
--- a/core/src/main/java/hudson/maven/MavenBuild.java
+++ b/core/src/main/java/hudson/maven/MavenBuild.java
@@ -10,6 +10,7 @@ import hudson.model.DependencyGraph;
 import hudson.model.Hudson;
 import hudson.model.Result;
 import hudson.model.Run;
+import hudson.model.Slave;
 import hudson.remoting.Callable;
 import hudson.remoting.Channel;
 import hudson.remoting.Launcher;
@@ -271,6 +272,7 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
             }
         }
 
+        // UGLY....
         private ArgumentListBuilder buildMavenCmdLine() throws IOException, InterruptedException {
             MavenInstallation mvn = getParent().getParent().getMaven();
 
@@ -284,13 +286,18 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
             if(classworlds==null || classworlds.length==0)
                 throw new IOException("No classworlds*.jar found in "+bootDir);
 
+            boolean isMaster = getCurrentNode()==Hudson.getInstance();
+            FilePath slaveRoot=null;
+            if(!isMaster)
+                slaveRoot = ((Slave)getCurrentNode()).getFilePath();
 
             ArgumentListBuilder args = new ArgumentListBuilder();
             args.add(launcher.getChannel().call(new getJavaExe()));
             args.add("-cp");
-            args.add(Which.jarFile(Main.class)+
+            args.add(
+                (isMaster?Which.jarFile(Main.class).getAbsolutePath():slaveRoot.child("maven-agent.jar").getRemote())+
                 (launcher.isUnix()?":":";")+
-                classworlds[0].getAbsolutePath()); // TODO locate Main.jar
+                classworlds[0].getAbsolutePath());
             args.add(Main.class.getName());
 
             // M2_HOME
@@ -299,7 +306,9 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
             // remoting.jar
             args.add(Which.jarFile(Launcher.class).getPath());
             // interceptor.jar
-            args.add(Which.jarFile(hudson.maven.agent.PluginManagerInterceptor.class).getPath()); // TODO
+            args.add(isMaster?
+                Which.jarFile(hudson.maven.agent.PluginManagerInterceptor.class).getAbsolutePath():
+                slaveRoot.child("maven-interceptor.jar").getRemote());
             return args;
         }
 
-- 
GitLab