From a451ce59c13722fde149b8f8e5867998dfa4fe26 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 24 Feb 2009 00:35:14 +0000 Subject: [PATCH] converted existing MavenReporters into the auto-discovery based mechanism. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15610 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/maven/MavenModule.java | 4 ++-- .../main/java/hudson/maven/MavenReporter.java | 5 ++++- .../java/hudson/maven/MavenReporters.java | 21 ++++++++++--------- .../maven/reporters/BuildInfoRecorder.java | 8 ++----- .../reporters/MavenArtifactArchiver.java | 8 ++----- .../maven/reporters/MavenFingerprinter.java | 8 ++----- .../hudson/maven/reporters/MavenMailer.java | 8 ++----- .../maven/reporters/MavenSiteArchiver.java | 8 ++----- .../maven/reporters/SurefireArchiver.java | 8 ++----- .../org/jvnet/hudson/test/HudsonTestCase.java | 1 - 10 files changed, 29 insertions(+), 50 deletions(-) diff --git a/core/src/main/java/hudson/maven/MavenModule.java b/core/src/main/java/hudson/maven/MavenModule.java index f88cc348f5..6d3c5bcb1c 100644 --- a/core/src/main/java/hudson/maven/MavenModule.java +++ b/core/src/main/java/hudson/maven/MavenModule.java @@ -158,7 +158,7 @@ public final class MavenModule extends AbstractMavenProject, Exten return null; } - public abstract MavenReporterDescriptor getDescriptor(); + public MavenReporterDescriptor getDescriptor() { + return (MavenReporterDescriptor)Hudson.getInstance().getDescriptor(getClass()); + } } diff --git a/core/src/main/java/hudson/maven/MavenReporters.java b/core/src/main/java/hudson/maven/MavenReporters.java index 0928542a08..786556dcba 100644 --- a/core/src/main/java/hudson/maven/MavenReporters.java +++ b/core/src/main/java/hudson/maven/MavenReporters.java @@ -24,6 +24,7 @@ package hudson.maven; import hudson.model.Descriptor; +import hudson.model.Hudson; import hudson.maven.reporters.MavenArtifactArchiver; import hudson.maven.reporters.MavenFingerprinter; import hudson.maven.reporters.MavenJavadocArchiver; @@ -31,6 +32,7 @@ import hudson.maven.reporters.SurefireArchiver; import hudson.maven.reporters.MavenMailer; import hudson.maven.reporters.BuildInfoRecorder; import hudson.maven.reporters.MavenSiteArchiver; +import hudson.util.DescriptorList; import java.util.List; import java.util.ArrayList; @@ -42,23 +44,22 @@ import java.util.ArrayList; public final class MavenReporters { /** * List of all installed {@link MavenReporter}s. + * + * @deprecated as of 1.286. Use {@code Hudson.getInstance().getExtensionList(MavenReporterDescriptor.class)} */ - public static final List LIST = Descriptor.toList( - MavenArtifactArchiver.DescriptorImpl.DESCRIPTOR, - MavenFingerprinter.DescriptorImpl.DESCRIPTOR, - MavenJavadocArchiver.DescriptorImpl.DESCRIPTOR, - MavenSiteArchiver.DescriptorImpl.DESCRIPTOR, - SurefireArchiver.DescriptorImpl.DESCRIPTOR, - MavenMailer.DescriptorImpl.DESCRIPTOR, - BuildInfoRecorder.DescriptorImpl.DESCRIPTOR - ); + public static final List LIST = (List)new DescriptorList(MavenReporter.class); + + static { + // emulate the behavior of the legacy code + LIST.add(MavenJavadocArchiver.DescriptorImpl.DESCRIPTOR); + } /** * Gets the subset of {@link #LIST} that has configuration screen. */ public static List getConfigurableList() { List r = new ArrayList(); - for (MavenReporterDescriptor d : LIST) { + for (MavenReporterDescriptor d : Hudson.getInstance().getExtensionList(MavenReporterDescriptor.class)) { if(d.hasConfigScreen()) r.add(d); } diff --git a/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java b/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java index 58de5fdf6b..d8b0c16060 100644 --- a/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java +++ b/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java @@ -32,6 +32,7 @@ import hudson.maven.MavenBuild; import hudson.maven.MavenBuildProxy.BuildCallable; import hudson.model.BuildListener; import hudson.model.Hudson; +import hudson.Extension; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; @@ -85,13 +86,8 @@ public class BuildInfoRecorder extends MavenReporter { return super.preExecute(build, pom, mojo, listener); } - public DescriptorImpl getDescriptor() { - return DescriptorImpl.DESCRIPTOR; - } - + @Extension public static final class DescriptorImpl extends MavenReporterDescriptor { - public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - public String getDisplayName() { return Messages.BuildInfoRecorder_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java b/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java index c9b36ac583..c0bbadcc58 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java +++ b/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java @@ -32,6 +32,7 @@ import hudson.maven.MavenBuild; import hudson.model.BuildListener; import hudson.util.InvocationInterceptor; import hudson.FilePath; +import hudson.Extension; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.installer.ArtifactInstallationException; import org.apache.maven.project.MavenProject; @@ -152,13 +153,8 @@ public class MavenArtifactArchiver extends MavenReporter { return true; } - public DescriptorImpl getDescriptor() { - return DescriptorImpl.DESCRIPTOR; - } - + @Extension public static final class DescriptorImpl extends MavenReporterDescriptor { - public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - public String getDisplayName() { return Messages.MavenArtifactArchiver_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java b/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java index 78e78dd981..6f5d8999b5 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java +++ b/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java @@ -24,6 +24,7 @@ package hudson.maven.reporters; import hudson.FilePath; +import hudson.Extension; import hudson.maven.MavenBuild; import hudson.maven.MavenBuildProxy; import hudson.maven.MavenBuildProxy.BuildCallable; @@ -144,13 +145,8 @@ public class MavenFingerprinter extends MavenReporter { record.put(groupId+':'+f.getName(),digest); } - public DescriptorImpl getDescriptor() { - return DescriptorImpl.DESCRIPTOR; - } - + @Extension public static final class DescriptorImpl extends MavenReporterDescriptor { - public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - public String getDisplayName() { return Messages.MavenFingerprinter_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/MavenMailer.java b/core/src/main/java/hudson/maven/reporters/MavenMailer.java index 13115787f0..e6e4228547 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenMailer.java +++ b/core/src/main/java/hudson/maven/reporters/MavenMailer.java @@ -24,6 +24,7 @@ package hudson.maven.reporters; import hudson.Launcher; +import hudson.Extension; import hudson.maven.MavenBuild; import hudson.maven.MavenReporter; import hudson.maven.MavenReporterDescriptor; @@ -54,13 +55,8 @@ public class MavenMailer extends MavenReporter { return true; } - public DescriptorImpl getDescriptor() { - return DescriptorImpl.DESCRIPTOR; - } - + @Extension public static final class DescriptorImpl extends MavenReporterDescriptor { - public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - public String getDisplayName() { return Messages.MavenMailer_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java b/core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java index 37352f801f..b96356f387 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java +++ b/core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java @@ -25,6 +25,7 @@ package hudson.maven.reporters; import hudson.FilePath; import hudson.Util; +import hudson.Extension; import hudson.maven.MavenBuildProxy; import hudson.maven.MavenModule; import hudson.maven.MavenModuleSet; @@ -127,13 +128,8 @@ public class MavenSiteArchiver extends MavenReporter { } } - public DescriptorImpl getDescriptor() { - return DescriptorImpl.DESCRIPTOR; - } - + @Extension public static final class DescriptorImpl extends MavenReporterDescriptor { - public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - public String getDisplayName() { return "Maven site"; } diff --git a/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java index 372466ad6f..79858ba431 100644 --- a/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java +++ b/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java @@ -24,6 +24,7 @@ package hudson.maven.reporters; import hudson.Util; +import hudson.Extension; import hudson.maven.MavenBuild; import hudson.maven.MavenBuildProxy; import hudson.maven.MavenBuildProxy.BuildCallable; @@ -158,13 +159,8 @@ public class SurefireArchiver extends MavenReporter { return true; } - public DescriptorImpl getDescriptor() { - return DescriptorImpl.DESCRIPTOR; - } - + @Extension public static final class DescriptorImpl extends MavenReporterDescriptor { - public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - public String getDisplayName() { return Messages.SurefireArchiver_DisplayName(); } diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 391b6ffce2..a9a5e85a43 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -207,7 +207,6 @@ public abstract class HudsonTestCase extends TestCase { // without this, plugins loaded in the tests will be left and interferes with the later tests. cleanUpDescriptors(Descriptor.ALL); cleanUpDescriptors(BuildStep.PUBLISHERS); - cleanUpDescriptors(MavenReporters.LIST); hudson.cleanUp(); env.dispose();