implement submit() to store settingsProvider configuration

This commit is contained in:
Nicolas De Loof authored and imod committed 2012-11-01 15:37:34 +01:00
1 parent a79814b3fa
commit f4ff8d7a23
6 files changed
+33 -3

No files matched your search

@@ -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;
@@ -1070,8 +1070,9 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
if(rootPOM!=null && rootPOM.equals("pom.xml")) rootPOM=null; // normalization
goals = Util.fixEmpty(req.getParameter("goals").trim());
alternateSettings = Util.fixEmpty(req.getParameter("alternateSettings").trim());
mavenOpts = Util.fixEmpty(req.getParameter("mavenOpts").trim());
settings = SettingsProvider.parseSettingsProvider(req);
mavenName = req.getParameter("maven_version");
aggregatorStyleBuild = !req.hasParameter("maven.perModuleBuild");
if (json.optBoolean("usePrivateRepository"))
@@ -4,8 +4,15 @@ import hudson.ExtensionPoint;
import hudson.FilePath;
import hudson.model.AbstractBuild;
import hudson.model.AbstractDescribableImpl;
import hudson.model.AbstractProject;
import hudson.model.Descriptor;
import hudson.scm.NullSCM;
import hudson.scm.SCM;
import hudson.scm.SCMDescriptor;
import hudson.util.ArgumentListBuilder;
import org.kohsuke.stapler.StaplerRequest;
import javax.servlet.ServletException;
import java.io.IOException;
/**
@@ -19,5 +26,15 @@ public abstract class SettingsProvider extends AbstractDescribableImpl<SettingsP
* @param project
*/
public abstract void configure(ArgumentListBuilder margs, AbstractBuild project) throws IOException, InterruptedException;
public static SettingsProvider parseSettingsProvider(StaplerRequest req) throws Descriptor.FormException, ServletException {
String scm = req.getParameter("settings");
if(scm==null) return new DefaultSettingsProvider();
int scmidx = Integer.parseInt(scm);
SettingsProviderDescriptor d = SettingsProviderDescriptor.all().get(scmidx);
return d.newInstance(req, req.getSubmittedForm().getJSONObject("settings"));
}
}
@@ -1,9 +1,17 @@
package hudson.maven;
import hudson.model.Descriptor;
import jenkins.model.Jenkins;
import java.util.List;
/**
* @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
*/
public abstract class SettingsProviderDescriptor extends Descriptor<SettingsProvider> {
public static List<SettingsProviderDescriptor> all() {
return Jenkins.getInstance().getDescriptorList(SettingsProvider.class);
}
}
@@ -24,5 +24,4 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
</j:jelly>
@@ -1,3 +1,3 @@
<div>
Use default maven settings (<tt>$HOME/.m2/settings.xml<tt>) as set on build node.
Use default maven settings (<tt>$HOME/.m2/settings.xml</tt>) as set on build node.
</div>