mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 05:52:26 +00:00
workspace could be on a slave.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2199 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
3129bdee64
commit
3afbc89a64
1 file changed
+6
-20
@@ -1,7 +1,6 @@
|
||||
package hudson.maven;
|
||||
|
||||
import hudson.FilePath;
|
||||
import hudson.Launcher;
|
||||
import hudson.Util;
|
||||
import hudson.model.AbstractProject;
|
||||
import hudson.model.DependencyGraph;
|
||||
@@ -11,10 +10,10 @@ import hudson.model.Item;
|
||||
import hudson.model.ItemGroup;
|
||||
import hudson.model.Items;
|
||||
import hudson.model.Job;
|
||||
import hudson.model.TaskListener;
|
||||
import hudson.model.Node;
|
||||
import hudson.model.SCMedItem;
|
||||
import hudson.model.TopLevelItem;
|
||||
import hudson.model.TopLevelItemDescriptor;
|
||||
import hudson.model.SCMedItem;
|
||||
import hudson.util.CopyOnWriteMap;
|
||||
import org.kohsuke.stapler.StaplerRequest;
|
||||
import org.kohsuke.stapler.StaplerResponse;
|
||||
@@ -27,8 +26,8 @@ import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* Group of {@link MavenModule}s.
|
||||
@@ -122,8 +121,9 @@ public final class MavenModuleSet extends AbstractProject<MavenModuleSet,MavenMo
|
||||
* Gets the workspace of this job.
|
||||
*/
|
||||
public FilePath getWorkspace() {
|
||||
// TODO: support roaming and etc
|
||||
return Hudson.getInstance().getWorkspaceFor(this);
|
||||
Node node = getLastBuiltOn();
|
||||
if(node==null) node = Hudson.getInstance();
|
||||
return node.getWorkspaceFor(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -209,20 +209,6 @@ public final class MavenModuleSet extends AbstractProject<MavenModuleSet,MavenMo
|
||||
// no dependency for this.
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains a workspace.
|
||||
*/
|
||||
public boolean checkout(Launcher launcher, TaskListener listener) throws IOException {
|
||||
try {
|
||||
FilePath workspace = getWorkspace();
|
||||
workspace.mkdirs();
|
||||
return getScm().checkout(launcher, workspace, listener);
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace(listener.fatalError("SCM check out aborted"));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public MavenModule getRootModule() {
|
||||
return modules.get(rootModule);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user