Skip to content

J
jenkins

FIY695 / jenkins
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
J
jenkins

体验新版 GitCode，发现更多精彩内容 >>

提交 729a766a 编写于 作者: K kohsuke
浏览文件
操作

refactored a bit. 


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@4436 71c3de6d-444a-0410-be80-ed276b4c234a
上级 78d2d6c7
隐藏空白更改
内联 并排
Showing with 226 addition and 161 deletion
core/src/main/java/hudson/maven/MavenBuild.java
浏览文件 @ 729a766a
package hudson.maven;
import static hudson.Util.fixNull;
import hudson.FilePath;
import hudson.Util;
import hudson.maven.agent.Main;
......@@ -10,26 +9,19 @@ import hudson.model.AbstractProject;
import hudson.model.BuildListener;
import hudson.model.DependencyGraph;
import hudson.model.Hudson;
import hudson.model.JDK;
import hudson.model.Result;
import hudson.model.Run;
import hudson.remoting.Callable;
import hudson.remoting.Channel;
import hudson.remoting.DelegatingCallable;
import hudson.remoting.Launcher;
import hudson.remoting.Which;
import hudson.scm.ChangeLogSet;
import hudson.scm.ChangeLogSet.Entry;
import hudson.tasks.Maven.MavenInstallation;
import hudson.util.ArgumentListBuilder;
import hudson.util.IOException2;
import org.apache.maven.lifecycle.LifecycleExecutorInterceptor;
import org.codehaus.classworlds.NoSuchRealmException;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
......@@ -39,9 +31,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.net.URL;
import java.net.JarURLConnection;
import java.net.URLConnection;
/**
* {@link Run} for {@link MavenModule}.
......@@ -240,48 +229,19 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
}
}
private static final class GetRemotingJar implements Callable<String,IOException> {
public String call() throws IOException {
URL classFile = Main.class.getClassLoader().getResource(Launcher.class.getName().replace('.','/')+".class");
// JNLP returns the URL where the jar was originally placed (like http://hudson.dev.java.net/...)
// not the local cached file. So we need a rather round about approach to get to
// the local file name.
URLConnection con = classFile.openConnection();
if (con instanceof JarURLConnection) {
JarURLConnection connection = (JarURLConnection) con;
return connection.getJarFile().getName();
}
return Which.jarFile(Launcher.class).getPath();
}
}
private class RunnerImpl extends AbstractRunner implements ProcessCache.Factory {
private final List<MavenReporter> reporters = new ArrayList<MavenReporter>();
/**
* Environment variables to be set to the maven process.
* The same variables are exposed to the system property as well.
*/
private final Map<String,String> envVars = getEnvVars();
private class RunnerImpl extends AbstractRunner {
private List<MavenReporter> reporters;
protected Result doRun(BuildListener listener) throws Exception {
// pick up a list of reporters to run
getProject().getReporters().addAllTo(reporters);
getProject().getParent().getReporters().addAllTo(reporters);
for (MavenReporterDescriptor d : MavenReporters.LIST) {
if(getProject().getReporters().contains(d))
continue; // already configured
MavenReporter auto = d.newAutoInstance(getProject());
if(auto!=null)
reporters.add(auto);
}
reporters = getProject().createReporters();
if(debug)
listener.getLogger().println("Reporters="+reporters);
ProcessCache.MavenProcess process = mavenProcessCache.get(launcher.getChannel(), listener, this);
Map<String,String> envVars = getEnvVars();
ProcessCache.MavenProcess process = mavenProcessCache.get(launcher.getChannel(), listener,
new MavenProcessFactory(getParent().getParent(),launcher,envVars));
ArgumentListBuilder margs = new ArgumentListBuilder();
margs.add("-N").add("-B");
......@@ -305,100 +265,6 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
}
}
/**
* Starts maven process.
*/
public Channel newProcess(BuildListener listener, OutputStream out) throws IOException, InterruptedException {
if(debug)
listener.getLogger().println("Using env variables: "+ envVars);
try {
return launcher.launchChannel(buildMavenCmdLine(listener).toCommandArray(),
out, null, envVars);
} catch (IOException e) {
if(fixNull(e.getMessage()).contains("java: not found")) {
// diagnose issue #659
JDK jdk = getParent().getParent().getJDK();
if(jdk==null)
throw new IOException2(getParent().getParent().getDisplayName()+" is not configured with a JDK, but your PATH doesn't include Java",e);
}
throw e;
}
}
/**
* Builds the command line argument list to launch the maven process.
*
* UGLY.
*/
private ArgumentListBuilder buildMavenCmdLine(BuildListener listener) throws IOException, InterruptedException {
MavenInstallation mvn = getMavenInstallation();
if(mvn==null) {
listener.error("Maven version is not configured for this project. Can't determine which Maven to run");
throw new RunnerAbortedException();
}
// find classworlds.jar
File bootDir = new File(mvn.getHomeDir(), "core/boot");
File[] classworlds = bootDir.listFiles(CLASSWORLDS_FILTER);
if(classworlds==null || classworlds.length==0) {
// Maven 2.0.6 puts it to a different place
bootDir = new File(mvn.getHomeDir(), "boot");
classworlds = bootDir.listFiles(CLASSWORLDS_FILTER);
if(classworlds==null || classworlds.length==0) {
listener.error("No classworlds*.jar found in "+mvn.getHomeDir()+" -- Is this a valid maven2 directory?");
throw new RunnerAbortedException();
}
}
boolean isMaster = getCurrentNode()==Hudson.getInstance();
FilePath slaveRoot=null;
if(!isMaster)
slaveRoot = getCurrentNode().getRootPath();
ArgumentListBuilder args = new ArgumentListBuilder();
JDK jdk = getParent().getParent().getJDK();
if(jdk==null)
args.add("java");
else
args.add(jdk.getJavaHome()+"/bin/java");
if(debugPort!=0)
args.add("-Xrunjdwp:transport=dt_socket,server=y,address="+debugPort);
args.addTokenized(getMavenOpts());
args.add("-cp");
args.add(
(isMaster?Which.jarFile(Main.class).getAbsolutePath():slaveRoot.child("maven-agent.jar").getRemote())+
(launcher.isUnix()?":":";")+
classworlds[0].getAbsolutePath());
args.add(Main.class.getName());
// M2_HOME
args.add(mvn.getMavenHome());
// remoting.jar
args.add(launcher.getChannel().call(new GetRemotingJar()));
// interceptor.jar
args.add(isMaster?
Which.jarFile(hudson.maven.agent.PluginManagerInterceptor.class).getAbsolutePath():
slaveRoot.child("maven-interceptor.jar").getRemote());
return args;
}
public String getMavenOpts() {
return getParent().getParent().getMavenOpts();
}
public MavenInstallation getMavenInstallation() {
return getParent().getParent().getMaven();
}
public JDK getJava() {
return getParent().getParent().getJDK();
}
public void post(BuildListener listener) throws IOException, InterruptedException {
for (MavenReporter reporter : reporters)
reporter.end(MavenBuild.this,launcher,listener);
......@@ -494,19 +360,8 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
}
}
/**
* If not 0, launch Maven with a debugger port.
*/
public static int debugPort;
private static final int MAX_PROCESS_CACHE = 5;
static {
String port = System.getProperty(MavenBuild.class.getName() + ".debugPort");
if(port!=null)
debugPort = Integer.parseInt(port);
}
private static final ProcessCache mavenProcessCache = new ProcessCache(MAX_PROCESS_CACHE);
/**
......@@ -529,12 +384,6 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
*/
public static boolean markAsSuccess;
private static final FilenameFilter CLASSWORLDS_FILTER = new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.startsWith("classworlds") && name.endsWith(".jar");
}
};
/**
* Set true to produce debug output.
*/
......
core/src/main/java/hudson/maven/MavenModule.java
浏览文件 @ 729a766a
......@@ -30,6 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.ArrayList;
/**
* {@link Job} that builds projects based on Maven2.
......@@ -345,4 +346,24 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
save();
}
}
/**
* Creates a list of {@link MavenReporter}s to be used for a build of this project.
*/
protected final List<MavenReporter> createReporters() {
List<MavenReporter> reporters = new ArrayList<MavenReporter>();
getReporters().addAllTo(reporters);
getParent().getReporters().addAllTo(reporters);
for (MavenReporterDescriptor d : MavenReporters.LIST) {
if(getReporters().contains(d))
continue; // already configured
MavenReporter auto = d.newAutoInstance(this);
if(auto!=null)
reporters.add(auto);
}
return reporters;
}
}
core/src/main/java/hudson/maven/MavenModuleSetBuild.java
浏览文件 @ 729a766a
......@@ -266,9 +266,14 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
for (MavenModule m : modules.values())
m.updateNextBuildNumber(getNumber());
// start the build
logger.println("Triggering "+project.getRootModule().getModuleName());
project.getRootModule().scheduleBuild();
if(!aggregatorStyle) {
// start the build
logger.println("Triggering "+project.getRootModule().getModuleName());
project.getRootModule().scheduleBuild();
} else {
// run the complete build here
}
return null;
} catch (AbortException e) {
......@@ -381,4 +386,7 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
* Extra versbose debug switch.
*/
public static boolean debug = false;
private static boolean aggregatorStyle = Boolean.getBoolean("aggregatorStyle");
}
core/src/main/java/hudson/maven/MavenProcessFactory.java 0 → 100644
浏览文件 @ 729a766a
package hudson.maven;
import hudson.tasks.Maven.MavenInstallation;
import hudson.model.JDK;
import hudson.model.BuildListener;
import hudson.model.Hudson;
import hudson.model.Node;
import hudson.model.Executor;
import hudson.model.Run.RunnerAbortedException;
import hudson.remoting.Channel;
import hudson.remoting.Which;
import hudson.remoting.Callable;
import static hudson.Util.fixNull;
import hudson.util.IOException2;
import hudson.util.ArgumentListBuilder;
import hudson.FilePath;
import hudson.Launcher;
import hudson.maven.agent.Main;
import java.io.OutputStream;
import java.io.IOException;
import java.io.File;
import java.io.FilenameFilter;
import java.net.URL;
import java.net.URLConnection;
import java.net.JarURLConnection;
import java.util.Map;
/**
* Launches the maven process.
*
* @author Kohsuke Kawaguchi
*/
final class MavenProcessFactory implements ProcessCache.Factory {
private final MavenModuleSet mms;
private final Launcher launcher;
/**
* Environment variables to be set to the maven process.
* The same variables are exposed to the system property as well.
*/
private final Map<String,String> envVars;
MavenProcessFactory(MavenModuleSet mms, Launcher launcher, Map<String, String> envVars) {
this.mms = mms;
this.launcher = launcher;
this.envVars = envVars;
}
/**
* Starts maven process.
*/
public Channel newProcess(BuildListener listener, OutputStream out) throws IOException, InterruptedException {
if(debug)
listener.getLogger().println("Using env variables: "+ envVars);
try {
return launcher.launchChannel(buildMavenCmdLine(listener).toCommandArray(),
out, null, envVars);
} catch (IOException e) {
if(fixNull(e.getMessage()).contains("java: not found")) {
// diagnose issue #659
JDK jdk = mms.getJDK();
if(jdk==null)
throw new IOException2(mms.getDisplayName()+" is not configured with a JDK, but your PATH doesn't include Java",e);
}
throw e;
}
}
/**
* Builds the command line argument list to launch the maven process.
*
* UGLY.
*/
private ArgumentListBuilder buildMavenCmdLine(BuildListener listener) throws IOException, InterruptedException {
MavenInstallation mvn = getMavenInstallation();
if(mvn==null) {
listener.error("Maven version is not configured for this project. Can't determine which Maven to run");
throw new RunnerAbortedException();
}
// find classworlds.jar
File bootDir = new File(mvn.getHomeDir(), "core/boot");
File[] classworlds = bootDir.listFiles(CLASSWORLDS_FILTER);
if(classworlds==null || classworlds.length==0) {
// Maven 2.0.6 puts it to a different place
bootDir = new File(mvn.getHomeDir(), "boot");
classworlds = bootDir.listFiles(CLASSWORLDS_FILTER);
if(classworlds==null || classworlds.length==0) {
listener.error("No classworlds*.jar found in "+mvn.getHomeDir()+" -- Is this a valid maven2 directory?");
throw new RunnerAbortedException();
}
}
boolean isMaster = getCurrentNode()== Hudson.getInstance();
FilePath slaveRoot=null;
if(!isMaster)
slaveRoot = getCurrentNode().getRootPath();
ArgumentListBuilder args = new ArgumentListBuilder();
JDK jdk = mms.getJDK();
if(jdk==null)
args.add("java");
else
args.add(jdk.getJavaHome()+"/bin/java");
if(debugPort!=0)
args.add("-Xrunjdwp:transport=dt_socket,server=y,address="+debugPort);
args.addTokenized(getMavenOpts());
args.add("-cp");
args.add(
(isMaster? Which.jarFile(Main.class).getAbsolutePath():slaveRoot.child("maven-agent.jar").getRemote())+
(launcher.isUnix()?":":";")+
classworlds[0].getAbsolutePath());
args.add(Main.class.getName());
// M2_HOME
args.add(mvn.getMavenHome());
// remoting.jar
args.add(launcher.getChannel().call(new GetRemotingJar()));
// interceptor.jar
args.add(isMaster?
Which.jarFile(hudson.maven.agent.PluginManagerInterceptor.class).getAbsolutePath():
slaveRoot.child("maven-interceptor.jar").getRemote());
return args;
}
public String getMavenOpts() {
return mms.getMavenOpts();
}
public MavenInstallation getMavenInstallation() {
return mms.getMaven();
}
public JDK getJava() {
return mms.getJDK();
}
private static final class GetRemotingJar implements Callable<String,IOException> {
public String call() throws IOException {
URL classFile = Main.class.getClassLoader().getResource(hudson.remoting.Launcher.class.getName().replace('.','/')+".class");
// JNLP returns the URL where the jar was originally placed (like http://hudson.dev.java.net/...)
// not the local cached file. So we need a rather round about approach to get to
// the local file name.
URLConnection con = classFile.openConnection();
if (con instanceof JarURLConnection) {
JarURLConnection connection = (JarURLConnection) con;
return connection.getJarFile().getName();
}
return Which.jarFile(hudson.remoting.Launcher.class).getPath();
}
}
/**
* Returns the current {@link Node} on which we are buildling.
*/
private Node getCurrentNode() {
return Executor.currentExecutor().getOwner().getNode();
}
private static final FilenameFilter CLASSWORLDS_FILTER = new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.startsWith("classworlds") && name.endsWith(".jar");
}
};
/**
* Set true to produce debug output.
*/
public static boolean debug = false;
/**
* If not 0, launch Maven with a debugger port.
*/
public static int debugPort;
static {
String port = System.getProperty(MavenBuild.class.getName() + ".debugPort");
if(port!=null)
debugPort = Integer.parseInt(port);
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或