diff --git a/core/src/main/java/hudson/model/ItemDescriptor.java b/core/src/main/java/hudson/model/ItemDescriptor.java deleted file mode 100644 index e5bf22e676..0000000000 --- a/core/src/main/java/hudson/model/ItemDescriptor.java +++ /dev/null @@ -1,32 +0,0 @@ -package hudson.model; - -/** - * {@link Descriptor} for {@link Item}s. - * - *

- * Historically, {@link TopLevelItemDescriptor} came into being first, so this descriptor is parametered - * to retain that signature identical. - * - * @author Kohsuke Kawaguchi - * @since 1.296 - */ -public abstract class ItemDescriptor> extends Descriptor { - protected ItemDescriptor(Class clazz) { - super(clazz); - } - - protected ItemDescriptor() { - } - - /** - * {@link ItemDescriptor}s often uses other descriptors to decorate itself. - * This method allows the subtype of {@link ItemDescriptor}s to filter them out. - * - *

- * This is useful for a workflow/company specific job type that wants to eliminate - * options that the user would see. - */ - public boolean isApplicable(Descriptor descriptor) { - return true; - } -} diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java index 13fb912175..f0d1bcd23e 100644 --- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java +++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java @@ -35,7 +35,7 @@ import hudson.tasks.BuildStepDescriptor; * * @author Kohsuke Kawaguchi */ -public abstract class TopLevelItemDescriptor extends ItemDescriptor { +public abstract class TopLevelItemDescriptor extends Descriptor { protected TopLevelItemDescriptor(Class clazz) { super(clazz); } @@ -50,6 +50,20 @@ public abstract class TopLevelItemDescriptor extends ItemDescriptor + * This is useful for a workflow/company specific job type that wants to eliminate + * options that the user would see. + * + * @since 1.294 + */ + public boolean isApplicable(Descriptor descriptor) { + return true; + } + /** * {@inheritDoc} * diff --git a/core/src/main/java/hudson/scm/SCM.java b/core/src/main/java/hudson/scm/SCM.java index 8a02783c66..cd38c8dd4b 100644 --- a/core/src/main/java/hudson/scm/SCM.java +++ b/core/src/main/java/hudson/scm/SCM.java @@ -40,7 +40,6 @@ import hudson.model.Node; import hudson.model.WorkspaceCleanupThread; import hudson.model.Hudson; import hudson.model.Descriptor; -import hudson.model.ItemDescriptor; import hudson.model.AbstractProject.AbstractProjectDescriptor; import java.io.File; @@ -378,9 +377,9 @@ public abstract class SCM implements Describable, ExtensionPoint { for (SCMDescriptor scmDescriptor : all()) { if(!scmDescriptor.isApplicable(project)) continue; - if (pd instanceof ItemDescriptor) { - ItemDescriptor id = (ItemDescriptor) pd; - if(!id.isApplicable(scmDescriptor)) continue; + if (pd instanceof AbstractProjectDescriptor) { + AbstractProjectDescriptor apd = (AbstractProjectDescriptor) pd; + if(!apd.isApplicable(scmDescriptor)) continue; } r.add(scmDescriptor); diff --git a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java index a2799c7ae0..d27da3b7f7 100644 --- a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java +++ b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java @@ -27,7 +27,6 @@ import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.AbstractProject; import hudson.model.Hudson; -import hudson.model.ItemDescriptor; import hudson.model.AbstractProject.AbstractProjectDescriptor; import java.util.List; @@ -62,7 +61,7 @@ public abstract class BuildStepDescriptor> * * @return * true to allow user to configure this post-promotion task for the given project. - * @see AbstractProjectDescriptor#isApplicable(Descriptor) + * @see AbstractProjectDescriptor#isApplicable(Descriptor) */ public abstract boolean isApplicable(Class jobType); @@ -77,7 +76,7 @@ public abstract class BuildStepDescriptor> List> r = new ArrayList>(base.size()); for (Descriptor d : base) { - if (pd instanceof ItemDescriptor && !((ItemDescriptor)pd).isApplicable(d)) + if (pd instanceof AbstractProjectDescriptor && !((AbstractProjectDescriptor)pd).isApplicable(d)) continue; if (d instanceof BuildStepDescriptor) { diff --git a/core/src/main/java/hudson/tasks/BuildWrappers.java b/core/src/main/java/hudson/tasks/BuildWrappers.java index a04628833a..6455525afc 100644 --- a/core/src/main/java/hudson/tasks/BuildWrappers.java +++ b/core/src/main/java/hudson/tasks/BuildWrappers.java @@ -26,7 +26,6 @@ package hudson.tasks; import hudson.model.AbstractProject; import hudson.model.Descriptor; import hudson.model.Hudson; -import hudson.model.ItemDescriptor; import hudson.model.AbstractProject.AbstractProjectDescriptor; import hudson.Extension; import hudson.util.DescriptorList; @@ -59,7 +58,7 @@ public class BuildWrappers { Descriptor pd = Hudson.getInstance().getDescriptor((Class)project.getClass()); for (Descriptor w : BuildWrapper.all()) { - if (pd instanceof ItemDescriptor && !((ItemDescriptor)pd).isApplicable(w)) + if (pd instanceof AbstractProjectDescriptor && !((AbstractProjectDescriptor)pd).isApplicable(w)) continue; if (w instanceof BuildWrapperDescriptor) { BuildWrapperDescriptor bwd = (BuildWrapperDescriptor) w; diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java index 84f7aa9b18..1ff4d1c497 100644 --- a/core/src/main/java/hudson/triggers/Trigger.java +++ b/core/src/main/java/hudson/triggers/Trigger.java @@ -40,8 +40,6 @@ import hudson.model.Project; import hudson.model.PeriodicWork; import hudson.model.TopLevelItem; import hudson.model.TopLevelItemDescriptor; -import hudson.model.Descriptor; -import hudson.model.ItemDescriptor; import hudson.scheduler.CronTab; import hudson.scheduler.CronTabList; import hudson.util.DoubleLaunchChecker; @@ -272,15 +270,15 @@ public abstract class Trigger implements Describable> * Returns a subset of {@link TriggerDescriptor}s that applys to the given item. */ public static List for_(Item i) { - Descriptor pd = Hudson.getInstance().getDescriptor((Class)i.getClass()); - List r = new ArrayList(); for (TriggerDescriptor t : all()) { if(!t.isApplicable(i)) continue; - if (pd instanceof ItemDescriptor) {// ugly - ItemDescriptor tld = (ItemDescriptor) pd; - if(!tld.isApplicable(t)) continue; + if (i instanceof TopLevelItem) {// ugly + TopLevelItemDescriptor tld = ((TopLevelItem) i).getDescriptor(); + // tld shouldn't be really null in contract, but we often write test Describables that + // doesn't have a Descriptor. + if(tld!=null && !tld.isApplicable(t)) continue; } r.add(t); diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index f357232bd4..19958f2c4d 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -58,7 +58,7 @@ THE SOFTWARE. org.apache.maven maven-embedder - ${maven.version} + ${maven.embedder.version} jtidy diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index 8bd6fb6dc6..bc46209e7b 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -42,8 +42,6 @@ import hudson.model.Label; import hudson.model.Node; import hudson.model.Resource; import hudson.model.Saveable; -import hudson.model.ItemDescriptor; -import hudson.model.Describable; import hudson.tasks.LogRotator; import hudson.tasks.Publisher; import hudson.tasks.Maven.MavenInstallation; @@ -68,7 +66,7 @@ import org.kohsuke.stapler.export.Exported; * * @author Kohsuke Kawaguchi */ -public final class MavenModule extends AbstractMavenProject implements Saveable, Describable { +public final class MavenModule extends AbstractMavenProject implements Saveable { private DescribableList> reporters = new DescribableList>(this); @@ -449,22 +447,4 @@ public final class MavenModule extends AbstractMavenProject { - public String getDisplayName() { - return null; // never used - } - - /** - * Do the same exclusion as {@link MavenModuleSet} does. - */ - @Override - public boolean isApplicable(Descriptor descriptor) { - return Hudson.getInstance().getDescriptorByType(MavenModuleSet.DescriptorImpl.class).isApplicable(descriptor); - } - } } diff --git a/pom.xml b/pom.xml index 6bfc4823e8..40ca91daac 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,8 @@ THE SOFTWARE. - 2.0.4 + 2.0.9 + 2.0.4 diff --git a/test/src/test/java/hudson/maven/MavenProjectTest.java b/test/src/test/java/hudson/maven/MavenProjectTest.java index 6a1468d1bf..16cc37f28b 100755 --- a/test/src/test/java/hudson/maven/MavenProjectTest.java +++ b/test/src/test/java/hudson/maven/MavenProjectTest.java @@ -63,7 +63,7 @@ public class MavenProjectTest extends HudsonTestCase { * This is to make sure that the exclusion in {@link MavenModuleSet.DescriptorImpl#isApplicable(Descriptor)} * is working. */ - public void testConfig() throws Exception { + public void testExclusion() throws Exception { MavenModuleSet p = createMavenProject(); HtmlPage page = new WebClient().getPage(p, "configure"); assertFalse(page.getWebResponse().getContentAsString().contains(hudson.getDescriptorByType(ArtifactArchiver.DescriptorImpl.class).getDisplayName()));