From 2778d3f0ce9a0cc2e2862d122ecb2df9ce05aa71 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 7 Mar 2008 01:19:51 +0000 Subject: [PATCH] Expanded fingerprint relationship to work with ItemGroup/Item hierarchy. This is necessary so that the fingerprint owned by a MavenBuild can be attributed to the parent MavenModuleSetBuild. Ditto for matrix job. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7384 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/matrix/MatrixBuild.java | 28 ++++++++++++++++++- .../hudson/maven/MavenModuleSetBuild.java | 10 +++++++ .../main/java/hudson/model/AbstractBuild.java | 14 ++++++++-- .../main/java/hudson/model/Fingerprint.java | 6 ++++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java index d605618191..bbf1b9533b 100644 --- a/core/src/main/java/hudson/matrix/MatrixBuild.java +++ b/core/src/main/java/hudson/matrix/MatrixBuild.java @@ -1,6 +1,14 @@ package hudson.matrix; -import hudson.model.*; +import hudson.model.AbstractBuild; +import hudson.model.AbstractProject; +import hudson.model.BuildListener; +import hudson.model.Executor; +import hudson.model.Fingerprint; +import hudson.model.Hudson; +import hudson.model.JobProperty; +import hudson.model.Queue; +import hudson.model.Result; import hudson.tasks.Publisher; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -49,6 +57,16 @@ public class MatrixBuild extends AbstractBuild { return config.getBuildByNumber(getNumber()); } + /** + * Returns all {@link MatrixRun}s for this {@link MatrixBuild}. + */ + public List getRuns() { + List r = new ArrayList(); + for(MatrixConfiguration c : getParent().getItems()) + r.add(c.getBuildByNumber(getNumber())); + return r; + } + public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) { try { MatrixRun item = getRun(Combination.fromString(token)); @@ -65,6 +83,14 @@ public class MatrixBuild extends AbstractBuild { run(new RunnerImpl()); } + @Override + public Fingerprint.RangeSet getDownstreamRelationship(AbstractProject that) { + Fingerprint.RangeSet rs = super.getDownstreamRelationship(that); + for(MatrixRun run : getRuns()) + rs.add(run.getDownstreamRelationship(that)); + return rs; + } + private class RunnerImpl extends AbstractRunner { private final List aggregators = new ArrayList(); diff --git a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java index 98d8154e37..de69194937 100644 --- a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -10,6 +10,7 @@ import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.Build; import hudson.model.BuildListener; +import hudson.model.Fingerprint; import hudson.model.Hudson; import hudson.model.Result; import hudson.remoting.Channel; @@ -175,6 +176,15 @@ public final class MavenModuleSetBuild extends AbstractBuild builds : getModuleBuilds().values()) + for (MavenBuild b : builds) + rs.add(b.getDownstreamRelationship(that)); + return rs; + } + /** * Called when a module build that corresponds to this module set build * has completed. diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index 3c2fff4503..2769abd6c1 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -30,7 +30,17 @@ import javax.servlet.ServletException; import java.io.File; import java.io.IOException; import java.io.PrintStream; -import java.util.*; +import java.util.AbstractSet; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * Base implementation of {@link Run}s that build software. @@ -460,7 +470,7 @@ public abstract class AbstractBuild

,R extends Abs // look for fingerprints that point to the given project as the source, and merge them all for (Fingerprint e : f.getFingerprints().values()) { BuildPtr o = e.getOriginal(); - if(o!=null && o.is(that)) + if(o!=null && o.belongsTo(that)) n = Math.max(n,o.getNumber()); } diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java index a0f0648824..42cd34c6ad 100644 --- a/core/src/main/java/hudson/model/Fingerprint.java +++ b/core/src/main/java/hudson/model/Fingerprint.java @@ -9,6 +9,8 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import hudson.Util; import hudson.XmlFile; +import hudson.maven.MavenModule; +import hudson.maven.MavenModuleSet; import hudson.util.HexBinaryConverter; import hudson.util.Iterators; import hudson.util.XStream2; @@ -113,6 +115,10 @@ public class Fingerprint implements ModelObject { /** * Returns true if {@link BuildPtr} points to the given job * or one of its subordinates. + * + *

+ * This is useful to check if an artifact in {@link MavenModule} + * belongs to {@link MavenModuleSet}. */ public boolean belongsTo(Job job) { Item p = Hudson.getInstance().getItemByFullName(name);