提交 bc7af314 编写于 作者: K kohsuke

BuildSteps should all use BuildStepDescriptor.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16414 71c3de6d-444a-0410-be80-ed276b4c234a
上级 d2c4999a
...@@ -248,7 +248,7 @@ public class Ant extends Builder { ...@@ -248,7 +248,7 @@ public class Ant extends Builder {
} }
@Extension @Extension
public static class DescriptorImpl extends Descriptor<Builder> { public static class DescriptorImpl extends BuildStepDescriptor<Builder> {
@CopyOnWrite @CopyOnWrite
private volatile AntInstallation[] installations = new AntInstallation[0]; private volatile AntInstallation[] installations = new AntInstallation[0];
...@@ -256,6 +256,10 @@ public class Ant extends Builder { ...@@ -256,6 +256,10 @@ public class Ant extends Builder {
load(); load();
} }
public boolean isApplicable(Class<? extends AbstractProject> jobType) {
return true;
}
protected DescriptorImpl(Class<? extends Ant> clazz) { protected DescriptorImpl(Class<? extends Ant> clazz) {
super(clazz); super(clazz);
} }
......
...@@ -26,6 +26,7 @@ package hudson.tasks; ...@@ -26,6 +26,7 @@ package hudson.tasks;
import hudson.FilePath; import hudson.FilePath;
import hudson.Extension; import hudson.Extension;
import hudson.model.Descriptor; import hudson.model.Descriptor;
import hudson.model.AbstractProject;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerRequest;
...@@ -52,7 +53,7 @@ public class BatchFile extends CommandInterpreter { ...@@ -52,7 +53,7 @@ public class BatchFile extends CommandInterpreter {
} }
@Extension @Extension
public static final class DescriptorImpl extends Descriptor<Builder> { public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
public String getHelpFile() { public String getHelpFile() {
return "/help/project-config/batch.html"; return "/help/project-config/batch.html";
} }
...@@ -64,5 +65,9 @@ public class BatchFile extends CommandInterpreter { ...@@ -64,5 +65,9 @@ public class BatchFile extends CommandInterpreter {
public Builder newInstance(StaplerRequest req, JSONObject data) { public Builder newInstance(StaplerRequest req, JSONObject data) {
return new BatchFile(data.getString("batchFile")); return new BatchFile(data.getString("batchFile"));
} }
public boolean isApplicable(Class<? extends AbstractProject> jobType) {
return true;
}
} }
} }
...@@ -272,7 +272,7 @@ public class Maven extends Builder { ...@@ -272,7 +272,7 @@ public class Maven extends Builder {
public static DescriptorImpl DESCRIPTOR; public static DescriptorImpl DESCRIPTOR;
@Extension @Extension
public static final class DescriptorImpl extends Descriptor<Builder> { public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
@CopyOnWrite @CopyOnWrite
private volatile MavenInstallation[] installations = new MavenInstallation[0]; private volatile MavenInstallation[] installations = new MavenInstallation[0];
...@@ -281,6 +281,10 @@ public class Maven extends Builder { ...@@ -281,6 +281,10 @@ public class Maven extends Builder {
load(); load();
} }
public boolean isApplicable(Class<? extends AbstractProject> jobType) {
return true;
}
protected void convert(Map<String, Object> oldPropertyBag) { protected void convert(Map<String, Object> oldPropertyBag) {
if(oldPropertyBag.containsKey("installations")) if(oldPropertyBag.containsKey("installations"))
installations = (MavenInstallation[]) oldPropertyBag.get("installations"); installations = (MavenInstallation[]) oldPropertyBag.get("installations");
......
...@@ -27,6 +27,7 @@ import hudson.FilePath; ...@@ -27,6 +27,7 @@ import hudson.FilePath;
import hudson.Util; import hudson.Util;
import hudson.Extension; import hudson.Extension;
import hudson.model.Descriptor; import hudson.model.Descriptor;
import hudson.model.AbstractProject;
import static hudson.model.Hudson.isWindows; import static hudson.model.Hudson.isWindows;
import hudson.util.FormFieldValidator; import hudson.util.FormFieldValidator;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
...@@ -99,7 +100,7 @@ public class Shell extends CommandInterpreter { ...@@ -99,7 +100,7 @@ public class Shell extends CommandInterpreter {
} }
@Extension @Extension
public static final class DescriptorImpl extends Descriptor<Builder> { public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
/** /**
* Shell executable, or null to default. * Shell executable, or null to default.
*/ */
...@@ -109,6 +110,10 @@ public class Shell extends CommandInterpreter { ...@@ -109,6 +110,10 @@ public class Shell extends CommandInterpreter {
load(); load();
} }
public boolean isApplicable(Class<? extends AbstractProject> jobType) {
return true;
}
protected void convert(Map<String, Object> oldPropertyBag) { protected void convert(Map<String, Object> oldPropertyBag) {
shell = (String)oldPropertyBag.get("shell"); shell = (String)oldPropertyBag.get("shell");
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册