From f4ff8d7a23ca3ba18178efcbdae86adf744d321b Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Tue, 4 Sep 2012 21:10:50 +0200 Subject: [PATCH] implement submit() to store settingsProvider configuration --- .../hudson/maven/DefaultSettingsProvider.java | 5 +++++ .../main/java/hudson/maven/MavenModuleSet.java | 3 ++- .../java/hudson/maven/SettingsProvider.java | 17 +++++++++++++++++ .../maven/SettingsProviderDescriptor.java | 8 ++++++++ .../maven/DefaultSettingsProvider/config.jelly | 1 - .../maven/DefaultSettingsProvider/help.html | 2 +- 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/DefaultSettingsProvider.java b/maven-plugin/src/main/java/hudson/maven/DefaultSettingsProvider.java index d370bb2e45..bf5c62fa1d 100644 --- a/maven-plugin/src/main/java/hudson/maven/DefaultSettingsProvider.java +++ b/maven-plugin/src/main/java/hudson/maven/DefaultSettingsProvider.java @@ -6,6 +6,7 @@ import hudson.model.AbstractBuild; import hudson.util.ArgumentListBuilder; import hudson.util.FormValidation; import org.kohsuke.stapler.AncestorInPath; +import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; import javax.servlet.ServletException; @@ -18,6 +19,10 @@ import static hudson.Util.fixEmpty; */ public class DefaultSettingsProvider extends SettingsProvider { + @DataBoundConstructor + public DefaultSettingsProvider() { + } + @Override public void configure(ArgumentListBuilder margs, AbstractBuild project) throws IOException, InterruptedException { return; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index f27cab56e8..6576a34701 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -1070,8 +1070,9 @@ public class MavenModuleSet extends AbstractMavenProjectNicolas De Loof */ public abstract class SettingsProviderDescriptor extends Descriptor { + + + public static List all() { + return Jenkins.getInstance().getDescriptorList(SettingsProvider.class); + } } diff --git a/maven-plugin/src/main/resources/hudson/maven/DefaultSettingsProvider/config.jelly b/maven-plugin/src/main/resources/hudson/maven/DefaultSettingsProvider/config.jelly index 0154c36676..acbdc5ef61 100644 --- a/maven-plugin/src/main/resources/hudson/maven/DefaultSettingsProvider/config.jelly +++ b/maven-plugin/src/main/resources/hudson/maven/DefaultSettingsProvider/config.jelly @@ -24,5 +24,4 @@ THE SOFTWARE. - \ No newline at end of file diff --git a/maven-plugin/src/main/resources/hudson/maven/DefaultSettingsProvider/help.html b/maven-plugin/src/main/resources/hudson/maven/DefaultSettingsProvider/help.html index d6fa0884e6..7d7aa8fd9a 100644 --- a/maven-plugin/src/main/resources/hudson/maven/DefaultSettingsProvider/help.html +++ b/maven-plugin/src/main/resources/hudson/maven/DefaultSettingsProvider/help.html @@ -1,3 +1,3 @@
- Use default maven settings ($HOME/.m2/settings.xml) as set on build node. + Use default maven settings ($HOME/.m2/settings.xml) as set on build node.
\ No newline at end of file