From 13da5b56a97732fd2fb41bd9cacf49ba7c73dc2b Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 14 Mar 2007 01:53:11 +0000 Subject: [PATCH] fixed a bug where e-mail notification wasn't working with the native m2 project. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2511 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/maven/MavenBuild.java | 14 ++++++++++++- .../main/java/hudson/maven/MavenReporter.java | 17 +++++++++++++++ .../hudson/maven/reporters/MavenMailer.java | 21 +++++++------------ 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/hudson/maven/MavenBuild.java b/core/src/main/java/hudson/maven/MavenBuild.java index f5da925081..4ec6929cbf 100644 --- a/core/src/main/java/hudson/maven/MavenBuild.java +++ b/core/src/main/java/hudson/maven/MavenBuild.java @@ -186,9 +186,10 @@ public class MavenBuild extends AbstractBuild { } private class RunnerImpl extends AbstractRunner { + private List reporters = new ArrayList(); + protected Result doRun(BuildListener listener) throws Exception { // pick up a list of reporters to run - List reporters = new ArrayList(); getProject().getReporters().addAllTo(reporters); for (MavenReporterDescriptor d : MavenReporters.LIST) { if(getProject().getReporters().contains(d)) @@ -269,6 +270,17 @@ public class MavenBuild extends AbstractBuild { } public void post(BuildListener listener) { + try { + for (MavenReporter reporter : reporters) + reporter.end(MavenBuild.this,launcher,listener); + } catch (InterruptedException e) { + e.printStackTrace(listener.fatalError("aborted")); + setResult(Result.FAILURE); + } catch (IOException e) { + e.printStackTrace(listener.fatalError("failed")); + setResult(Result.FAILURE); + } + if(!getResult().isWorseThan(Result.UNSTABLE)) { // trigger dependency builds DependencyGraph graph = Hudson.getInstance().getDependencyGraph(); diff --git a/core/src/main/java/hudson/maven/MavenReporter.java b/core/src/main/java/hudson/maven/MavenReporter.java index 0002228b34..0c309ec86c 100644 --- a/core/src/main/java/hudson/maven/MavenReporter.java +++ b/core/src/main/java/hudson/maven/MavenReporter.java @@ -1,11 +1,14 @@ package hudson.maven; import hudson.ExtensionPoint; +import hudson.Launcher; import hudson.model.Action; import hudson.model.BuildListener; import hudson.model.Describable; import hudson.model.Project; +import hudson.model.Build; import hudson.tasks.BuildStep; +import hudson.tasks.Publisher; import org.apache.maven.project.MavenProject; import java.io.IOException; @@ -127,6 +130,9 @@ public abstract class MavenReporter implements Describable, Exten /** * Called after the actual maven2 execution completed. * + *

+ * Note that at this point the build result is still not determined. + * * @return * See {@link #preBuild} * @throws InterruptedException @@ -138,6 +144,17 @@ public abstract class MavenReporter implements Describable, Exten return true; } + /** + * Called after the maven execution finished and the result is determined. + * + *

+ * This method fires after {@link #postBuild(MavenBuildProxy, MavenProject, BuildListener)}. + * Works like {@link Publisher#perform(Build, Launcher, BuildListener)}. + */ + public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { + return true; + } + /** * Equivalent of {@link BuildStep#getProjectAction(Project)} * for {@link MavenReporter}. diff --git a/core/src/main/java/hudson/maven/reporters/MavenMailer.java b/core/src/main/java/hudson/maven/reporters/MavenMailer.java index 4880ca763f..8c0b7e2748 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenMailer.java +++ b/core/src/main/java/hudson/maven/reporters/MavenMailer.java @@ -1,15 +1,14 @@ package hudson.maven.reporters; +import hudson.Launcher; +import hudson.maven.MavenBuild; import hudson.maven.MavenReporter; import hudson.maven.MavenReporterDescriptor; -import hudson.maven.MavenBuildProxy; -import hudson.maven.MavenBuild; -import hudson.maven.MavenBuildProxy.BuildCallable; -import hudson.tasks.Mailer; -import hudson.tasks.MailSender; +import hudson.maven.MavenModule; import hudson.model.BuildListener; +import hudson.tasks.MailSender; +import hudson.tasks.Mailer; import org.kohsuke.stapler.StaplerRequest; -import org.apache.maven.project.MavenProject; import java.io.IOException; @@ -24,14 +23,8 @@ public class MavenMailer extends MavenReporter { public boolean dontNotifyEveryUnstableBuild; public boolean sendToIndividuals; - - public boolean postBuild(MavenBuildProxy build, MavenProject pom, final BuildListener listener) throws InterruptedException, IOException { - build.execute(new BuildCallable() { - public Void call(MavenBuild build) throws IOException, InterruptedException { - new MailSender(recipients,dontNotifyEveryUnstableBuild,sendToIndividuals).execute(build,listener); - return null; - } - }); + public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { + new MailSender(recipients,dontNotifyEveryUnstableBuild,sendToIndividuals).execute(build,listener); return true; }