diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index 92adac4219..228a85ef09 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -31,6 +31,7 @@ import hudson.slaves.WorkspaceList.Lease; import hudson.maven.agent.AbortException; import hudson.model.BuildListener; import hudson.model.Computer; +import hudson.model.Hudson; import hudson.model.Result; import hudson.model.Run; import hudson.model.Environment; @@ -87,6 +88,13 @@ public class MavenBuild extends AbstractMavenBuild { */ private List executedMojos; + /** + * Name of the slave this project was built on. + * Null or "" if built by the master. (null happens when we read old record that didn't have this information.) + * @since 1.394 + */ + private String builtOn; + public MavenBuild(MavenModule job) throws IOException { super(job); } @@ -247,6 +255,27 @@ public class MavenBuild extends AbstractMavenBuild { protected void setWorkspace(FilePath path) { super.setWorkspace(path); } + + + /** + * @see hudson.model.AbstractBuild#getBuiltOn() + * @since 1.394 + */ + public Node getBuiltOn() { + if(builtOn==null || builtOn.equals("")) + return Hudson.getInstance(); + else + return Hudson.getInstance().getNode(builtOn); + } + + /** + * @param builtOn + * @since 1.394 + */ + public void setBuiltOnStr( String builtOn ) + { + this.builtOn = builtOn; + } /** * Runs Maven and builds the project. @@ -509,6 +538,8 @@ public class MavenBuild extends AbstractMavenBuild { Executor.currentExecutor().newImpersonatingProxy(MavenBuildProxy2.class,this)); } } + + private class RunnerImpl extends AbstractRunner { private List reporters; @@ -628,4 +659,7 @@ public class MavenBuild extends AbstractMavenBuild { public MavenModule getParent() {// don't know why, but javac wants this return super.getParent(); } + + + } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index e7de79a685..21c4db7875 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -534,7 +534,8 @@ public class MavenModuleSetBuild extends AbstractMavenBuild