From cdae92610656f552d9b7a05c2ee7ef11e4e7aef1 Mon Sep 17 00:00:00 2001 From: imod Date: Sat, 22 Sep 2012 19:45:02 +0200 Subject: [PATCH] add GlobalSettingsProvider as new EP --- .../mvn/DefaultGlobalSettingsProvider.java | 34 +++++++++++ .../mvn/FilePathGlobalSettingsProvider.java | 56 +++++++++++++++++++ .../hudson/mvn/GlobalSettingsProvider.java | 38 +++++++++++++ .../mvn/GlobalSettingsProviderDescriptor.java | 18 ++++++ .../config.jelly | 27 +++++++++ .../DefaultGlobalSettingsProvider/help.html | 3 + .../config.jelly | 30 ++++++++++ .../help-path.html | 3 + .../FilePathGlobalSettingsProvider/help.html | 3 + .../java/hudson/maven/MavenModuleSet.java | 23 ++++++++ .../hudson/maven/MavenModuleSetBuild.java | 4 +- .../MavenModuleSet/configure-entries.jelly | 4 ++ 12 files changed, 241 insertions(+), 2 deletions(-) create mode 100644 core/src/main/java/hudson/mvn/DefaultGlobalSettingsProvider.java create mode 100644 core/src/main/java/hudson/mvn/FilePathGlobalSettingsProvider.java create mode 100644 core/src/main/java/hudson/mvn/GlobalSettingsProvider.java create mode 100644 core/src/main/java/hudson/mvn/GlobalSettingsProviderDescriptor.java create mode 100644 core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/config.jelly create mode 100644 core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/help.html create mode 100644 core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/config.jelly create mode 100644 core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help-path.html create mode 100644 core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help.html diff --git a/core/src/main/java/hudson/mvn/DefaultGlobalSettingsProvider.java b/core/src/main/java/hudson/mvn/DefaultGlobalSettingsProvider.java new file mode 100644 index 0000000000..57986d1727 --- /dev/null +++ b/core/src/main/java/hudson/mvn/DefaultGlobalSettingsProvider.java @@ -0,0 +1,34 @@ +package hudson.mvn; + +import hudson.Extension; +import hudson.model.AbstractBuild; +import hudson.util.ArgumentListBuilder; + +import java.io.IOException; + +import org.kohsuke.stapler.DataBoundConstructor; + +/** + * @author Nicolas De Loof + * @author Dominik Bartholdi (imod) + */ +public class DefaultGlobalSettingsProvider extends GlobalSettingsProvider { + + @DataBoundConstructor + public DefaultGlobalSettingsProvider() { + } + + @Override + public void configure(ArgumentListBuilder margs, AbstractBuild project) throws IOException, InterruptedException { + return; + } + + @Extension(ordinal = 99) + public static class DescriptorImpl extends GlobalSettingsProviderDescriptor { + + @Override + public String getDisplayName() { + return "Use default maven global settings"; + } + } +} diff --git a/core/src/main/java/hudson/mvn/FilePathGlobalSettingsProvider.java b/core/src/main/java/hudson/mvn/FilePathGlobalSettingsProvider.java new file mode 100644 index 0000000000..927491e5ea --- /dev/null +++ b/core/src/main/java/hudson/mvn/FilePathGlobalSettingsProvider.java @@ -0,0 +1,56 @@ +package hudson.mvn; + +import hudson.Extension; +import hudson.FilePath; +import hudson.model.AbstractBuild; +import hudson.util.ArgumentListBuilder; +import hudson.util.IOUtils; + +import java.io.IOException; + +import org.apache.commons.lang.StringUtils; +import org.kohsuke.stapler.DataBoundConstructor; + +/** + * @author Nicolas De Loof + * @author Dominik Bartholdi (imod) + */ +public class FilePathGlobalSettingsProvider extends GlobalSettingsProvider { + + private final String path; + + @DataBoundConstructor + public FilePathGlobalSettingsProvider(String path) { + this.path = path; + } + + public String getPath() { + return path; + } + + @Override + public void configure(ArgumentListBuilder margs, AbstractBuild project) throws IOException, InterruptedException { + if (StringUtils.isEmpty(path)) return; + if (IOUtils.isAbsolute(path)) { + margs.add("-gs").add(path); + } else { + FilePath mrSettings = project.getModuleRoot().child(path); + FilePath wsSettings = project.getWorkspace().child(path); + if (!wsSettings.exists() && mrSettings.exists()) + wsSettings = mrSettings; + + margs.add("-gs").add(wsSettings.getRemote()); + } + } + + + @Extension(ordinal = 10) + public static class DescriptorImpl extends SettingsProviderDescriptor { + + @Override + public String getDisplayName() { + return "File in project workspace"; + } + + } +} diff --git a/core/src/main/java/hudson/mvn/GlobalSettingsProvider.java b/core/src/main/java/hudson/mvn/GlobalSettingsProvider.java new file mode 100644 index 0000000000..787a1bcbe8 --- /dev/null +++ b/core/src/main/java/hudson/mvn/GlobalSettingsProvider.java @@ -0,0 +1,38 @@ +package hudson.mvn; + +import hudson.ExtensionPoint; +import hudson.model.AbstractBuild; +import hudson.model.AbstractDescribableImpl; +import hudson.model.Descriptor; +import hudson.util.ArgumentListBuilder; + +import java.io.IOException; + +import javax.servlet.ServletException; + +import org.kohsuke.stapler.StaplerRequest; + +/** + * @author Nicolas De Loof + * @author Dominik Bartholdi (imod) + */ +public abstract class GlobalSettingsProvider extends AbstractDescribableImpl implements ExtensionPoint { + + /** + * configure maven launcher argument list with adequate settings path + * @param margs + * @param project + */ + public abstract void configure(ArgumentListBuilder margs, AbstractBuild project) throws IOException, InterruptedException; + + public static GlobalSettingsProvider parseSettingsProvider(StaplerRequest req) throws Descriptor.FormException, ServletException { + String scm = req.getParameter("globalSettings"); + if(scm==null) return new DefaultGlobalSettingsProvider(); + + int scmidx = Integer.parseInt(scm); + GlobalSettingsProviderDescriptor d = GlobalSettingsProviderDescriptor.all().get(scmidx); + return d.newInstance(req, req.getSubmittedForm().getJSONObject("settings")); + } + +} + diff --git a/core/src/main/java/hudson/mvn/GlobalSettingsProviderDescriptor.java b/core/src/main/java/hudson/mvn/GlobalSettingsProviderDescriptor.java new file mode 100644 index 0000000000..3a9449e1e3 --- /dev/null +++ b/core/src/main/java/hudson/mvn/GlobalSettingsProviderDescriptor.java @@ -0,0 +1,18 @@ +package hudson.mvn; + +import hudson.model.Descriptor; +import jenkins.model.Jenkins; + +import java.util.List; + +/** + * @author Nicolas De Loof + * @author Dominik Bartholdi (imod) + */ +public abstract class GlobalSettingsProviderDescriptor extends Descriptor { + + + public static List all() { + return Jenkins.getInstance().getDescriptorList(GlobalSettingsProvider.class); + } +} diff --git a/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/config.jelly b/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/config.jelly new file mode 100644 index 0000000000..acbdc5ef61 --- /dev/null +++ b/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/config.jelly @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file diff --git a/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/help.html b/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/help.html new file mode 100644 index 0000000000..7d7aa8fd9a --- /dev/null +++ b/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/help.html @@ -0,0 +1,3 @@ +
+ Use default maven settings ($HOME/.m2/settings.xml) as set on build node. +
\ No newline at end of file diff --git a/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/config.jelly b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/config.jelly new file mode 100644 index 0000000000..84d5424a23 --- /dev/null +++ b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/config.jelly @@ -0,0 +1,30 @@ + + + + + + + + \ No newline at end of file diff --git a/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help-path.html b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help-path.html new file mode 100644 index 0000000000..7cd8bbb536 --- /dev/null +++ b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help-path.html @@ -0,0 +1,3 @@ +
+ Path to settings.xml file, relative to project workspace. +
\ No newline at end of file diff --git a/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help.html b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help.html new file mode 100644 index 0000000000..b0123f5704 --- /dev/null +++ b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help.html @@ -0,0 +1,3 @@ +
+ Use a custom setting.xml file from job workspace. Such a file is checked out from SCM as part of the job +
\ No newline at end of file diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 8ab956e493..fcedea63ba 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -50,14 +50,19 @@ import hudson.model.ItemGroup; import hudson.model.Job; import hudson.model.Queue; import hudson.model.Queue.Task; +import hudson.model.AbstractBuild; import hudson.model.ResourceActivity; import hudson.model.Result; import hudson.model.SCMedItem; import hudson.model.Saveable; import hudson.model.TaskListener; import hudson.model.TopLevelItem; +import hudson.mvn.DefaultGlobalSettingsProvider; import hudson.mvn.DefaultSettingsProvider; +import hudson.mvn.FilePathGlobalSettingsProvider; import hudson.mvn.FilePathSettingsProvider; +import hudson.mvn.GlobalSettingsProvider; +import hudson.mvn.GlobalSettingsProviderDescriptor; import hudson.mvn.SettingsProvider; import hudson.mvn.SettingsProviderDescriptor; import hudson.search.CollectionSearchIndex; @@ -73,6 +78,7 @@ import hudson.tasks.Maven.MavenInstallation; import hudson.tasks.Publisher; import hudson.tasks.JavadocArchiver; import hudson.tasks.junit.JUnitResultArchiver; +import hudson.util.ArgumentListBuilder; import hudson.util.CopyOnWriteMap; import hudson.util.DescribableList; import hudson.util.FormValidation; @@ -270,6 +276,11 @@ public class MavenModuleSet extends AbstractMavenProject getSettingsProviders() { return Jenkins.getInstance().getDescriptorList(SettingsProvider.class); } + + public List getGlobalSettingsProviders() { + return Jenkins.getInstance().getDescriptorList(GlobalSettingsProvider.class); + } public String getGlobalMavenOpts() { return globalMavenOpts; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 0a9aa446e0..a432034836 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -53,6 +53,7 @@ import hudson.model.Result; import hudson.model.Run; import hudson.model.StringParameterDefinition; import hudson.model.TaskListener; +import hudson.mvn.GlobalSettingsProvider; import hudson.mvn.SettingsProvider; import hudson.remoting.VirtualChannel; import hudson.scm.ChangeLogSet; @@ -722,8 +723,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild + + + +