提交 3d439015 编写于 作者: K Kohsuke Kawaguchi

Adding @Symbol

Where applicable symbol names used by Job DSL plugin is used for maximum compatibility: https://jenkinsci.github.io/job-dsl-plugin/
上级 e6254e17
......@@ -2,6 +2,8 @@ package hudson;
import hudson.model.ManagementLink;
import java.net.URL;
import org.jenkinsci.Symbol;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
......@@ -10,7 +12,7 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
*
* @author Kohsuke Kawaguchi
*/
@Extension
@Extension @Symbol("about")
public class AboutJenkins extends ManagementLink {
@Override
public String getIconFileName() {
......
......@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import hudson.model.UnprotectedRootAction;
import jenkins.model.Jenkins;
import org.jenkinsci.Symbol;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.HttpResponses.HttpResponseException;
......@@ -51,7 +52,7 @@ import hudson.remoting.Channel;
*
* @author ogondza
*/
@Extension
@Extension @Symbol("cli")
@Restricted(NoExternalUse.class)
public class CLIAction implements UnprotectedRootAction, StaplerProxy {
......
......@@ -8,6 +8,7 @@ import hudson.remoting.ChannelBuilder;
import jenkins.AgentProtocol;
import jenkins.model.Jenkins;
import jenkins.slaves.NioChannelSelector;
import org.jenkinsci.Symbol;
import org.jenkinsci.remoting.nio.NioChannelHub;
import javax.inject.Inject;
......@@ -25,7 +26,7 @@ import java.net.Socket;
* @author Kohsuke Kawaguchi
* @since 1.467
*/
@Extension
@Extension @Symbol("cli")
public class CliProtocol extends AgentProtocol {
@Inject
NioChannelSelector nio;
......
......@@ -2,6 +2,7 @@ package hudson.cli;
import hudson.Extension;
import jenkins.model.Jenkins;
import org.jenkinsci.Symbol;
import org.jenkinsci.remoting.nio.NioChannelHub;
import javax.crypto.SecretKey;
......@@ -20,7 +21,7 @@ import java.security.Signature;
* @author Kohsuke Kawaguchi
* @since 1.467
*/
@Extension
@Extension @Symbol("cli2")
public class CliProtocol2 extends CliProtocol {
@Override
public String getName() {
......
......@@ -23,6 +23,7 @@
*/
package hudson.model;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.DataBoundConstructor;
import net.sf.json.JSONObject;
......@@ -72,7 +73,7 @@ public class BooleanParameterDefinition extends SimpleParameterDefinition {
return new BooleanParameterValue(getName(), defaultValue, getDescription());
}
@Extension
@Extension @Symbol("booleanParam")
public static class DescriptorImpl extends ParameterDescriptor {
@Override
public String getDisplayName() {
......
package hudson.model;
import hudson.util.FormValidation;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.DataBoundConstructor;
......@@ -91,7 +92,7 @@ public class ChoiceParameterDefinition extends SimpleParameterDefinition {
return checkValue(new StringParameterValue(getName(), value, getDescription()));
}
@Extension
@Extension @Symbol("choiceParam")
public static class DescriptorImpl extends ParameterDescriptor {
@Override
public String getDisplayName() {
......
......@@ -28,6 +28,7 @@ import hudson.remoting.Callable;
import hudson.Extension;
import jenkins.security.MasterToSlaveCallable;
import net.sf.json.JSONObject;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.StaplerRequest;
import java.io.IOException;
......@@ -38,7 +39,7 @@ import java.io.IOException;
* @author Kohsuke Kawaguchi
*/
public class ArchitectureMonitor extends NodeMonitor {
@Extension
@Extension @Symbol("architecture")
public static final class DescriptorImpl extends AbstractAsyncNodeMonitorDescriptor<String> {
@Override
protected Callable<String, IOException> createCallable(Computer c) {
......
......@@ -39,6 +39,7 @@ import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
import org.acegisecurity.Authentication;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.StaplerRequest;
/**
......@@ -231,7 +232,7 @@ public abstract class AuthorizationStrategy extends AbstractDescribableImpl<Auth
}
};
@Extension
@Extension @Symbol("unsecured")
public static final class DescriptorImpl extends Descriptor<AuthorizationStrategy> {
@Override
public String getDisplayName() {
......
......@@ -38,6 +38,7 @@ import hudson.util.FormValidation;
import java.io.File;
import org.apache.tools.ant.types.FileSet;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.AncestorInPath;
......@@ -306,7 +307,7 @@ public class ArtifactArchiver extends Recorder implements SimpleBuildStep {
@Deprecated
public static volatile DescriptorImpl DESCRIPTOR;
@Extension
@Extension @Symbol("archiveArtifacts")
public static class DescriptorImpl extends BuildStepDescriptor<Publisher> {
public DescriptorImpl() {
DESCRIPTOR = this; // backward compatibility
......
......@@ -28,6 +28,7 @@ import hudson.Extension;
import hudson.model.AbstractProject;
import hudson.util.LineEndingConversion;
import net.sf.json.JSONObject;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;
import java.io.ObjectStreamException;
......@@ -59,7 +60,7 @@ public class BatchFile extends CommandInterpreter {
return new BatchFile(command);
}
@Extension
@Extension @Symbol("batchFile")
public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
@Override
public String getHelpFile() {
......
......@@ -68,6 +68,7 @@ import org.acegisecurity.Authentication;
import org.acegisecurity.context.SecurityContext;
import org.acegisecurity.context.SecurityContextHolder;
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
......@@ -331,7 +332,7 @@ public class BuildTrigger extends Recorder implements DependencyDeclarer {
return this;
}
@Extension
@Extension @Symbol("downstream")
public static class DescriptorImpl extends BuildStepDescriptor<Publisher> {
public String getDisplayName() {
return Messages.BuildTrigger_DisplayName();
......
......@@ -27,6 +27,7 @@ package hudson.tools;
import hudson.Extension;
import hudson.FilePath;
import hudson.util.LineEndingConversion;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import java.io.ObjectStreamException;
......@@ -57,7 +58,7 @@ public class BatchCommandInstaller extends AbstractCommandInstaller {
return new BatchCommandInstaller(getLabel(), getCommand(), getToolHome());
}
@Extension
@Extension @Symbol("batchFile")
public static class DescriptorImpl extends Descriptor<BatchCommandInstaller> {
@Override
......
......@@ -26,11 +26,12 @@ package jenkins.management;
import hudson.Extension;
import hudson.model.ManagementLink;
import org.jenkinsci.Symbol;
/**
* @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
*/
@Extension(ordinal = Integer.MAX_VALUE - 800)
@Extension(ordinal = Integer.MAX_VALUE - 800) @Symbol("cli")
public class CliLink extends ManagementLink {
@Override
......
......@@ -28,13 +28,14 @@ import hudson.Extension;
import hudson.util.DescribableList;
import java.io.IOException;
import net.sf.json.JSONObject;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.StaplerRequest;
/**
* List of configured {@link ArtifactManagerFactory}s.
* @since 1.532
*/
@Extension
@Extension @Symbol("artifactManager")
public class ArtifactManagerConfiguration extends GlobalConfiguration {
public static ArtifactManagerConfiguration get() {
......
......@@ -3,6 +3,7 @@ package jenkins.model;
import hudson.Extension;
import hudson.model.UnprotectedRootAction;
import hudson.util.TimeUnit2;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
......@@ -21,7 +22,7 @@ import java.util.Enumeration;
*
* @author Kohsuke Kawaguchi
*/
@Extension
@Extension @Symbol("assetManager")
public class AssetManager implements UnprotectedRootAction {
// not shown in the UI
......
......@@ -34,6 +34,7 @@ import hudson.util.HttpResponses;
import hudson.util.Secret;
import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.HttpResponse;
......@@ -161,7 +162,7 @@ public class ApiTokenProperty extends UserProperty {
return this;
}
@Extension
@Extension @Symbol("apiToken")
public static final class DescriptorImpl extends UserPropertyDescriptor {
public String getDisplayName() {
return Messages.ApiTokenProperty_DisplayName();
......
......@@ -5,6 +5,7 @@ import hudson.FilePath;
import hudson.model.AdministrativeMonitor;
import hudson.remoting.Callable;
import jenkins.model.Jenkins;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.HttpResponses;
import org.kohsuke.stapler.QueryParameter;
......@@ -19,7 +20,7 @@ import java.io.IOException;
* @since 1.THU
* @author Kohsuke Kawaguchi
*/
@Extension
@Extension @Symbol("slaveToMasterAccessControl")
public class AdminCallableMonitor extends AdministrativeMonitor {
@Inject
Jenkins jenkins;
......
......@@ -2,6 +2,7 @@ package jenkins.security.s2m;
import hudson.Extension;
import hudson.remoting.Callable;
import org.jenkinsci.Symbol;
import org.jenkinsci.remoting.Role;
import org.jenkinsci.remoting.RoleSensitive;
......@@ -19,7 +20,7 @@ import java.util.Collection;
*
* @author Kohsuke Kawaguchi
*/
@Extension(ordinal=-100)
@Extension(ordinal=-100) @Symbol("admin")
public class AdminCallableWhitelist extends CallableWhitelist {
@Inject
AdminWhitelistRule rule;
......
package jenkins.slaves.systemInfo;
import hudson.Extension;
import org.jenkinsci.Symbol;
/**
* @author Kohsuke Kawaguchi
*/
@Extension(ordinal=0)
@Extension(ordinal=0) @Symbol("classLoaderStatistics")
public class ClassLoaderStatisticsSlaveInfo extends SlaveSystemInfo {
@Override
public String getDisplayName() {
......
......@@ -3,6 +3,7 @@ package jenkins.widgets;
import hudson.Extension;
import hudson.widgets.Widget;
import jenkins.model.Jenkins;
import org.jenkinsci.Symbol;
/**
* Show the default build queue.
......@@ -12,7 +13,7 @@ import jenkins.model.Jenkins;
* @author Kohsuke Kawaguchi
* @since 1.514
*/
@Extension(ordinal=200) // historically this was the top most widget
@Extension(ordinal=200) @Symbol("buildQueue") // historically this was the top most widget
public class BuildQueueWidget extends Widget {
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册