From 12c4cc253dd3d51bbb085bea8cf6280bdee3e745 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 15 Jun 2010 18:00:18 +0000 Subject: [PATCH] added a hook to customize custom node creation. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32052 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/ComputerSet.java | 8 ++++---- .../main/java/hudson/slaves/NodeDescriptor.java | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java index 711e31c411..6ff656f999 100644 --- a/core/src/main/java/hudson/model/ComputerSet.java +++ b/core/src/main/java/hudson/model/ComputerSet.java @@ -207,8 +207,8 @@ public final class ComputerSet extends AbstractModelObject { * First check point in creating a new slave. */ public synchronized void doCreateItem( StaplerRequest req, StaplerResponse rsp, - @QueryParameter("name") String name, @QueryParameter("mode") String mode, - @QueryParameter("from") String from ) throws IOException, ServletException { + @QueryParameter String name, @QueryParameter String mode, + @QueryParameter String from ) throws IOException, ServletException { final Hudson app = Hudson.getInstance(); app.checkPermission(Hudson.ADMINISTER); // TODO: new permission? @@ -248,8 +248,8 @@ public final class ComputerSet extends AbstractModelObject { return; } - req.setAttribute("descriptor", NodeDescriptor.all().find(mode)); - req.getView(this,"_new.jelly").forward(req,rsp); + NodeDescriptor d = NodeDescriptor.all().find(mode); + d.handleNewNodePage(this,req,rsp); } } diff --git a/core/src/main/java/hudson/slaves/NodeDescriptor.java b/core/src/main/java/hudson/slaves/NodeDescriptor.java index f044bfedc1..06733f4ee3 100644 --- a/core/src/main/java/hudson/slaves/NodeDescriptor.java +++ b/core/src/main/java/hudson/slaves/NodeDescriptor.java @@ -23,6 +23,7 @@ */ package hudson.slaves; +import hudson.model.ComputerSet; import hudson.model.Descriptor; import hudson.model.Slave; import hudson.model.Node; @@ -32,10 +33,15 @@ import hudson.util.FormValidation; import hudson.DescriptorExtensionList; import hudson.Util; +import java.io.IOException; import java.util.List; import java.util.ArrayList; import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; + +import javax.servlet.ServletException; /** * {@link Descriptor} for {@link Slave}. @@ -70,6 +76,15 @@ public abstract class NodeDescriptor extends Descriptor { return '/'+clazz.getName().replace('.','/').replace('$','/')+"/newInstanceDetail.jelly"; } + /** + * Handles the form submission from the "/computer/new" page, which is the first form for creating a new node. + * By default, it shows the configuration page for entering details, but subtypes can override this differently. + */ + public void handleNewNodePage(ComputerSet computerSet, StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { + req.setAttribute("descriptor", this); + req.getView(computerSet,"_new.jelly").forward(req,rsp); + } + @Override public String getConfigPage() { return getViewPage(clazz, "configure-entries.jelly");