diff --git a/core/src/findbugs-filter.xml b/core/src/findbugs-filter.xml index 7376f6bd9d..0d8254b1f3 100644 --- a/core/src/findbugs-filter.xml +++ b/core/src/findbugs-filter.xml @@ -126,7 +126,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/groovy/hudson/util/LoadMonitor.groovy b/core/src/main/groovy/hudson/util/LoadMonitor.groovy index d8bd7aacc7..804094d2a4 100644 --- a/core/src/main/groovy/hudson/util/LoadMonitor.groovy +++ b/core/src/main/groovy/hudson/util/LoadMonitor.groovy @@ -24,7 +24,7 @@ package hudson.util import hudson.model.Computer -import hudson.model.Jenkins +import jenkins.model.Jenkins import hudson.model.Label import hudson.model.Queue.BlockedItem import hudson.model.Queue.BuildableItem diff --git a/core/src/main/java/hudson/BulkChange.java b/core/src/main/java/hudson/BulkChange.java index 717dcc08cd..db48db3de7 100644 --- a/core/src/main/java/hudson/BulkChange.java +++ b/core/src/main/java/hudson/BulkChange.java @@ -77,7 +77,7 @@ import java.io.IOException; * * *

- * See {@link hudson.model.Jenkins#save()} as an example if you are not sure how to implement {@link Saveable}. + * See {@link jenkins.model.Jenkins#save()} as an example if you are not sure how to implement {@link Saveable}. * * @author Kohsuke Kawaguchi * @since 1.249 diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index f8034aa6b2..df7668a3d1 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -24,7 +24,7 @@ package hudson; import hudson.PluginWrapper.Dependency; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.IOException2; import hudson.util.MaskingClassLoader; import hudson.util.VersionNumber; @@ -269,7 +269,7 @@ public class ClassicPluginStrategy implements PluginStrategy { } /** - * See {@link ExtensionFinder#scout(Class, hudson.model.Jenkins)} for the dead lock issue and what this does. + * See {@link ExtensionFinder#scout(Class, jenkins.model.Jenkins)} for the dead lock issue and what this does. */ if (LOGGER.isLoggable(Level.FINER)) LOGGER.log(Level.FINER,"Scout-loading ExtensionList: "+type, new Throwable()); diff --git a/core/src/main/java/hudson/DNSMultiCast.java b/core/src/main/java/hudson/DNSMultiCast.java index c985768632..e9ce689280 100644 --- a/core/src/main/java/hudson/DNSMultiCast.java +++ b/core/src/main/java/hudson/DNSMultiCast.java @@ -1,6 +1,6 @@ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import javax.jmdns.JmDNS; import javax.jmdns.ServiceInfo; diff --git a/core/src/main/java/hudson/DependencyRunner.java b/core/src/main/java/hudson/DependencyRunner.java index 1f625d3e70..449c7e0e73 100644 --- a/core/src/main/java/hudson/DependencyRunner.java +++ b/core/src/main/java/hudson/DependencyRunner.java @@ -25,7 +25,7 @@ package hudson; import hudson.model.AbstractProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.security.ACL; import java.util.ArrayList; @@ -34,6 +34,7 @@ import java.util.List; import java.util.Set; import java.util.Collection; import java.util.logging.Logger; + import org.acegisecurity.Authentication; import org.acegisecurity.context.SecurityContextHolder; diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java index f04bae55c5..902d951d08 100644 --- a/core/src/main/java/hudson/DescriptorExtensionList.java +++ b/core/src/main/java/hudson/DescriptorExtensionList.java @@ -25,7 +25,7 @@ package hudson; import hudson.model.Descriptor; import hudson.model.Describable; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.ViewDescriptor; import hudson.model.Descriptor.FormException; import hudson.util.AdaptedIterator; @@ -49,7 +49,7 @@ import net.sf.json.JSONObject; * {@link ExtensionList} for holding a set of {@link Descriptor}s, which is a group of descriptors for * the same extension point. * - * Use {@link hudson.model.Jenkins#getDescriptorList(Class)} to obtain instances. + * Use {@link jenkins.model.Jenkins#getDescriptorList(Class)} to obtain instances. * * @param * Represents the descriptor type. This is {@code Descriptor} normally but often there are subtypes diff --git a/core/src/main/java/hudson/ExtensionFinder.java b/core/src/main/java/hudson/ExtensionFinder.java index 2cf43006ba..41054de16b 100644 --- a/core/src/main/java/hudson/ExtensionFinder.java +++ b/core/src/main/java/hudson/ExtensionFinder.java @@ -25,9 +25,9 @@ package hudson; import com.google.common.collect.ImmutableList; import hudson.init.InitMilestone; +import jenkins.model.Jenkins; import net.java.sezpoz.Index; import net.java.sezpoz.IndexItem; -import hudson.model.Jenkins; import hudson.model.Descriptor; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -59,7 +59,7 @@ import java.lang.reflect.Method; public abstract class ExtensionFinder implements ExtensionPoint { /** * @deprecated as of 1.356 - * Use and implement {@link #find(Class, hudson.model.Jenkins)} that allows us to put some metadata. + * Use and implement {@link #find(Class, jenkins.model.Jenkins)} that allows us to put some metadata. */ @Restricted(NoExternalUse.class) public Collection findExtensions(Class type, Jenkins hudson) { @@ -82,7 +82,7 @@ public abstract class ExtensionFinder implements ExtensionPoint { * @return * Can be empty but never null. * @since 1.356 - * Older implementations provide {@link #findExtensions(Class, hudson.model.Jenkins)} + * Older implementations provide {@link #findExtensions(Class, jenkins.model.Jenkins)} */ public abstract Collection> find(Class type, Jenkins hudson); @@ -115,7 +115,7 @@ public abstract class ExtensionFinder implements ExtensionPoint { * This inconsistent locking order results in a dead lock, you see. * *

- * So to reduce the likelihood, this method is called in prior to {@link #find(Class, hudson.model.Jenkins)} invocation, + * So to reduce the likelihood, this method is called in prior to {@link #find(Class, jenkins.model.Jenkins)} invocation, * but from outside the lock. The implementation is expected to perform all the class initialization activities * from here. * diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java index be3eec5f62..6de9b182cd 100644 --- a/core/src/main/java/hudson/ExtensionList.java +++ b/core/src/main/java/hudson/ExtensionList.java @@ -24,7 +24,7 @@ package hudson; import hudson.init.InitMilestone; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.AdaptedIterator; import hudson.util.DescriptorList; import hudson.util.Memoizer; @@ -51,17 +51,17 @@ import java.util.logging.Logger; * manual registration, * *

- * All {@link ExtensionList} instances should be owned by {@link hudson.model.Jenkins}, even though - * extension points can be defined by anyone on any type. Use {@link hudson.model.Jenkins#getExtensionList(Class)} - * and {@link hudson.model.Jenkins#getDescriptorList(Class)} to obtain the instances. + * All {@link ExtensionList} instances should be owned by {@link jenkins.model.Jenkins}, even though + * extension points can be defined by anyone on any type. Use {@link jenkins.model.Jenkins#getExtensionList(Class)} + * and {@link jenkins.model.Jenkins#getDescriptorList(Class)} to obtain the instances. * * @param * Type of the extension point. This class holds instances of the subtypes of 'T'. * * @author Kohsuke Kawaguchi * @since 1.286 - * @see hudson.model.Jenkins#getExtensionList(Class) - * @see hudson.model.Jenkins#getDescriptorList(Class) + * @see jenkins.model.Jenkins#getExtensionList(Class) + * @see jenkins.model.Jenkins#getDescriptorList(Class) */ public class ExtensionList extends AbstractList { public final Jenkins hudson; diff --git a/core/src/main/java/hudson/ExtensionListView.java b/core/src/main/java/hudson/ExtensionListView.java index 154874a9dd..4c2e8d9604 100644 --- a/core/src/main/java/hudson/ExtensionListView.java +++ b/core/src/main/java/hudson/ExtensionListView.java @@ -23,7 +23,7 @@ */ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.tasks.UserNameResolver; import hudson.util.CopyOnWriteList; @@ -37,7 +37,7 @@ import java.util.Collection; * *

* Instances of this class can be created statically as a singleton, but it provides the view - * to {@link ExtensionList} of the current {@link hudson.model.Jenkins}. + * to {@link ExtensionList} of the current {@link jenkins.model.Jenkins}. * Write operations to this list will update the legacy instances on {@link ExtensionList}. * *

diff --git a/core/src/main/java/hudson/ExtensionPoint.java b/core/src/main/java/hudson/ExtensionPoint.java index eae34080d9..cd5ef8cc21 100644 --- a/core/src/main/java/hudson/ExtensionPoint.java +++ b/core/src/main/java/hudson/ExtensionPoint.java @@ -48,7 +48,7 @@ import java.lang.annotation.Target; public interface ExtensionPoint { /** * Used by designers of extension points (direct subtypes of {@link ExtensionPoint}) to indicate that - * the legacy instances are scoped to {@link hudson.model.Jenkins} instance. By default, legacy instances are + * the legacy instances are scoped to {@link jenkins.model.Jenkins} instance. By default, legacy instances are * static scope. */ @Target(TYPE) diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index 5d2ab82745..e028669fb4 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -27,7 +27,7 @@ package hudson; import hudson.Launcher.LocalLauncher; import hudson.Launcher.RemoteLauncher; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.model.AbstractProject; import hudson.model.Item; diff --git a/core/src/main/java/hudson/FileSystemProvisioner.java b/core/src/main/java/hudson/FileSystemProvisioner.java index 0076cef120..0d9f355e12 100644 --- a/core/src/main/java/hudson/FileSystemProvisioner.java +++ b/core/src/main/java/hudson/FileSystemProvisioner.java @@ -30,7 +30,7 @@ import hudson.model.Computer; import hudson.model.Describable; import hudson.model.Job; import hudson.model.TaskListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.listeners.RunListener; import hudson.scm.SCM; diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index af1bee0ac1..37e7406198 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -53,6 +53,7 @@ import hudson.util.Secret; import hudson.views.MyViewsTabBar; import hudson.views.ViewsTabBar; import hudson.widgets.RenderOnDemandClosure; +import jenkins.model.Jenkins; import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken; import org.apache.commons.jelly.JellyContext; import org.apache.commons.jelly.JellyTagException; @@ -272,7 +273,7 @@ public class Functions { * * *

- * The head portion is the part of the URL from the {@link hudson.model.Jenkins} + * The head portion is the part of the URL from the {@link jenkins.model.Jenkins} * object to the first {@link Run} subtype. When "next/prev build" * is chosen, this part remains intact. * diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java index 1f88754b82..aa984ab3a1 100644 --- a/core/src/main/java/hudson/Launcher.java +++ b/core/src/main/java/hudson/Launcher.java @@ -25,7 +25,7 @@ package hudson; import hudson.Proc.LocalProc; import hudson.model.Computer; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.model.Node; import hudson.remoting.Callable; diff --git a/core/src/main/java/hudson/LauncherDecorator.java b/core/src/main/java/hudson/LauncherDecorator.java index db6cc260ce..0abfca30e2 100644 --- a/core/src/main/java/hudson/LauncherDecorator.java +++ b/core/src/main/java/hudson/LauncherDecorator.java @@ -1,6 +1,6 @@ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.Executor; import hudson.tasks.BuildWrapper; diff --git a/core/src/main/java/hudson/LocalPluginManager.java b/core/src/main/java/hudson/LocalPluginManager.java index 72e085ce82..335f5b5278 100644 --- a/core/src/main/java/hudson/LocalPluginManager.java +++ b/core/src/main/java/hudson/LocalPluginManager.java @@ -24,7 +24,7 @@ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/hudson/Plugin.java b/core/src/main/java/hudson/Plugin.java index 463cda0dee..86be632f20 100644 --- a/core/src/main/java/hudson/Plugin.java +++ b/core/src/main/java/hudson/Plugin.java @@ -23,7 +23,7 @@ */ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Descriptor; import hudson.model.Saveable; import hudson.model.listeners.ItemListener; @@ -100,7 +100,7 @@ public abstract class Plugin implements Saveable { * *

* This method is called after {@link #setServletContext(ServletContext)} is invoked. - * You can also use {@link hudson.model.Jenkins#getInstance()} to access the singleton hudson instance, + * You can also use {@link jenkins.model.Jenkins#getInstance()} to access the singleton hudson instance, * although the plugin start up happens relatively early in the initialization * stage and not all the data are loaded in Hudson. * diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 0501dfbcbc..079e63a9e4 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -32,7 +32,7 @@ import hudson.init.InitStrategy; import hudson.init.InitializerFinder; import hudson.model.AbstractModelObject; import hudson.model.Failure; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.UpdateCenter; import hudson.model.UpdateSite; import hudson.util.CyclicGraphDetector; @@ -103,7 +103,7 @@ public abstract class PluginManager extends AbstractModelObject { /** * @deprecated as of 1.355 - * {@link PluginManager} can now live longer than {@link hudson.model.Jenkins} instance, so + * {@link PluginManager} can now live longer than {@link jenkins.model.Jenkins} instance, so * use {@code Hudson.getInstance().servletContext} instead. */ public final ServletContext context; @@ -150,7 +150,7 @@ public abstract class PluginManager extends AbstractModelObject { /** * Called immediately after the construction. * This is a separate method so that code executed from here will see a valid value in - * {@link hudson.model.Jenkins#pluginManager}. + * {@link jenkins.model.Jenkins#pluginManager}. */ public TaskBuilder initTasks(final InitStrategy initStrategy) { TaskBuilder builder; diff --git a/core/src/main/java/hudson/PluginStrategy.java b/core/src/main/java/hudson/PluginStrategy.java index 29ba001c63..ad645bee5d 100644 --- a/core/src/main/java/hudson/PluginStrategy.java +++ b/core/src/main/java/hudson/PluginStrategy.java @@ -23,7 +23,7 @@ */ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index 62d83adda7..34662818c6 100644 --- a/core/src/main/java/hudson/PluginWrapper.java +++ b/core/src/main/java/hudson/PluginWrapper.java @@ -25,7 +25,7 @@ package hudson; import hudson.PluginManager.PluginInstanceStore; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.UpdateCenter; import hudson.model.UpdateSite; import hudson.util.VersionNumber; diff --git a/core/src/main/java/hudson/ProxyConfiguration.java b/core/src/main/java/hudson/ProxyConfiguration.java index 49d168073f..b73d4380ba 100644 --- a/core/src/main/java/hudson/ProxyConfiguration.java +++ b/core/src/main/java/hudson/ProxyConfiguration.java @@ -23,7 +23,7 @@ */ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Saveable; import hudson.model.listeners.SaveableListener; import hudson.util.Scrambler; @@ -52,7 +52,7 @@ import com.thoughtworks.xstream.XStream; * * Http Authentication). * - * @see hudson.model.Jenkins#proxy + * @see jenkins.model.Jenkins#proxy */ public final class ProxyConfiguration implements Saveable { public final String name; diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java index 63f0d81445..2f59a91e0d 100644 --- a/core/src/main/java/hudson/TcpSlaveAgentListener.java +++ b/core/src/main/java/hudson/TcpSlaveAgentListener.java @@ -23,7 +23,7 @@ */ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Computer; import hudson.slaves.OfflineCause; import hudson.slaves.SlaveComputer; @@ -67,7 +67,7 @@ import java.util.logging.Logger; * unauthorized remote slaves. * *

- * The approach here is to have {@link hudson.model.Jenkins#getSecretKey() a secret key} on the master. + * The approach here is to have {@link jenkins.model.Jenkins#getSecretKey() a secret key} on the master. * This key is sent to the slave inside the .jnlp file * (this file itself is protected by HTTP form-based authentication that * we use everywhere else in Hudson), and the slave sends this diff --git a/core/src/main/java/hudson/UDPBroadcastFragment.java b/core/src/main/java/hudson/UDPBroadcastFragment.java index fd7b3001e1..12ee191070 100644 --- a/core/src/main/java/hudson/UDPBroadcastFragment.java +++ b/core/src/main/java/hudson/UDPBroadcastFragment.java @@ -23,7 +23,7 @@ */ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.net.SocketAddress; diff --git a/core/src/main/java/hudson/UDPBroadcastThread.java b/core/src/main/java/hudson/UDPBroadcastThread.java index 7b886b1f3d..a3586ea4e9 100644 --- a/core/src/main/java/hudson/UDPBroadcastThread.java +++ b/core/src/main/java/hudson/UDPBroadcastThread.java @@ -23,7 +23,7 @@ */ package hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.OneShotEvent; import java.io.IOException; diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index d99f9ecd51..d071b3a62e 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -24,7 +24,7 @@ package hudson; import hudson.model.TaskListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import static hudson.util.jna.GNUCLibrary.LIBC; import hudson.util.IOException2; diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index e08311c61b..3dbb1bcb8b 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -26,7 +26,7 @@ package hudson; import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider; import com.thoughtworks.xstream.core.JVM; import hudson.model.Hudson; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.User; import hudson.triggers.SafeTimerTask; import hudson.triggers.Trigger; @@ -73,7 +73,7 @@ public final class WebAppMain implements ServletContextListener { private static final String APP = "app"; /** - * Creates the sole instance of {@link hudson.model.Jenkins} and register it to the {@link ServletContext}. + * Creates the sole instance of {@link jenkins.model.Jenkins} and register it to the {@link ServletContext}. */ public void contextInitialized(ServletContextEvent event) { try { diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java index ad6eba0710..ce6fe13f18 100644 --- a/core/src/main/java/hudson/cli/CLICommand.java +++ b/core/src/main/java/hudson/cli/CLICommand.java @@ -30,7 +30,7 @@ import hudson.ExtensionPoint; import hudson.cli.declarative.CLIMethod; import hudson.ExtensionPoint.LegacyInstancesAreScopedToHudson; import hudson.cli.declarative.OptionHandlerExtension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.Callable; import hudson.remoting.Channel; import hudson.remoting.ChannelProperty; @@ -225,7 +225,7 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable { * @param auth * Always non-null. * If the underlying transport had already performed authentication, this object is something other than - * {@link hudson.model.Jenkins#ANONYMOUS}. + * {@link jenkins.model.Jenkins#ANONYMOUS}. */ protected boolean shouldPerformAuthentication(Authentication auth) { return auth== Jenkins.ANONYMOUS; @@ -245,7 +245,7 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable { * then this method can return a valid identity of the client. * *

- * If the transport doesn't do authentication, this method returns {@link hudson.model.Jenkins#ANONYMOUS}. + * If the transport doesn't do authentication, this method returns {@link jenkins.model.Jenkins#ANONYMOUS}. */ public Authentication getTransportAuthentication() { Authentication a = channel.getProperty(TRANSPORT_AUTHENTICATION); diff --git a/core/src/main/java/hudson/cli/CliManagerImpl.java b/core/src/main/java/hudson/cli/CliManagerImpl.java index 3b47e5e802..3f8e0b3c14 100644 --- a/core/src/main/java/hudson/cli/CliManagerImpl.java +++ b/core/src/main/java/hudson/cli/CliManagerImpl.java @@ -24,7 +24,7 @@ package hudson.cli; import hudson.remoting.Channel; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.apache.commons.discovery.resource.ClassLoaders; import org.apache.commons.discovery.resource.classes.DiscoverClasses; import org.apache.commons.discovery.resource.names.DiscoverServiceNames; diff --git a/core/src/main/java/hudson/cli/ClientAuthenticationCache.java b/core/src/main/java/hudson/cli/ClientAuthenticationCache.java index e0b1477b08..fb97282f9b 100644 --- a/core/src/main/java/hudson/cli/ClientAuthenticationCache.java +++ b/core/src/main/java/hudson/cli/ClientAuthenticationCache.java @@ -2,8 +2,8 @@ package hudson.cli; import hudson.FilePath; import hudson.FilePath.FileCallable; -import hudson.model.Jenkins; -import hudson.model.Jenkins.MasterComputer; +import jenkins.model.Jenkins; +import jenkins.model.Jenkins.MasterComputer; import hudson.os.PosixAPI; import hudson.remoting.Callable; import hudson.remoting.Channel; @@ -58,7 +58,7 @@ public class ClientAuthenticationCache implements Serializable { /** * Gets the persisted authentication for this Hudson. * - * @return {@link hudson.model.Jenkins#ANONYMOUS} if no such credential is found, or if the stored credential is invalid. + * @return {@link jenkins.model.Jenkins#ANONYMOUS} if no such credential is found, or if the stored credential is invalid. */ public Authentication get() { Jenkins h = Jenkins.getInstance(); diff --git a/core/src/main/java/hudson/cli/CommandDuringBuild.java b/core/src/main/java/hudson/cli/CommandDuringBuild.java index 9e6f054d30..c18b6d040b 100644 --- a/core/src/main/java/hudson/cli/CommandDuringBuild.java +++ b/core/src/main/java/hudson/cli/CommandDuringBuild.java @@ -24,7 +24,7 @@ package hudson.cli; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Job; import hudson.model.Run; import hudson.remoting.Callable; diff --git a/core/src/main/java/hudson/cli/CopyJobCommand.java b/core/src/main/java/hudson/cli/CopyJobCommand.java index 0e14534aa9..8ef822846c 100644 --- a/core/src/main/java/hudson/cli/CopyJobCommand.java +++ b/core/src/main/java/hudson/cli/CopyJobCommand.java @@ -23,7 +23,7 @@ */ package hudson.cli; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TopLevelItem; import hudson.Extension; import hudson.model.Item; diff --git a/core/src/main/java/hudson/cli/CreateJobCommand.java b/core/src/main/java/hudson/cli/CreateJobCommand.java index d0fa3620b9..6d6f5b7355 100644 --- a/core/src/main/java/hudson/cli/CreateJobCommand.java +++ b/core/src/main/java/hudson/cli/CreateJobCommand.java @@ -23,7 +23,7 @@ */ package hudson.cli; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.Extension; import hudson.model.Item; import org.kohsuke.args4j.Argument; diff --git a/core/src/main/java/hudson/cli/GroovyCommand.java b/core/src/main/java/hudson/cli/GroovyCommand.java index 5446ae9bbd..835d0bc53a 100644 --- a/core/src/main/java/hudson/cli/GroovyCommand.java +++ b/core/src/main/java/hudson/cli/GroovyCommand.java @@ -26,7 +26,7 @@ package hudson.cli; import groovy.lang.GroovyShell; import groovy.lang.Binding; import hudson.model.AbstractProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.Run; import hudson.remoting.Callable; diff --git a/core/src/main/java/hudson/cli/GroovyshCommand.java b/core/src/main/java/hudson/cli/GroovyshCommand.java index dc7668c196..ad7afe2b51 100644 --- a/core/src/main/java/hudson/cli/GroovyshCommand.java +++ b/core/src/main/java/hudson/cli/GroovyshCommand.java @@ -24,7 +24,7 @@ package hudson.cli; import hudson.Extension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.ChannelClosedException; import groovy.lang.Binding; import groovy.lang.Closure; diff --git a/core/src/main/java/hudson/cli/HelpCommand.java b/core/src/main/java/hudson/cli/HelpCommand.java index 94104accd4..69a8b1dfb9 100644 --- a/core/src/main/java/hudson/cli/HelpCommand.java +++ b/core/src/main/java/hudson/cli/HelpCommand.java @@ -24,7 +24,7 @@ package hudson.cli; import hudson.Extension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.util.Map; import java.util.TreeMap; diff --git a/core/src/main/java/hudson/cli/InstallPluginCommand.java b/core/src/main/java/hudson/cli/InstallPluginCommand.java index 3f5b02a425..27ec07a2c7 100644 --- a/core/src/main/java/hudson/cli/InstallPluginCommand.java +++ b/core/src/main/java/hudson/cli/InstallPluginCommand.java @@ -25,7 +25,7 @@ package hudson.cli; import hudson.Extension; import hudson.FilePath; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.UpdateSite; import hudson.model.UpdateSite.Data; import hudson.util.EditDistance; diff --git a/core/src/main/java/hudson/cli/InstallToolCommand.java b/core/src/main/java/hudson/cli/InstallToolCommand.java index cb3e12421b..364f4cfcf3 100644 --- a/core/src/main/java/hudson/cli/InstallToolCommand.java +++ b/core/src/main/java/hudson/cli/InstallToolCommand.java @@ -26,7 +26,7 @@ package hudson.cli; import hudson.Extension; import hudson.AbortException; import hudson.EnvVars; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.AbstractProject; import hudson.model.Run; import hudson.model.Executor; diff --git a/core/src/main/java/hudson/cli/LoginCommand.java b/core/src/main/java/hudson/cli/LoginCommand.java index 38934be910..cf026d3f7b 100644 --- a/core/src/main/java/hudson/cli/LoginCommand.java +++ b/core/src/main/java/hudson/cli/LoginCommand.java @@ -1,7 +1,7 @@ package hudson.cli; import hudson.Extension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.acegisecurity.Authentication; import org.kohsuke.args4j.CmdLineException; diff --git a/core/src/main/java/hudson/cli/MailCommand.java b/core/src/main/java/hudson/cli/MailCommand.java index 2c8670ca76..d5e3e98e39 100644 --- a/core/src/main/java/hudson/cli/MailCommand.java +++ b/core/src/main/java/hudson/cli/MailCommand.java @@ -25,7 +25,7 @@ package hudson.cli; import hudson.tasks.Mailer; import hudson.Extension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import javax.mail.internet.MimeMessage; diff --git a/core/src/main/java/hudson/cli/VersionCommand.java b/core/src/main/java/hudson/cli/VersionCommand.java index e3a2c08065..52e7129112 100644 --- a/core/src/main/java/hudson/cli/VersionCommand.java +++ b/core/src/main/java/hudson/cli/VersionCommand.java @@ -24,7 +24,7 @@ package hudson.cli; import hudson.Extension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; /** * Shows the version. diff --git a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java index ddd2c9ee87..3d92cf0502 100644 --- a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java +++ b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java @@ -29,7 +29,7 @@ import hudson.ExtensionFinder; import hudson.Util; import hudson.cli.CLICommand; import hudson.cli.CloneableCLICommand; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.Channel; import hudson.security.CliAuthenticator; import org.acegisecurity.Authentication; diff --git a/core/src/main/java/hudson/cli/declarative/CLIResolver.java b/core/src/main/java/hudson/cli/declarative/CLIResolver.java index 0e72399cc1..2b31b47f27 100644 --- a/core/src/main/java/hudson/cli/declarative/CLIResolver.java +++ b/core/src/main/java/hudson/cli/declarative/CLIResolver.java @@ -47,7 +47,7 @@ import java.lang.annotation.Target; *

* If the chosen resolver method is an instance method on type S, the "parent resolver" is then * located to resolve an instance of type 'S'. This process repeats until a static resolver method is discovered - * (since most of Hudson's model objects are anchored to the root {@link hudson.model.Jenkins} object, normally that would become + * (since most of Hudson's model objects are anchored to the root {@link jenkins.model.Jenkins} object, normally that would become * the top-most resolver method.) * *

diff --git a/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java b/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java index 96b7c1730b..28d332faf1 100644 --- a/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java +++ b/core/src/main/java/hudson/cli/handlers/AbstractProjectOptionHandler.java @@ -24,7 +24,7 @@ package hudson.cli.handlers; import hudson.model.AbstractProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.OptionDef; diff --git a/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java b/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java index 324248e09c..f5f0444b8c 100644 --- a/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java +++ b/core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java @@ -1,7 +1,7 @@ package hudson.cli.handlers; import hudson.model.AbstractProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TopLevelItem; import org.kohsuke.MetaInfServices; import org.kohsuke.args4j.CmdLineException; diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java index 86a40a167b..9bf93a5a8f 100644 --- a/core/src/main/java/hudson/console/AnnotatedLargeText.java +++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java @@ -24,7 +24,7 @@ package hudson.console; import com.trilead.ssh2.crypto.Base64; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.ObjectInputStreamEx; import hudson.util.IOException2; import hudson.util.Secret; diff --git a/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java b/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java index 6a357a1db4..b4e260b6af 100644 --- a/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java +++ b/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java @@ -26,7 +26,7 @@ package hudson.console; import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.TimeUnit2; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java b/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java index 5dd66a54c1..522b23f4ec 100644 --- a/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java +++ b/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java @@ -26,7 +26,7 @@ package hudson.console; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Run; import hudson.util.TimeUnit2; import org.jvnet.tiger_types.Types; diff --git a/core/src/main/java/hudson/console/ConsoleLogFilter.java b/core/src/main/java/hudson/console/ConsoleLogFilter.java index 4e4e2ec4c8..d099d1dede 100644 --- a/core/src/main/java/hudson/console/ConsoleLogFilter.java +++ b/core/src/main/java/hudson/console/ConsoleLogFilter.java @@ -27,7 +27,7 @@ package hudson.console; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.AbstractBuild; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java index 353e46657f..ccc6710640 100644 --- a/core/src/main/java/hudson/console/ConsoleNote.java +++ b/core/src/main/java/hudson/console/ConsoleNote.java @@ -26,7 +26,7 @@ package hudson.console; import hudson.Functions; import hudson.MarkupText; import hudson.model.Describable; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Run; import hudson.remoting.ObjectInputStreamEx; import hudson.util.IOException2; diff --git a/core/src/main/java/hudson/console/HyperlinkNote.java b/core/src/main/java/hudson/console/HyperlinkNote.java index 0d068b9231..410452a96d 100644 --- a/core/src/main/java/hudson/console/HyperlinkNote.java +++ b/core/src/main/java/hudson/console/HyperlinkNote.java @@ -25,7 +25,7 @@ package hudson.console; import hudson.Extension; import hudson.MarkupText; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.io.IOException; import java.util.logging.Level; diff --git a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java b/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java index d217611f3e..5de7fcdcab 100644 --- a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java +++ b/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java @@ -24,7 +24,7 @@ package hudson.diagnosis; import hudson.Extension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.PeriodicWork; import org.jvnet.animal_sniffer.IgnoreJRERequirement; diff --git a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java b/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java index 03caefe3fe..a72bcd68b3 100644 --- a/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java +++ b/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageMonitor.java @@ -24,7 +24,7 @@ package hudson.diagnosis; import hudson.model.AdministrativeMonitor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.AbstractModelObject; import hudson.Extension; import hudson.ExtensionPoint; diff --git a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java index e2610468e7..8892fb1f2a 100644 --- a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java +++ b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java @@ -28,7 +28,7 @@ import hudson.PluginWrapper; import hudson.init.Initializer; import hudson.model.AdministrativeMonitor; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java index d6471025ba..606921802c 100644 --- a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java +++ b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java @@ -25,7 +25,7 @@ package hudson.diagnosis; import hudson.XmlFile; import hudson.model.AdministrativeMonitor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.Extension; import hudson.model.Item; import hudson.model.Job; diff --git a/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java b/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java index 434f8e64bf..80ea45c9e6 100644 --- a/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java +++ b/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java @@ -24,7 +24,7 @@ package hudson.diagnosis; import hudson.model.AdministrativeMonitor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.Extension; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/fsp/WorkspaceSnapshotSCM.java b/core/src/main/java/hudson/fsp/WorkspaceSnapshotSCM.java index 6f061d7416..e090c14d55 100644 --- a/core/src/main/java/hudson/fsp/WorkspaceSnapshotSCM.java +++ b/core/src/main/java/hudson/fsp/WorkspaceSnapshotSCM.java @@ -32,7 +32,7 @@ import hudson.model.AbstractProject; import hudson.model.TaskListener; import hudson.model.AbstractBuild; import hudson.model.BuildListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Result; import hudson.model.PermalinkProjectAction.Permalink; import hudson.Launcher; diff --git a/core/src/main/java/hudson/init/InitReactorListener.java b/core/src/main/java/hudson/init/InitReactorListener.java index a0759ae828..ea3f92a25f 100644 --- a/core/src/main/java/hudson/init/InitReactorListener.java +++ b/core/src/main/java/hudson/init/InitReactorListener.java @@ -15,7 +15,7 @@ import org.kohsuke.MetaInfServices; * To register, put {@link MetaInfServices} on your implementation. * * @author Kohsuke Kawaguchi - * @see hudson.model.Jenkins#buildReactorListener() + * @see jenkins.model.Jenkins#buildReactorListener() */ public interface InitReactorListener extends ReactorListener { } diff --git a/core/src/main/java/hudson/init/InitializerFinder.java b/core/src/main/java/hudson/init/InitializerFinder.java index f2a2f1a46f..d77d366fcf 100644 --- a/core/src/main/java/hudson/init/InitializerFinder.java +++ b/core/src/main/java/hudson/init/InitializerFinder.java @@ -23,6 +23,7 @@ */ package hudson.init; +import jenkins.model.Jenkins; import org.jvnet.hudson.annotation_indexer.Index; import org.jvnet.hudson.reactor.Milestone; import org.jvnet.hudson.reactor.Task; @@ -42,8 +43,6 @@ import java.util.List; import java.util.Set; import java.util.logging.Logger; -import hudson.model.Jenkins; - import static java.util.logging.Level.WARNING; /** diff --git a/core/src/main/java/hudson/init/impl/GroovyInitScript.java b/core/src/main/java/hudson/init/impl/GroovyInitScript.java index cf7b8f3154..d7f9354f1a 100644 --- a/core/src/main/java/hudson/init/impl/GroovyInitScript.java +++ b/core/src/main/java/hudson/init/impl/GroovyInitScript.java @@ -31,7 +31,7 @@ import java.io.IOException; import java.net.URL; import java.util.logging.Logger; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import static hudson.init.InitMilestone.JOB_LOADED; import hudson.init.Initializer; diff --git a/core/src/main/java/hudson/init/impl/InitialUserContent.java b/core/src/main/java/hudson/init/impl/InitialUserContent.java index b1afcd0472..85a7d7bb7e 100644 --- a/core/src/main/java/hudson/init/impl/InitialUserContent.java +++ b/core/src/main/java/hudson/init/impl/InitialUserContent.java @@ -25,7 +25,7 @@ package hudson.init.impl; import static hudson.init.InitMilestone.JOB_LOADED; import hudson.init.Initializer; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Messages; import org.apache.commons.io.FileUtils; diff --git a/core/src/main/java/hudson/lifecycle/Lifecycle.java b/core/src/main/java/hudson/lifecycle/Lifecycle.java index b1960feece..7f7c8e9bc8 100644 --- a/core/src/main/java/hudson/lifecycle/Lifecycle.java +++ b/core/src/main/java/hudson/lifecycle/Lifecycle.java @@ -26,7 +26,7 @@ package hudson.lifecycle; import hudson.ExtensionPoint; import hudson.Functions; import hudson.Util; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java b/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java index 2d5b174d9a..9da1505229 100644 --- a/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java @@ -23,7 +23,8 @@ */ package hudson.lifecycle; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; + import java.io.IOException; /** diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java index 19a20d83bf..f85bde1c32 100644 --- a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java @@ -33,7 +33,7 @@ import java.io.IOException; import static hudson.util.jna.GNUCLibrary.*; import hudson.Platform; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; /** * {@link Lifecycle} implementation when Hudson runs on the embedded diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java index 7c597b7e59..0f686542a7 100644 --- a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java +++ b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java @@ -25,7 +25,7 @@ package hudson.lifecycle; import hudson.Functions; import hudson.model.ManagementLink; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.AbortException; import hudson.Extension; import hudson.util.StreamTaskListener; diff --git a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java index 017bcc3fbc..c99bf6b40c 100644 --- a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java @@ -26,11 +26,12 @@ package hudson.lifecycle; import hudson.FilePath; import hudson.Launcher.LocalLauncher; import hudson.Util; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.StreamTaskListener; import hudson.util.jna.Kernel32; import static hudson.util.jna.Kernel32.MOVEFILE_DELAY_UNTIL_REBOOT; import static hudson.util.jna.Kernel32.MOVEFILE_REPLACE_EXISTING; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.output.ByteArrayOutputStream; diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java index 82991da74b..c440cda11f 100644 --- a/core/src/main/java/hudson/logging/LogRecorder.java +++ b/core/src/main/java/hudson/logging/LogRecorder.java @@ -28,7 +28,7 @@ import hudson.BulkChange; import hudson.Util; import hudson.XmlFile; import hudson.model.AbstractModelObject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Saveable; import hudson.model.listeners.SaveableListener; import hudson.util.CopyOnWriteList; @@ -57,7 +57,7 @@ import java.util.logging.Logger; * *

Access Control

* {@link LogRecorder} is only visible for administrators, and this access control happens at - * {@link hudson.model.Jenkins#getLog()}, the sole entry point for binding {@link LogRecorder} to URL. + * {@link jenkins.model.Jenkins#getLog()}, the sole entry point for binding {@link LogRecorder} to URL. * * @author Kohsuke Kawaguchi * @see LogRecorderManager diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java index 1bf73b0db5..9e1f22c8e7 100644 --- a/core/src/main/java/hudson/logging/LogRecorderManager.java +++ b/core/src/main/java/hudson/logging/LogRecorderManager.java @@ -28,7 +28,7 @@ import hudson.Functions; import hudson.init.Initializer; import static hudson.init.InitMilestone.PLUGINS_PREPARED; import hudson.model.AbstractModelObject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.RSS; import hudson.tasks.Mailer; import hudson.util.CopyOnWriteMap; diff --git a/core/src/main/java/hudson/markup/MarkupFormatter.java b/core/src/main/java/hudson/markup/MarkupFormatter.java index b948e14f30..b40e163578 100644 --- a/core/src/main/java/hudson/markup/MarkupFormatter.java +++ b/core/src/main/java/hudson/markup/MarkupFormatter.java @@ -48,7 +48,7 @@ import java.io.Writer; * * @author Kohsuke Kawaguchi * @since 1.391 - * @see hudson.model.Jenkins#getMarkupFormatter() + * @see jenkins.model.Jenkins#getMarkupFormatter() */ public abstract class MarkupFormatter extends AbstractDescribableImpl implements ExtensionPoint { /** diff --git a/core/src/main/java/hudson/markup/MarkupFormatterDescriptor.java b/core/src/main/java/hudson/markup/MarkupFormatterDescriptor.java index 6f92ee6526..133c0fe19d 100644 --- a/core/src/main/java/hudson/markup/MarkupFormatterDescriptor.java +++ b/core/src/main/java/hudson/markup/MarkupFormatterDescriptor.java @@ -25,7 +25,7 @@ package hudson.markup; import hudson.DescriptorExtensionList; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; /** * {@link Descriptor} for {@link MarkupFormatter}. diff --git a/core/src/main/java/hudson/matrix/Axis.java b/core/src/main/java/hudson/matrix/Axis.java index 9e2edccd1d..b0621800aa 100644 --- a/core/src/main/java/hudson/matrix/Axis.java +++ b/core/src/main/java/hudson/matrix/Axis.java @@ -27,7 +27,7 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.Util; import hudson.model.AbstractDescribableImpl; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.QuotedStringTokenizer; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/matrix/AxisDescriptor.java b/core/src/main/java/hudson/matrix/AxisDescriptor.java index 3d249e0e98..7d93505e4e 100644 --- a/core/src/main/java/hudson/matrix/AxisDescriptor.java +++ b/core/src/main/java/hudson/matrix/AxisDescriptor.java @@ -26,7 +26,7 @@ package hudson.matrix; import hudson.Util; import hudson.model.Descriptor; import hudson.model.Failure; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.FormValidation; import org.kohsuke.stapler.QueryParameter; diff --git a/core/src/main/java/hudson/matrix/JDKAxis.java b/core/src/main/java/hudson/matrix/JDKAxis.java index e17058bffa..fecd908dee 100644 --- a/core/src/main/java/hudson/matrix/JDKAxis.java +++ b/core/src/main/java/hudson/matrix/JDKAxis.java @@ -24,7 +24,7 @@ package hudson.matrix; import hudson.Extension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.kohsuke.stapler.DataBoundConstructor; import java.util.Arrays; diff --git a/core/src/main/java/hudson/matrix/LabelAxis.java b/core/src/main/java/hudson/matrix/LabelAxis.java index 49c032d6b8..bd32df0037 100644 --- a/core/src/main/java/hudson/matrix/LabelAxis.java +++ b/core/src/main/java/hudson/matrix/LabelAxis.java @@ -26,7 +26,7 @@ package hudson.matrix; import hudson.Extension; import hudson.Functions; import hudson.Util; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.labels.LabelAtom; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/matrix/LabelExpAxis.java b/core/src/main/java/hudson/matrix/LabelExpAxis.java index 250cbbf6ed..281438d838 100644 --- a/core/src/main/java/hudson/matrix/LabelExpAxis.java +++ b/core/src/main/java/hudson/matrix/LabelExpAxis.java @@ -25,7 +25,7 @@ package hudson.matrix; import hudson.Extension; import hudson.Util; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java index bdc2f88ff0..23af939c07 100644 --- a/core/src/main/java/hudson/matrix/MatrixBuild.java +++ b/core/src/main/java/hudson/matrix/MatrixBuild.java @@ -30,7 +30,7 @@ import hudson.model.AbstractProject; import hudson.model.BuildListener; import hudson.model.Executor; import hudson.model.Fingerprint; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.JobProperty; import hudson.model.ParametersAction; import hudson.model.Queue; diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java index 39e9f722c6..14d7d8af29 100644 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java @@ -31,7 +31,7 @@ import hudson.model.Cause; import hudson.model.CauseAction; import hudson.model.DependencyGraph; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.JDK; diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index 9758215e2f..27a8d47423 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -34,7 +34,7 @@ import hudson.model.BuildableItemWithBuildWrappers; import hudson.model.DependencyGraph; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.Items; diff --git a/core/src/main/java/hudson/matrix/listeners/MatrixBuildListener.java b/core/src/main/java/hudson/matrix/listeners/MatrixBuildListener.java index 469b9fe4a3..4bb7076f23 100644 --- a/core/src/main/java/hudson/matrix/listeners/MatrixBuildListener.java +++ b/core/src/main/java/hudson/matrix/listeners/MatrixBuildListener.java @@ -29,7 +29,7 @@ import hudson.matrix.MatrixConfiguration; import hudson.matrix.MatrixBuild; import hudson.matrix.MatrixRun; import hudson.model.Action; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Queue; import hudson.model.Queue.Task; diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index 16cc2fe976..0254e59c3e 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -57,6 +57,7 @@ import hudson.util.AdaptedIterator; import hudson.util.Iterators; import hudson.util.LogTaskListener; import hudson.util.VariableResolver; +import jenkins.model.Jenkins; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/AbstractDescribableImpl.java b/core/src/main/java/hudson/model/AbstractDescribableImpl.java index d00e7cf04d..50df6771ba 100644 --- a/core/src/main/java/hudson/model/AbstractDescribableImpl.java +++ b/core/src/main/java/hudson/model/AbstractDescribableImpl.java @@ -23,6 +23,8 @@ */ package hudson.model; +import jenkins.model.Jenkins; + /** * Partial default implementation of {@link Describable}. * diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index 60494e7326..af738ec84c 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -40,6 +40,7 @@ import hudson.util.AlternativeUiTextProvider; import hudson.util.AlternativeUiTextProvider.Message; import hudson.util.AtomicFileWriter; import hudson.util.IOException2; +import jenkins.model.Jenkins; import org.apache.tools.ant.taskdefs.Copy; import org.apache.tools.ant.types.FileSet; import org.kohsuke.stapler.WebMethod; diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 59d13cdbdc..e16f6dea0c 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -77,6 +77,7 @@ import hudson.util.EditDistance; import hudson.util.FormValidation; import hudson.widgets.BuildHistoryWidget; import hudson.widgets.HistoryWidget; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineException; diff --git a/core/src/main/java/hudson/model/Action.java b/core/src/main/java/hudson/model/Action.java index ba3b2bf18f..eae1920754 100644 --- a/core/src/main/java/hudson/model/Action.java +++ b/core/src/main/java/hudson/model/Action.java @@ -87,7 +87,7 @@ public interface Action extends ModelObject { * but this can be used for actions that only contribute floatBox.jelly * and no task list item. The other case where this is useful is * to avoid showing links that require a privilege when the user is anonymous. - * @see Jenkins#isAdmin() + * @see jenkins.model.Jenkins#isAdmin() */ String getIconFileName(); diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java index eb878a88e5..d09b41c02c 100644 --- a/core/src/main/java/hudson/model/AdministrativeMonitor.java +++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java @@ -33,6 +33,7 @@ import hudson.triggers.TimerTrigger; import java.util.Set; import java.io.IOException; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/AllView.java b/core/src/main/java/hudson/model/AllView.java index 782ce132ac..408fbc19dd 100644 --- a/core/src/main/java/hudson/model/AllView.java +++ b/core/src/main/java/hudson/model/AllView.java @@ -23,6 +23,7 @@ */ package hudson.model; +import jenkins.model.Jenkins; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/AperiodicWork.java b/core/src/main/java/hudson/model/AperiodicWork.java index 724400b4eb..e10696531b 100644 --- a/core/src/main/java/hudson/model/AperiodicWork.java +++ b/core/src/main/java/hudson/model/AperiodicWork.java @@ -27,6 +27,7 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.triggers.SafeTimerTask; import hudson.triggers.Trigger; +import jenkins.model.Jenkins; import java.util.Random; import java.util.logging.Logger; diff --git a/core/src/main/java/hudson/model/AsyncAperiodicWork.java b/core/src/main/java/hudson/model/AsyncAperiodicWork.java index c35e13470c..fceb25a065 100644 --- a/core/src/main/java/hudson/model/AsyncAperiodicWork.java +++ b/core/src/main/java/hudson/model/AsyncAperiodicWork.java @@ -30,6 +30,7 @@ import java.io.File; import java.io.IOException; import java.util.logging.Level; +import jenkins.model.Jenkins; import org.acegisecurity.context.SecurityContextHolder; /** diff --git a/core/src/main/java/hudson/model/AsyncPeriodicWork.java b/core/src/main/java/hudson/model/AsyncPeriodicWork.java index 185ed103b7..2c89594643 100644 --- a/core/src/main/java/hudson/model/AsyncPeriodicWork.java +++ b/core/src/main/java/hudson/model/AsyncPeriodicWork.java @@ -2,6 +2,7 @@ package hudson.model; import hudson.security.ACL; import hudson.util.StreamTaskListener; +import jenkins.model.Jenkins; import org.acegisecurity.context.SecurityContextHolder; import java.io.File; diff --git a/core/src/main/java/hudson/model/BallColor.java b/core/src/main/java/hudson/model/BallColor.java index 3622c02616..56c26ec875 100644 --- a/core/src/main/java/hudson/model/BallColor.java +++ b/core/src/main/java/hudson/model/BallColor.java @@ -24,6 +24,7 @@ package hudson.model; import hudson.util.ColorPalette; +import jenkins.model.Jenkins; import org.jvnet.localizer.LocaleProvider; import org.jvnet.localizer.Localizable; import org.kohsuke.stapler.Stapler; diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java index 4c59b5b7a3..be55eadb89 100644 --- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java +++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java @@ -26,6 +26,7 @@ package hudson.model; import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; import hudson.Util; import hudson.security.ACL; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/BuildVariableContributor.java b/core/src/main/java/hudson/model/BuildVariableContributor.java index a400e970f1..35c4935789 100644 --- a/core/src/main/java/hudson/model/BuildVariableContributor.java +++ b/core/src/main/java/hudson/model/BuildVariableContributor.java @@ -27,6 +27,7 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.tasks.Builder; import hudson.tasks.Publisher; +import jenkins.model.Jenkins; import java.util.Map; diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java index 38ccb85afb..d48c44a539 100644 --- a/core/src/main/java/hudson/model/Cause.java +++ b/core/src/main/java/hudson/model/Cause.java @@ -30,6 +30,7 @@ import java.util.List; import hudson.console.HyperlinkNote; import hudson.diagnosis.OldDataMonitor; import hudson.util.XStream2; +import jenkins.model.Jenkins; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import com.thoughtworks.xstream.converters.UnmarshallingContext; diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index c50e05f616..a6eec93118 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -53,6 +53,7 @@ import hudson.util.RemotingDiagnostics; import hudson.util.RemotingDiagnostics.HeapDump; import hudson.util.RunList; import hudson.util.Futures; +import jenkins.model.Jenkins; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/ComputerPinger.java b/core/src/main/java/hudson/model/ComputerPinger.java index 544d292e63..6dd158fdeb 100644 --- a/core/src/main/java/hudson/model/ComputerPinger.java +++ b/core/src/main/java/hudson/model/ComputerPinger.java @@ -3,6 +3,7 @@ package hudson.model; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; +import jenkins.model.Jenkins; import java.io.IOException; import java.net.InetAddress; diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java index b344bf910f..38c406bb94 100644 --- a/core/src/main/java/hudson/model/ComputerSet.java +++ b/core/src/main/java/hudson/model/ComputerSet.java @@ -33,6 +33,7 @@ import hudson.node_monitors.NodeMonitor; import hudson.slaves.NodeDescriptor; import hudson.util.DescribableList; import hudson.util.FormValidation; +import jenkins.model.Jenkins; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java index 57d7c694e5..9e3f47e7d5 100644 --- a/core/src/main/java/hudson/model/DependencyGraph.java +++ b/core/src/main/java/hudson/model/DependencyGraph.java @@ -26,6 +26,7 @@ package hudson.model; import hudson.security.ACL; import hudson.security.NotSerilizableSecurityContext; +import jenkins.model.Jenkins; import org.acegisecurity.context.SecurityContext; import org.acegisecurity.context.SecurityContextHolder; diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index 7e245af2a5..e9ef934e3e 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -33,6 +33,7 @@ import hudson.model.listeners.SaveableListener; import hudson.util.ReflectionUtils; import hudson.util.ReflectionUtils.Parameter; import hudson.views.ListViewColumn; +import jenkins.model.Jenkins; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.kohsuke.stapler.*; diff --git a/core/src/main/java/hudson/model/DescriptorByNameOwner.java b/core/src/main/java/hudson/model/DescriptorByNameOwner.java index 356ea6090f..0f8d5b26c5 100644 --- a/core/src/main/java/hudson/model/DescriptorByNameOwner.java +++ b/core/src/main/java/hudson/model/DescriptorByNameOwner.java @@ -25,7 +25,7 @@ package hudson.model; /** * Adds {@link #getDescriptorByName(String)} to bind {@link Descriptor}s to URL. - * Binding them at some specific object (instead of {@link Jenkins}), allows + * Binding them at some specific object (instead of {@link jenkins.model.Jenkins}), allows * {@link Descriptor}s to perform context-specific form field validation. * *

@@ -41,7 +41,7 @@ public interface DescriptorByNameOwner extends ModelObject { * Exposes all {@link Descriptor}s by its name to URL. * *

- * Implementation should always delegate to {@link Jenkins#getDescriptorByName(String)}. + * Implementation should always delegate to {@link jenkins.model.Jenkins#getDescriptorByName(String)}. * * @param id * Either {@link Descriptor#getId()} (recommended) or the short name. diff --git a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java index a94751daa2..08a5ae6481 100644 --- a/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java +++ b/core/src/main/java/hudson/model/DescriptorVisibilityFilter.java @@ -3,6 +3,7 @@ package hudson.model; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.scm.SCMDescriptor; +import jenkins.model.Jenkins; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java index 4c1e283f40..54fa50c4a6 100644 --- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java +++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java @@ -28,6 +28,7 @@ import hudson.Util; import hudson.util.IOException2; import hudson.FilePath.FileCallable; import hudson.remoting.VirtualChannel; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.HttpResponse; diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java index 5c12e76ec6..4b539eca2b 100644 --- a/core/src/main/java/hudson/model/DownloadService.java +++ b/core/src/main/java/hudson/model/DownloadService.java @@ -30,6 +30,7 @@ import hudson.util.IOUtils; import hudson.util.QuotedStringTokenizer; import hudson.util.TextFile; import hudson.util.TimeUnit2; +import jenkins.model.Jenkins; import org.kohsuke.stapler.Stapler; import java.io.File; diff --git a/core/src/main/java/hudson/model/EnvironmentContributor.java b/core/src/main/java/hudson/model/EnvironmentContributor.java index e6561fb76c..bf7a683d6b 100644 --- a/core/src/main/java/hudson/model/EnvironmentContributor.java +++ b/core/src/main/java/hudson/model/EnvironmentContributor.java @@ -26,6 +26,7 @@ package hudson.model; import hudson.EnvVars; import hudson.ExtensionList; import hudson.ExtensionPoint; +import jenkins.model.Jenkins; import java.io.IOException; diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java index 906a9f668f..0e1bc52238 100644 --- a/core/src/main/java/hudson/model/Executor.java +++ b/core/src/main/java/hudson/model/Executor.java @@ -33,6 +33,7 @@ import hudson.model.queue.WorkUnit; import hudson.util.TimeUnit2; import hudson.util.InterceptingProxy; import hudson.security.ACL; +import jenkins.model.Jenkins; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/ExternalJob.java b/core/src/main/java/hudson/model/ExternalJob.java index d5c58afc74..3f8bc6adbb 100644 --- a/core/src/main/java/hudson/model/ExternalJob.java +++ b/core/src/main/java/hudson/model/ExternalJob.java @@ -26,6 +26,7 @@ package hudson.model; import hudson.model.RunMap.Constructor; import hudson.Extension; import hudson.util.AlternativeUiTextProvider; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/Failure.java b/core/src/main/java/hudson/model/Failure.java index a83e35e5af..fa94890199 100644 --- a/core/src/main/java/hudson/model/Failure.java +++ b/core/src/main/java/hudson/model/Failure.java @@ -23,6 +23,7 @@ */ package hudson.model; +import jenkins.model.Jenkins; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java index 7e66647ec8..62fe611453 100644 --- a/core/src/main/java/hudson/model/Fingerprint.java +++ b/core/src/main/java/hudson/model/Fingerprint.java @@ -37,6 +37,7 @@ import hudson.model.listeners.SaveableListener; import hudson.util.HexBinaryConverter; import hudson.util.Iterators; import hudson.util.XStream2; +import jenkins.model.Jenkins; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/model/FingerprintCleanupThread.java b/core/src/main/java/hudson/model/FingerprintCleanupThread.java index 82f7a0e1d7..348bd8ffff 100644 --- a/core/src/main/java/hudson/model/FingerprintCleanupThread.java +++ b/core/src/main/java/hudson/model/FingerprintCleanupThread.java @@ -24,6 +24,7 @@ package hudson.model; import hudson.Extension; +import jenkins.model.Jenkins; import java.io.File; import java.io.FileFilter; diff --git a/core/src/main/java/hudson/model/FingerprintMap.java b/core/src/main/java/hudson/model/FingerprintMap.java index efefe34abf..1b3ed92451 100644 --- a/core/src/main/java/hudson/model/FingerprintMap.java +++ b/core/src/main/java/hudson/model/FingerprintMap.java @@ -25,6 +25,7 @@ package hudson.model; import hudson.Util; import hudson.util.KeyedDataStorage; +import jenkins.model.Jenkins; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/hudson/model/FreeStyleProject.java b/core/src/main/java/hudson/model/FreeStyleProject.java index b4110aea4f..8eacc0ae75 100644 --- a/core/src/main/java/hudson/model/FreeStyleProject.java +++ b/core/src/main/java/hudson/model/FreeStyleProject.java @@ -24,6 +24,7 @@ package hudson.model; import hudson.Extension; +import jenkins.model.Jenkins; /** * Free-style software project. diff --git a/core/src/main/java/hudson/model/HealthReport.java b/core/src/main/java/hudson/model/HealthReport.java index 5713ad64d7..697f6f375f 100644 --- a/core/src/main/java/hudson/model/HealthReport.java +++ b/core/src/main/java/hudson/model/HealthReport.java @@ -26,6 +26,7 @@ package hudson.model; import com.thoughtworks.xstream.converters.UnmarshallingContext; import hudson.diagnosis.OldDataMonitor; import hudson.util.XStream2; +import jenkins.model.Jenkins; import org.jvnet.localizer.Localizable; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/model/Item.java b/core/src/main/java/hudson/model/Item.java index 54f09b9483..6aa50636c9 100644 --- a/core/src/main/java/hudson/model/Item.java +++ b/core/src/main/java/hudson/model/Item.java @@ -39,7 +39,7 @@ import hudson.security.AccessControlled; *

* Every {@link Item} is hosted in an {@link ItemGroup} called "parent", * and some {@link Item}s are {@link ItemGroup}s. This form a tree - * structure, which is rooted at {@link Jenkins}. + * structure, which is rooted at {@link jenkins.model.Jenkins}. * *

* Unlike file systems, where a file can be moved from one directory @@ -56,7 +56,7 @@ import hudson.security.AccessControlled; *

* {@link Item}s have unique {@link #getName() name}s that distinguish themselves * among their siblings uniquely. The names can be combined by '/' to form an - * item full name, which uniquely identifies an {@link Item} inside the whole {@link Jenkins}. + * item full name, which uniquely identifies an {@link Item} inside the whole {@link jenkins.model.Jenkins}. * * @author Kohsuke Kawaguchi * @see Items @@ -93,11 +93,11 @@ public interface Item extends PersistenceRoot, SearchableModelObject, AccessCont * *

* Full name consists of {@link #getName() name}s of {@link Item}s - * that lead from the root {@link Jenkins} to this {@link Item}, + * that lead from the root {@link jenkins.model.Jenkins} to this {@link Item}, * separated by '/'. This is the unique name that identifies this - * {@link Item} inside the whole {@link Jenkins}. + * {@link Item} inside the whole {@link jenkins.model.Jenkins}. * - * @see Jenkins#getItemByFullName(String,Class) + * @see jenkins.model.Jenkins#getItemByFullName(String,Class) */ String getFullName(); diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java index c0e333b9a7..c211f78abb 100644 --- a/core/src/main/java/hudson/model/ItemGroupMixIn.java +++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java @@ -29,6 +29,7 @@ import hudson.security.AccessControlled; import hudson.util.CopyOnWriteMap; import hudson.util.Function1; import hudson.util.IOUtils; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/ItemVisitor.java b/core/src/main/java/hudson/model/ItemVisitor.java index e63aa02fb2..bfd2bbc64d 100644 --- a/core/src/main/java/hudson/model/ItemVisitor.java +++ b/core/src/main/java/hudson/model/ItemVisitor.java @@ -23,6 +23,8 @@ */ package hudson.model; +import jenkins.model.Jenkins; + /** * Walks the tree structure that consists of {@link ItemGroup} and {@link Item}. * diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java index 51128f725b..6e12b1667b 100644 --- a/core/src/main/java/hudson/model/Items.java +++ b/core/src/main/java/hudson/model/Items.java @@ -32,6 +32,7 @@ import hudson.XmlFile; import hudson.matrix.Axis; import hudson.util.DescriptorList; import hudson.util.XStream2; +import jenkins.model.Jenkins; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/hudson/model/JDK.java b/core/src/main/java/hudson/model/JDK.java index 88dd93d4ab..3809585496 100644 --- a/core/src/main/java/hudson/model/JDK.java +++ b/core/src/main/java/hudson/model/JDK.java @@ -43,6 +43,7 @@ import java.util.List; import java.util.Arrays; import java.util.Collections; +import jenkins.model.Jenkins; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index b1d31e116c..91e7ec4e11 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -75,6 +75,7 @@ import java.util.LinkedList; import javax.servlet.ServletException; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import net.sf.json.JSONException; diff --git a/core/src/main/java/hudson/model/JobParameterDefinition.java b/core/src/main/java/hudson/model/JobParameterDefinition.java index 27077794c9..c79156e51f 100644 --- a/core/src/main/java/hudson/model/JobParameterDefinition.java +++ b/core/src/main/java/hudson/model/JobParameterDefinition.java @@ -23,6 +23,7 @@ */ package hudson.model; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/model/JobProperty.java b/core/src/main/java/hudson/model/JobProperty.java index d219eb8890..7b6454bfe9 100644 --- a/core/src/main/java/hudson/model/JobProperty.java +++ b/core/src/main/java/hudson/model/JobProperty.java @@ -37,6 +37,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/model/JobPropertyDescriptor.java b/core/src/main/java/hudson/model/JobPropertyDescriptor.java index 6f19c76848..a894370fb8 100644 --- a/core/src/main/java/hudson/model/JobPropertyDescriptor.java +++ b/core/src/main/java/hudson/model/JobPropertyDescriptor.java @@ -23,6 +23,7 @@ */ package hudson.model; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.jvnet.tiger_types.Types; diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java index 2faaa191e8..68235cddc2 100644 --- a/core/src/main/java/hudson/model/Label.java +++ b/core/src/main/java/hudson/model/Label.java @@ -36,6 +36,7 @@ import hudson.slaves.NodeProvisioner; import hudson.slaves.Cloud; import hudson.util.QuotedStringTokenizer; import hudson.util.VariableResolver; +import jenkins.model.Jenkins; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/model/LabelFinder.java b/core/src/main/java/hudson/model/LabelFinder.java index 681d1d5371..fec960dcc3 100644 --- a/core/src/main/java/hudson/model/LabelFinder.java +++ b/core/src/main/java/hudson/model/LabelFinder.java @@ -27,6 +27,7 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.labels.LabelAtom; +import jenkins.model.Jenkins; import java.util.Collection; diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java index c1c43b6bb6..993ab1badd 100644 --- a/core/src/main/java/hudson/model/ListView.java +++ b/core/src/main/java/hudson/model/ListView.java @@ -32,6 +32,7 @@ import hudson.util.DescribableList; import hudson.util.FormValidation; import hudson.views.ListViewColumn; import hudson.views.ViewJobFilter; +import jenkins.model.Jenkins; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/LoadStatistics.java b/core/src/main/java/hudson/model/LoadStatistics.java index 534812f5a1..bbf03fd3cf 100644 --- a/core/src/main/java/hudson/model/LoadStatistics.java +++ b/core/src/main/java/hudson/model/LoadStatistics.java @@ -28,6 +28,7 @@ import hudson.model.MultiStageTimeSeries.TimeScale; import hudson.model.MultiStageTimeSeries.TrendChart; import hudson.util.ColorPalette; import hudson.util.NoOverlapCategoryAxis; +import jenkins.model.Jenkins; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; diff --git a/core/src/main/java/hudson/model/ManagementLink.java b/core/src/main/java/hudson/model/ManagementLink.java index 26e25bd212..86f28c7e54 100644 --- a/core/src/main/java/hudson/model/ManagementLink.java +++ b/core/src/main/java/hudson/model/ManagementLink.java @@ -27,6 +27,7 @@ import hudson.ExtensionPoint; import hudson.ExtensionListView; import hudson.Extension; import hudson.ExtensionList; +import jenkins.model.Jenkins; import java.util.List; diff --git a/core/src/main/java/hudson/model/MyView.java b/core/src/main/java/hudson/model/MyView.java index 5accff8156..51075e1447 100644 --- a/core/src/main/java/hudson/model/MyView.java +++ b/core/src/main/java/hudson/model/MyView.java @@ -31,6 +31,7 @@ import java.util.List; import javax.servlet.ServletException; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/model/MyViewsProperty.java b/core/src/main/java/hudson/model/MyViewsProperty.java index 291963a057..47e9a008a7 100644 --- a/core/src/main/java/hudson/model/MyViewsProperty.java +++ b/core/src/main/java/hudson/model/MyViewsProperty.java @@ -44,6 +44,7 @@ import java.util.logging.Logger; import javax.servlet.ServletException; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.acegisecurity.AccessDeniedException; diff --git a/core/src/main/java/hudson/model/Node.java b/core/src/main/java/hudson/model/Node.java index 09ac898cab..61573930ab 100644 --- a/core/src/main/java/hudson/model/Node.java +++ b/core/src/main/java/hudson/model/Node.java @@ -58,6 +58,7 @@ import java.util.Set; import java.util.List; import java.util.logging.Logger; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.BindInterceptor; import org.kohsuke.stapler.Stapler; diff --git a/core/src/main/java/hudson/model/OverallLoadStatistics.java b/core/src/main/java/hudson/model/OverallLoadStatistics.java index 9a2ffff82e..830fea4cfa 100644 --- a/core/src/main/java/hudson/model/OverallLoadStatistics.java +++ b/core/src/main/java/hudson/model/OverallLoadStatistics.java @@ -26,6 +26,7 @@ package hudson.model; import hudson.model.MultiStageTimeSeries.TimeScale; import hudson.model.MultiStageTimeSeries.TrendChart; import hudson.util.ColorPalette; +import jenkins.model.Jenkins; import org.kohsuke.stapler.export.Exported; /** diff --git a/core/src/main/java/hudson/model/PageDecorator.java b/core/src/main/java/hudson/model/PageDecorator.java index 6252f3029c..bb9490f3f0 100644 --- a/core/src/main/java/hudson/model/PageDecorator.java +++ b/core/src/main/java/hudson/model/PageDecorator.java @@ -28,6 +28,7 @@ import hudson.Plugin; import hudson.Extension; import hudson.ExtensionList; import hudson.util.DescriptorList; +import jenkins.model.Jenkins; import java.util.List; diff --git a/core/src/main/java/hudson/model/ParameterDefinition.java b/core/src/main/java/hudson/model/ParameterDefinition.java index 0b1705f027..1923fc9723 100644 --- a/core/src/main/java/hudson/model/ParameterDefinition.java +++ b/core/src/main/java/hudson/model/ParameterDefinition.java @@ -33,6 +33,7 @@ import hudson.util.DescriptorList; import java.io.Serializable; import java.io.IOException; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java index 6525679736..ec07a5e54d 100644 --- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java +++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java @@ -34,6 +34,7 @@ import java.util.AbstractList; import javax.servlet.ServletException; +import jenkins.model.Jenkins; import net.sf.json.JSONArray; import net.sf.json.JSONObject; diff --git a/core/src/main/java/hudson/model/PeriodicWork.java b/core/src/main/java/hudson/model/PeriodicWork.java index 52797bd00f..beb5883cf7 100644 --- a/core/src/main/java/hudson/model/PeriodicWork.java +++ b/core/src/main/java/hudson/model/PeriodicWork.java @@ -28,6 +28,7 @@ import hudson.triggers.Trigger; import hudson.ExtensionPoint; import hudson.Extension; import hudson.ExtensionList; +import jenkins.model.Jenkins; import java.util.logging.Logger; import java.util.Random; diff --git a/core/src/main/java/hudson/model/ProxyView.java b/core/src/main/java/hudson/model/ProxyView.java index 8425b776d8..3c3c3c3f63 100644 --- a/core/src/main/java/hudson/model/ProxyView.java +++ b/core/src/main/java/hudson/model/ProxyView.java @@ -30,6 +30,8 @@ import hudson.util.FormValidation; import java.io.IOException; import java.util.Collection; import javax.servlet.ServletException; + +import jenkins.model.Jenkins; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.Stapler; diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 2c7f861631..57562717a6 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -92,6 +92,7 @@ import java.util.logging.Logger; import javax.management.timer.Timer; import javax.servlet.ServletException; +import jenkins.model.Jenkins; import org.acegisecurity.AccessDeniedException; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponses; diff --git a/core/src/main/java/hudson/model/RSS.java b/core/src/main/java/hudson/model/RSS.java index e637678ca7..553a21c85a 100644 --- a/core/src/main/java/hudson/model/RSS.java +++ b/core/src/main/java/hudson/model/RSS.java @@ -24,6 +24,7 @@ package hudson.model; import hudson.FeedAdapter; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/RestartListener.java b/core/src/main/java/hudson/model/RestartListener.java index 09b826e50f..0873413e38 100644 --- a/core/src/main/java/hudson/model/RestartListener.java +++ b/core/src/main/java/hudson/model/RestartListener.java @@ -3,6 +3,7 @@ package hudson.model; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; +import jenkins.model.Jenkins; import java.io.IOException; diff --git a/core/src/main/java/hudson/model/RootAction.java b/core/src/main/java/hudson/model/RootAction.java index 51b229772f..9806d155d8 100644 --- a/core/src/main/java/hudson/model/RootAction.java +++ b/core/src/main/java/hudson/model/RootAction.java @@ -27,11 +27,11 @@ import hudson.ExtensionPoint; import hudson.Extension; /** - * Marker interface for actions that are added to {@link Jenkins}. + * Marker interface for actions that are added to {@link jenkins.model.Jenkins}. * *

* Extend from this interface and put {@link Extension} on your subtype - * to have them auto-registered to {@link Jenkins}. + * to have them auto-registered to {@link jenkins.model.Jenkins}. * * @author Kohsuke Kawaguchi * @since 1.311 diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index dfc17fc3be..27e7838fbd 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -43,7 +43,7 @@ import hudson.matrix.MatrixRun; import hudson.model.Descriptor.FormException; import hudson.model.listeners.RunListener; import hudson.model.listeners.SaveableListener; -import hudson.model.Jenkins.MasterComputer; +import jenkins.model.Jenkins.MasterComputer; import hudson.search.SearchIndexBuilder; import hudson.security.ACL; import hudson.security.AccessControlled; @@ -95,6 +95,7 @@ import java.util.zip.GZIPInputStream; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.apache.commons.io.input.NullInputStream; import org.apache.commons.io.IOUtils; diff --git a/core/src/main/java/hudson/model/RunParameterDefinition.java b/core/src/main/java/hudson/model/RunParameterDefinition.java index a67aa5362a..fc38853ca7 100644 --- a/core/src/main/java/hudson/model/RunParameterDefinition.java +++ b/core/src/main/java/hudson/model/RunParameterDefinition.java @@ -23,6 +23,7 @@ */ package hudson.model; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/model/RunParameterValue.java b/core/src/main/java/hudson/model/RunParameterValue.java index 183395728a..4627b04ba0 100644 --- a/core/src/main/java/hudson/model/RunParameterValue.java +++ b/core/src/main/java/hudson/model/RunParameterValue.java @@ -26,6 +26,7 @@ package hudson.model; import java.util.Locale; import hudson.EnvVars; +import jenkins.model.Jenkins; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.export.Exported; diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java index 30ec70b0ef..77f4a30487 100644 --- a/core/src/main/java/hudson/model/Slave.java +++ b/core/src/main/java/hudson/model/Slave.java @@ -57,6 +57,7 @@ import java.util.Set; import javax.servlet.ServletException; +import jenkins.model.Jenkins; import org.apache.commons.io.IOUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.HttpResponse; diff --git a/core/src/main/java/hudson/model/StockStatusIcon.java b/core/src/main/java/hudson/model/StockStatusIcon.java index 3a7df44a53..a10173e601 100644 --- a/core/src/main/java/hudson/model/StockStatusIcon.java +++ b/core/src/main/java/hudson/model/StockStatusIcon.java @@ -1,5 +1,6 @@ package hudson.model; +import jenkins.model.Jenkins; import org.jvnet.localizer.LocaleProvider; import org.jvnet.localizer.Localizable; import org.kohsuke.stapler.Stapler; diff --git a/core/src/main/java/hudson/model/TopLevelItem.java b/core/src/main/java/hudson/model/TopLevelItem.java index 82a1007c15..63cb2a2b0d 100644 --- a/core/src/main/java/hudson/model/TopLevelItem.java +++ b/core/src/main/java/hudson/model/TopLevelItem.java @@ -28,7 +28,7 @@ import hudson.ExtensionPoint; import hudson.matrix.MatrixConfiguration; /** - * {@link Item} that can be directly displayed under {@link Jenkins} or other containers. + * {@link Item} that can be directly displayed under {@link jenkins.model.Jenkins} or other containers. * Ones that don't need to be under specific parent (say, unlike {@link MatrixConfiguration}), * and thus can be freely moved, copied, etc. * diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java index f622d7d76d..ec8a2aab9c 100644 --- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java +++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java @@ -24,6 +24,7 @@ package hudson.model; import hudson.ExtensionList; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; /** diff --git a/core/src/main/java/hudson/model/TransientComputerActionFactory.java b/core/src/main/java/hudson/model/TransientComputerActionFactory.java index be823cfbe5..0c9699cf3d 100644 --- a/core/src/main/java/hudson/model/TransientComputerActionFactory.java +++ b/core/src/main/java/hudson/model/TransientComputerActionFactory.java @@ -25,6 +25,7 @@ package hudson.model; import hudson.ExtensionList; import hudson.ExtensionPoint; +import jenkins.model.Jenkins; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/hudson/model/TransientProjectActionFactory.java b/core/src/main/java/hudson/model/TransientProjectActionFactory.java index 12223b39fa..9588d83fe9 100644 --- a/core/src/main/java/hudson/model/TransientProjectActionFactory.java +++ b/core/src/main/java/hudson/model/TransientProjectActionFactory.java @@ -27,6 +27,7 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.tasks.BuildStep; +import jenkins.model.Jenkins; import java.util.Collection; diff --git a/core/src/main/java/hudson/model/TransientViewActionFactory.java b/core/src/main/java/hudson/model/TransientViewActionFactory.java index 1e401b1436..e6f9f75cda 100644 --- a/core/src/main/java/hudson/model/TransientViewActionFactory.java +++ b/core/src/main/java/hudson/model/TransientViewActionFactory.java @@ -2,6 +2,7 @@ package hudson.model; import hudson.ExtensionList; import hudson.ExtensionPoint; +import jenkins.model.Jenkins; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/hudson/model/TreeView.java b/core/src/main/java/hudson/model/TreeView.java index 05421b3e3f..3465b14640 100644 --- a/core/src/main/java/hudson/model/TreeView.java +++ b/core/src/main/java/hudson/model/TreeView.java @@ -28,6 +28,7 @@ import hudson.util.CaseInsensitiveComparator; import hudson.Indenter; import hudson.Extension; import hudson.views.ViewsTabBar; +import jenkins.model.Jenkins; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/UnprotectedRootAction.java b/core/src/main/java/hudson/model/UnprotectedRootAction.java index 82e345638e..bb5a7b6b5f 100644 --- a/core/src/main/java/hudson/model/UnprotectedRootAction.java +++ b/core/src/main/java/hudson/model/UnprotectedRootAction.java @@ -26,7 +26,7 @@ package hudson.model; import hudson.ExtensionPoint; /** - * {@link RootAction}s that are accessible to requests that do not have the READ permission on {@link Jenkins}. + * {@link RootAction}s that are accessible to requests that do not have the READ permission on {@link jenkins.model.Jenkins}. * * @author Kohsuke Kawaguchi * @since 1.398 diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java index 1da59ec14f..da30684d2e 100644 --- a/core/src/main/java/hudson/model/UpdateCenter.java +++ b/core/src/main/java/hudson/model/UpdateCenter.java @@ -44,6 +44,7 @@ import hudson.util.DaemonThreadFactory; import hudson.util.IOException2; import hudson.util.PersistedList; import hudson.util.XStream2; +import jenkins.model.Jenkins; import org.acegisecurity.Authentication; import org.apache.commons.io.input.CountingInputStream; import org.apache.commons.io.output.NullOutputStream; diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index e5b38fb372..c413e285ee 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -33,6 +33,8 @@ import hudson.util.IOUtils; import hudson.util.TextFile; import hudson.util.VersionNumber; import static hudson.util.TimeUnit2.DAYS; + +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java index f2e171a67e..fc3df3f4df 100644 --- a/core/src/main/java/hudson/model/UsageStatistics.java +++ b/core/src/main/java/hudson/model/UsageStatistics.java @@ -30,6 +30,8 @@ import hudson.Extension; import hudson.node_monitors.ArchitectureMonitor.DescriptorImpl; import hudson.util.Secret; import static hudson.util.TimeUnit2.DAYS; + +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.apache.commons.io.output.ByteArrayOutputStream; diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index 5133b77da5..4ce1fb42f6 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -38,6 +38,7 @@ import hudson.security.AccessControlled; import hudson.security.Permission; import hudson.util.RunList; import hudson.util.XStream2; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.acegisecurity.Authentication; diff --git a/core/src/main/java/hudson/model/UserProperty.java b/core/src/main/java/hudson/model/UserProperty.java index eeaedf85db..91d82638b9 100644 --- a/core/src/main/java/hudson/model/UserProperty.java +++ b/core/src/main/java/hudson/model/UserProperty.java @@ -27,6 +27,7 @@ import hudson.ExtensionPoint; import hudson.Plugin; import hudson.DescriptorExtensionList; import hudson.model.Descriptor.FormException; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index 080065a8af..3bdf5e3f12 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -41,6 +41,7 @@ import hudson.util.DescribableList; import hudson.util.DescriptorList; import hudson.util.RunList; import hudson.widgets.Widget; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -61,7 +62,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import static hudson.model.Jenkins.*; +import static jenkins.model.Jenkins.*; /** * Encapsulates the rendering of the list of {@link TopLevelItem}s diff --git a/core/src/main/java/hudson/model/ViewDescriptor.java b/core/src/main/java/hudson/model/ViewDescriptor.java index cd1df05e8a..68425b02ef 100644 --- a/core/src/main/java/hudson/model/ViewDescriptor.java +++ b/core/src/main/java/hudson/model/ViewDescriptor.java @@ -23,6 +23,7 @@ */ package hudson.model; +import jenkins.model.Jenkins; import org.kohsuke.stapler.QueryParameter; /** diff --git a/core/src/main/java/hudson/model/ViewGroup.java b/core/src/main/java/hudson/model/ViewGroup.java index 952311c6e8..db6047e3ec 100644 --- a/core/src/main/java/hudson/model/ViewGroup.java +++ b/core/src/main/java/hudson/model/ViewGroup.java @@ -76,7 +76,7 @@ public interface ViewGroup extends Saveable, ModelObject, AccessControlled { * *

* It is the caller's responsibility to ensure that the new name is a - * {@linkplain Jenkins#checkGoodName(String) legal view name}. + * {@linkplain jenkins.model.Jenkins#checkGoodName(String) legal view name}. */ void onViewRenamed(View view, String oldName, String newName); diff --git a/core/src/main/java/hudson/model/ViewJob.java b/core/src/main/java/hudson/model/ViewJob.java index 5659dea360..c113665b57 100644 --- a/core/src/main/java/hudson/model/ViewJob.java +++ b/core/src/main/java/hudson/model/ViewJob.java @@ -23,6 +23,7 @@ */ package hudson.model; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/model/ViewProperty.java b/core/src/main/java/hudson/model/ViewProperty.java index cc5f458d62..188c7d31a5 100644 --- a/core/src/main/java/hudson/model/ViewProperty.java +++ b/core/src/main/java/hudson/model/ViewProperty.java @@ -25,6 +25,7 @@ package hudson.model; import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java index c879dd832a..77338766f2 100644 --- a/core/src/main/java/hudson/model/WorkspaceCleanupThread.java +++ b/core/src/main/java/hudson/model/WorkspaceCleanupThread.java @@ -26,6 +26,7 @@ package hudson.model; import hudson.FilePath; import hudson.Util; import hudson.Extension; +import jenkins.model.Jenkins; import java.io.File; import java.io.FileFilter; diff --git a/core/src/main/java/hudson/model/labels/LabelAtom.java b/core/src/main/java/hudson/model/labels/LabelAtom.java index edc632ce65..5c85c17618 100644 --- a/core/src/main/java/hudson/model/labels/LabelAtom.java +++ b/core/src/main/java/hudson/model/labels/LabelAtom.java @@ -33,7 +33,7 @@ import hudson.XmlFile; import hudson.model.Action; import hudson.model.Descriptor.FormException; import hudson.model.Failure; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Label; import hudson.model.Saveable; import hudson.model.listeners.SaveableListener; diff --git a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java index 5e03705018..e0dfd53259 100644 --- a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java +++ b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java @@ -27,7 +27,7 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Action; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.kohsuke.stapler.export.ExportedBean; import java.util.Collection; diff --git a/core/src/main/java/hudson/model/listeners/ItemListener.java b/core/src/main/java/hudson/model/listeners/ItemListener.java index 8f45090335..694cbc241e 100644 --- a/core/src/main/java/hudson/model/listeners/ItemListener.java +++ b/core/src/main/java/hudson/model/listeners/ItemListener.java @@ -26,7 +26,7 @@ package hudson.model.listeners; import hudson.ExtensionPoint; import hudson.ExtensionList; import hudson.Extension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; /** @@ -37,7 +37,7 @@ import hudson.model.Item; */ public class ItemListener implements ExtensionPoint { /** - * Called after a new job is created and added to {@link hudson.model.Jenkins}, + * Called after a new job is created and added to {@link jenkins.model.Jenkins}, * before the initial configuration page is provided. *

* This is useful for changing the default initial configuration of newly created jobs. @@ -66,7 +66,7 @@ public class ItemListener implements ExtensionPoint { } /** - * Called after all the jobs are loaded from disk into {@link hudson.model.Jenkins} + * Called after all the jobs are loaded from disk into {@link jenkins.model.Jenkins} * object. */ public void onLoaded() { diff --git a/core/src/main/java/hudson/model/listeners/RunListener.java b/core/src/main/java/hudson/model/listeners/RunListener.java index 58bc3c50f6..fedebccc95 100644 --- a/core/src/main/java/hudson/model/listeners/RunListener.java +++ b/core/src/main/java/hudson/model/listeners/RunListener.java @@ -35,7 +35,7 @@ import hudson.model.Environment; import hudson.model.JobProperty; import hudson.model.Run; import hudson.model.TaskListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.scm.SCM; import hudson.tasks.BuildWrapper; import hudson.util.CopyOnWriteList; diff --git a/core/src/main/java/hudson/model/listeners/SCMListener.java b/core/src/main/java/hudson/model/listeners/SCMListener.java index 747eb0ef67..f50a3bdfa6 100644 --- a/core/src/main/java/hudson/model/listeners/SCMListener.java +++ b/core/src/main/java/hudson/model/listeners/SCMListener.java @@ -26,7 +26,7 @@ package hudson.model.listeners; import hudson.model.AbstractBuild; import hudson.model.Action; import hudson.model.BuildListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.scm.ChangeLogSet; import hudson.scm.SCM; import hudson.ExtensionPoint; @@ -41,7 +41,7 @@ import hudson.ExtensionPoint; * Once instanciated, use the {@link #register()} method to start receiving events. * * @author Kohsuke Kawaguchi - * @see hudson.model.Jenkins#getSCMListeners() + * @see jenkins.model.Jenkins#getSCMListeners() * @since 1.70 */ public abstract class SCMListener implements ExtensionPoint { diff --git a/core/src/main/java/hudson/model/listeners/SaveableListener.java b/core/src/main/java/hudson/model/listeners/SaveableListener.java index 26c5202957..0716b053ef 100644 --- a/core/src/main/java/hudson/model/listeners/SaveableListener.java +++ b/core/src/main/java/hudson/model/listeners/SaveableListener.java @@ -28,7 +28,7 @@ import hudson.ExtensionPoint; import hudson.Extension; import hudson.ExtensionList; import hudson.XmlFile; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Saveable; /** diff --git a/core/src/main/java/hudson/model/queue/BackFiller.java b/core/src/main/java/hudson/model/queue/BackFiller.java index 13bf652031..0eeea61670 100644 --- a/core/src/main/java/hudson/model/queue/BackFiller.java +++ b/core/src/main/java/hudson/model/queue/BackFiller.java @@ -4,7 +4,7 @@ import com.google.common.collect.Iterables; import hudson.Extension; import hudson.model.Computer; import hudson.model.Executor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.InvisibleAction; import hudson.model.Queue.BuildableItem; import hudson.model.queue.MappingWorksheet.ExecutorChunk; diff --git a/core/src/main/java/hudson/model/queue/FutureImpl.java b/core/src/main/java/hudson/model/queue/FutureImpl.java index 9fe1314480..a9704d125e 100644 --- a/core/src/main/java/hudson/model/queue/FutureImpl.java +++ b/core/src/main/java/hudson/model/queue/FutureImpl.java @@ -24,7 +24,7 @@ package hudson.model.queue; import hudson.model.Executor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Queue; import hudson.model.Queue.Executable; import hudson.model.Queue.Task; diff --git a/core/src/main/java/hudson/model/queue/LoadPredictor.java b/core/src/main/java/hudson/model/queue/LoadPredictor.java index d4f5271c56..cb61d81ab3 100644 --- a/core/src/main/java/hudson/model/queue/LoadPredictor.java +++ b/core/src/main/java/hudson/model/queue/LoadPredictor.java @@ -28,7 +28,7 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Computer; import hudson.model.Executor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/hudson/model/queue/QueueSorter.java b/core/src/main/java/hudson/model/queue/QueueSorter.java index 5ce68b4a67..d13ec8d4e4 100644 --- a/core/src/main/java/hudson/model/queue/QueueSorter.java +++ b/core/src/main/java/hudson/model/queue/QueueSorter.java @@ -3,7 +3,7 @@ package hudson.model.queue; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.init.Initializer; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.LoadBalancer; import hudson.model.Queue; import hudson.model.Queue.BuildableItem; diff --git a/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java b/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java index fe92686a94..31c9f766ea 100644 --- a/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java +++ b/core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java @@ -27,7 +27,7 @@ package hudson.model.queue; import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.Queue; import hudson.model.Queue.BuildableItem; diff --git a/core/src/main/java/hudson/model/queue/SubTaskContributor.java b/core/src/main/java/hudson/model/queue/SubTaskContributor.java index 7d195ef3b7..e1d639e32c 100644 --- a/core/src/main/java/hudson/model/queue/SubTaskContributor.java +++ b/core/src/main/java/hudson/model/queue/SubTaskContributor.java @@ -27,7 +27,7 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.AbstractProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java index f36d1f2841..3e7e2daa00 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java @@ -25,7 +25,7 @@ package hudson.node_monitors; import hudson.model.Computer; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.ComputerSet; import hudson.model.AdministrativeMonitor; import hudson.triggers.Trigger; diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java index 024e2a2e51..f2d49c4076 100644 --- a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java @@ -27,7 +27,7 @@ import hudson.Extension; import hudson.FilePath; import hudson.Functions; import hudson.model.Computer; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitor.java b/core/src/main/java/hudson/node_monitors/NodeMonitor.java index 1a54854ccd..7adc88c2bc 100644 --- a/core/src/main/java/hudson/node_monitors/NodeMonitor.java +++ b/core/src/main/java/hudson/node_monitors/NodeMonitor.java @@ -31,7 +31,7 @@ import hudson.model.Computer; import hudson.model.ComputerSet; import hudson.model.Describable; import hudson.model.Node; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Descriptor; import hudson.util.DescriptorList; diff --git a/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java index 8b48d1b2e6..668c336e60 100644 --- a/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/SwapSpaceMonitor.java @@ -26,7 +26,7 @@ package hudson.node_monitors; import hudson.Util; import hudson.Extension; import hudson.model.Computer; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.Callable; import net.sf.json.JSONObject; import org.jvnet.hudson.MemoryMonitor; diff --git a/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java b/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java index 31f5eb1783..441a8c0841 100644 --- a/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java @@ -28,7 +28,7 @@ import hudson.FilePath; import hudson.FilePath.FileCallable; import hudson.Functions; import hudson.model.Computer; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace; import hudson.remoting.VirtualChannel; import org.jvnet.animal_sniffer.IgnoreJRERequirement; diff --git a/core/src/main/java/hudson/os/solaris/ZFSInstaller.java b/core/src/main/java/hudson/os/solaris/ZFSInstaller.java index 3fbcfcc1ab..271823efda 100644 --- a/core/src/main/java/hudson/os/solaris/ZFSInstaller.java +++ b/core/src/main/java/hudson/os/solaris/ZFSInstaller.java @@ -30,13 +30,14 @@ import hudson.Util; import hudson.Extension; import hudson.os.SU; import hudson.model.AdministrativeMonitor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.remoting.Callable; import hudson.util.ForkOutputStream; import hudson.util.HudsonIsRestarting; import hudson.util.StreamTaskListener; import static hudson.util.jna.GNUCLibrary.*; + import org.apache.commons.io.output.ByteArrayOutputStream; import org.jvnet.libpam.impl.CLibrary.passwd; import org.jvnet.solaris.libzfs.ACLBuilder; diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java index a09089179d..cc1f2daea6 100644 --- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java +++ b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceConnector.java @@ -3,7 +3,7 @@ package hudson.os.windows; import hudson.Extension; import hudson.model.Computer; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.slaves.ComputerConnector; import hudson.slaves.ComputerConnectorDescriptor; diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java index 0fc473f0bb..185697af50 100644 --- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java +++ b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java @@ -27,7 +27,7 @@ import hudson.Extension; import hudson.lifecycle.WindowsSlaveInstaller; import hudson.model.Computer; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.remoting.Channel; import hudson.remoting.Channel.Listener; diff --git a/core/src/main/java/hudson/scm/AutoBrowserHolder.java b/core/src/main/java/hudson/scm/AutoBrowserHolder.java index 959a5c6e24..de2cdf349e 100644 --- a/core/src/main/java/hudson/scm/AutoBrowserHolder.java +++ b/core/src/main/java/hudson/scm/AutoBrowserHolder.java @@ -24,7 +24,7 @@ package hudson.scm; import hudson.model.AbstractProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; /** * Maintains the automatically inferred {@link RepositoryBrowser} instance. diff --git a/core/src/main/java/hudson/scm/ChangeLogAnnotator.java b/core/src/main/java/hudson/scm/ChangeLogAnnotator.java index ca0f04caa9..b32ec124f5 100644 --- a/core/src/main/java/hudson/scm/ChangeLogAnnotator.java +++ b/core/src/main/java/hudson/scm/ChangeLogAnnotator.java @@ -31,7 +31,7 @@ import hudson.ExtensionList; import hudson.util.CopyOnWriteList; import hudson.scm.ChangeLogSet.Entry; import hudson.model.AbstractBuild; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.util.logging.Logger; diff --git a/core/src/main/java/hudson/scm/RepositoryBrowser.java b/core/src/main/java/hudson/scm/RepositoryBrowser.java index 16b808f2be..a4719a3090 100644 --- a/core/src/main/java/hudson/scm/RepositoryBrowser.java +++ b/core/src/main/java/hudson/scm/RepositoryBrowser.java @@ -28,12 +28,13 @@ import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.io.IOException; import java.io.Serializable; import java.net.URL; import java.net.MalformedURLException; + import org.kohsuke.stapler.export.ExportedBean; /** diff --git a/core/src/main/java/hudson/scm/SCM.java b/core/src/main/java/hudson/scm/SCM.java index 9054673e7d..87c800ff06 100644 --- a/core/src/main/java/hudson/scm/SCM.java +++ b/core/src/main/java/hudson/scm/SCM.java @@ -39,7 +39,7 @@ import hudson.model.Describable; import hudson.model.TaskListener; import hudson.model.Node; import hudson.model.WorkspaceCleanupThread; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Descriptor; import hudson.model.Api; import hudson.model.Action; diff --git a/core/src/main/java/hudson/security/ACL.java b/core/src/main/java/hudson/security/ACL.java index f5255287ad..56fa04c626 100644 --- a/core/src/main/java/hudson/security/ACL.java +++ b/core/src/main/java/hudson/security/ACL.java @@ -23,12 +23,12 @@ */ package hudson.security; +import jenkins.model.Jenkins; import org.acegisecurity.AccessDeniedException; import org.acegisecurity.Authentication; import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.acegisecurity.acls.sid.PrincipalSid; import org.acegisecurity.acls.sid.Sid; -import hudson.model.Jenkins; import hudson.model.Executor; /** diff --git a/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java b/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java index bf5f363293..b830ed9bea 100644 --- a/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java +++ b/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java @@ -3,7 +3,7 @@ package hudson.security; import groovy.lang.Binding; import hudson.FilePath; import hudson.cli.CLICommand; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.Callable; import hudson.tasks.MailAddressResolver; import hudson.util.spring.BeanBuilder; diff --git a/core/src/main/java/hudson/security/AccessDeniedHandlerImpl.java b/core/src/main/java/hudson/security/AccessDeniedHandlerImpl.java index e9a841f74a..f14255af87 100644 --- a/core/src/main/java/hudson/security/AccessDeniedHandlerImpl.java +++ b/core/src/main/java/hudson/security/AccessDeniedHandlerImpl.java @@ -23,7 +23,7 @@ */ package hudson.security; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.acegisecurity.AccessDeniedException; import org.acegisecurity.ui.AccessDeniedHandler; import org.kohsuke.stapler.Stapler; diff --git a/core/src/main/java/hudson/security/AuthorizationMatrixProperty.java b/core/src/main/java/hudson/security/AuthorizationMatrixProperty.java index 44a26021e3..3a153ce467 100644 --- a/core/src/main/java/hudson/security/AuthorizationMatrixProperty.java +++ b/core/src/main/java/hudson/security/AuthorizationMatrixProperty.java @@ -29,7 +29,7 @@ import hudson.model.Item; import hudson.model.Job; import hudson.model.JobProperty; import hudson.model.JobPropertyDescriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Run; import hudson.Extension; import hudson.util.FormValidation; diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java index bcb403df0f..2ff8ddff53 100644 --- a/core/src/main/java/hudson/security/AuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java @@ -34,6 +34,7 @@ import java.io.Serializable; import java.util.Collection; import java.util.Collections; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.acegisecurity.Authentication; @@ -44,7 +45,7 @@ import org.kohsuke.stapler.StaplerRequest; * *

Persistence

*

- * This object will be persisted along with {@link hudson.model.Jenkins} object. + * This object will be persisted along with {@link jenkins.model.Jenkins} object. * Hudson by itself won't put the ACL returned from {@link #getRootACL()} into the serialized object graph, * so if that object contains state and needs to be persisted, it's the responsibility of * {@link AuthorizationStrategy} to do so (by keeping them in an instance field.) @@ -53,7 +54,7 @@ import org.kohsuke.stapler.StaplerRequest; *

* The corresponding {@link Describable} instance will be asked to create a new {@link AuthorizationStrategy} * every time the system configuration is updated. Implementations that keep more state in ACL beyond - * the system configuration should use {@link hudson.model.Jenkins#getAuthorizationStrategy()} to talk to the current + * the system configuration should use {@link jenkins.model.Jenkins#getAuthorizationStrategy()} to talk to the current * instance to carry over the state. * * @author Kohsuke Kawaguchi diff --git a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java b/core/src/main/java/hudson/security/BasicAuthenticationFilter.java index d3d89362d9..cbe4100da5 100644 --- a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java +++ b/core/src/main/java/hudson/security/BasicAuthenticationFilter.java @@ -23,7 +23,7 @@ */ package hudson.security; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.Scrambler; import org.acegisecurity.context.SecurityContextHolder; import org.kohsuke.stapler.StaplerRequest; @@ -61,7 +61,7 @@ import java.net.URLEncoder; * This causes the container to perform authentication, but there's no way * to find out whether the user has been successfully authenticated or not. * So to find this out, we then redirect the user to - * {@link hudson.model.Jenkins#doSecured(StaplerRequest, StaplerResponse) /secured/... page}. + * {@link jenkins.model.Jenkins#doSecured(StaplerRequest, StaplerResponse) /secured/... page}. * *

* The handler of the above URL checks if the user is authenticated, diff --git a/core/src/main/java/hudson/security/CliAuthenticator.java b/core/src/main/java/hudson/security/CliAuthenticator.java index 3266639e71..b7ca6ddf51 100644 --- a/core/src/main/java/hudson/security/CliAuthenticator.java +++ b/core/src/main/java/hudson/security/CliAuthenticator.java @@ -66,7 +66,7 @@ import java.io.IOException; *

* Many commands do not require any authentication (for example, the "help" command), and still more commands * can be run successfully with the anonymous permission. So the authenticator should normally allow unauthenticated - * CLI command invocations. For those, return {@link hudson.model.Jenkins#ANONYMOUS} from the {@link #authenticate()} method. + * CLI command invocations. For those, return {@link jenkins.model.Jenkins#ANONYMOUS} from the {@link #authenticate()} method. * *

Example

*

diff --git a/core/src/main/java/hudson/security/ContainerAuthentication.java b/core/src/main/java/hudson/security/ContainerAuthentication.java index 17f3a4e9df..f990ad333c 100644 --- a/core/src/main/java/hudson/security/ContainerAuthentication.java +++ b/core/src/main/java/hudson/security/ContainerAuthentication.java @@ -23,6 +23,7 @@ */ package hudson.security; +import jenkins.model.Jenkins; import org.acegisecurity.Authentication; import org.acegisecurity.GrantedAuthority; import org.acegisecurity.GrantedAuthorityImpl; @@ -33,8 +34,6 @@ import java.security.Principal; import java.util.List; import java.util.ArrayList; -import hudson.model.Jenkins; - /** * {@link Authentication} implementation for {@link Principal} * given through {@link HttpServletRequest}. diff --git a/core/src/main/java/hudson/security/FederatedLoginService.java b/core/src/main/java/hudson/security/FederatedLoginService.java index 0e5ae9bd44..0e00f8b9a2 100644 --- a/core/src/main/java/hudson/security/FederatedLoginService.java +++ b/core/src/main/java/hudson/security/FederatedLoginService.java @@ -25,7 +25,7 @@ package hudson.security; import hudson.ExtensionList; import hudson.ExtensionPoint; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.User; import hudson.model.UserProperty; import org.acegisecurity.context.SecurityContextHolder; @@ -84,7 +84,7 @@ import java.io.Serializable; * *

URL Binding

*

- * Each {@link FederatedLoginService} is exposed to the URL space via {@link hudson.model.Jenkins#getFederatedLoginService(String)}. + * Each {@link FederatedLoginService} is exposed to the URL space via {@link jenkins.model.Jenkins#getFederatedLoginService(String)}. * So for example if your {@linkplain #getUrlName() url name} is "openid", this object gets * "/federatedLoginService/openid" as the URL. * diff --git a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java index bebd3fad98..59e163505a 100644 --- a/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/FullControlOnceLoggedInAuthorizationStrategy.java @@ -24,7 +24,7 @@ package hudson.security; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.Extension; import java.util.Collections; diff --git a/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java b/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java index d2bcc5ae2a..599d513d26 100644 --- a/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java @@ -30,7 +30,7 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import hudson.diagnosis.OldDataMonitor; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.util.FormValidation; import hudson.util.FormValidation.Kind; diff --git a/core/src/main/java/hudson/security/HudsonFilter.java b/core/src/main/java/hudson/security/HudsonFilter.java index 9e4e8fffd6..5bc102148e 100644 --- a/core/src/main/java/hudson/security/HudsonFilter.java +++ b/core/src/main/java/hudson/security/HudsonFilter.java @@ -23,7 +23,7 @@ */ package hudson.security; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.io.IOException; import java.util.logging.Logger; diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java index 1a0b91d2d7..aea72440ac 100644 --- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java +++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java @@ -28,7 +28,7 @@ import hudson.Extension; import hudson.Util; import hudson.diagnosis.OldDataMonitor; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.ManagementLink; import hudson.model.ModelObject; import hudson.model.User; @@ -80,7 +80,7 @@ import java.util.List; * *

* Implements {@link AccessControlled} to satisfy view rendering, but in reality the access control - * is done against the {@link hudson.model.Jenkins} object. + * is done against the {@link jenkins.model.Jenkins} object. * * @author Kohsuke Kawaguchi */ diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java index 2eeb8fe743..e76f43c57f 100644 --- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java +++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java @@ -29,7 +29,7 @@ import static hudson.Util.fixNull; import static hudson.Util.fixEmptyAndTrim; import static hudson.Util.fixEmpty; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.User; import hudson.tasks.MailAddressResolver; import hudson.util.FormValidation; diff --git a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java index ca8bc96960..16c75d15ae 100644 --- a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java @@ -24,7 +24,7 @@ package hudson.security; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.Extension; import org.acegisecurity.acls.sid.GrantedAuthoritySid; import org.kohsuke.stapler.StaplerRequest; diff --git a/core/src/main/java/hudson/security/PAMSecurityRealm.java b/core/src/main/java/hudson/security/PAMSecurityRealm.java index 79675cf8dd..aab7e1be9b 100644 --- a/core/src/main/java/hudson/security/PAMSecurityRealm.java +++ b/core/src/main/java/hudson/security/PAMSecurityRealm.java @@ -26,7 +26,7 @@ package hudson.security; import groovy.lang.Binding; import hudson.Functions; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.Util; import hudson.Extension; import hudson.os.PosixAPI; diff --git a/core/src/main/java/hudson/security/Permission.java b/core/src/main/java/hudson/security/Permission.java index 160236a628..ff330635ee 100644 --- a/core/src/main/java/hudson/security/Permission.java +++ b/core/src/main/java/hudson/security/Permission.java @@ -23,7 +23,7 @@ */ package hudson.security; -import hudson.model.*; +import jenkins.model.Jenkins; import net.sf.json.util.JSONUtils; import java.util.Collections; @@ -237,10 +237,10 @@ public final class Permission { // /** - * {@link PermissionGroup} for {@link hudson.model.Jenkins}. + * {@link PermissionGroup} for {@link jenkins.model.Jenkins}. * * @deprecated since 2009-01-23. - * Access {@link hudson.model.Jenkins#PERMISSIONS} instead. + * Access {@link jenkins.model.Jenkins#PERMISSIONS} instead. */ public static final PermissionGroup HUDSON_PERMISSIONS = new PermissionGroup(Jenkins.class, hudson.model.Messages._Hudson_Permissions_Title()); /** @@ -250,7 +250,7 @@ public final class Permission { * All permissions are eventually {@linkplain Permission#impliedBy implied by} this permission. * * @deprecated since 2009-01-23. - * Access {@link hudson.model.Jenkins#ADMINISTER} instead. + * Access {@link jenkins.model.Jenkins#ADMINISTER} instead. */ public static final Permission HUDSON_ADMINISTER = new Permission(HUDSON_PERMISSIONS,"Administer", hudson.model.Messages._Hudson_AdministerPermission_Description(),null); @@ -269,7 +269,7 @@ public final class Permission { * any more, so deprecated. * * @deprecated since 2009-01-23. - * Use {@link hudson.model.Jenkins#ADMINISTER}. + * Use {@link jenkins.model.Jenkins#ADMINISTER}. */ public static final Permission FULL_CONTROL = new Permission(GROUP,"FullControl",HUDSON_ADMINISTER); diff --git a/core/src/main/java/hudson/security/PermissionGroup.java b/core/src/main/java/hudson/security/PermissionGroup.java index 014eab6405..37dee854e6 100644 --- a/core/src/main/java/hudson/security/PermissionGroup.java +++ b/core/src/main/java/hudson/security/PermissionGroup.java @@ -24,7 +24,7 @@ package hudson.security; import hudson.CopyOnWrite; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.util.List; import java.util.Collections; diff --git a/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java b/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java index af40542864..aeaf578f71 100644 --- a/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/ProjectMatrixAuthorizationStrategy.java @@ -25,7 +25,7 @@ package hudson.security; import hudson.model.AbstractItem; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.Job; diff --git a/core/src/main/java/hudson/security/RememberMeServicesProxy.java b/core/src/main/java/hudson/security/RememberMeServicesProxy.java index c7cb44331a..78d1284778 100644 --- a/core/src/main/java/hudson/security/RememberMeServicesProxy.java +++ b/core/src/main/java/hudson/security/RememberMeServicesProxy.java @@ -33,8 +33,8 @@ import javax.servlet.http.HttpServletResponse; * {@link RememberMeServices} proxy. * *

- * In Hudson, we need {@link hudson.model.Jenkins} instance to perform remember-me service, - * because it relies on {@link hudson.model.Jenkins#getSecretKey()}. However, security + * In Hudson, we need {@link jenkins.model.Jenkins} instance to perform remember-me service, + * because it relies on {@link jenkins.model.Jenkins#getSecretKey()}. However, security * filters can be initialized before Hudson is initialized. * (See #1210 for example.) * diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java index f459e9d2ff..50af858006 100644 --- a/core/src/main/java/hudson/security/SecurityRealm.java +++ b/core/src/main/java/hudson/security/SecurityRealm.java @@ -33,7 +33,7 @@ import hudson.Extension; import hudson.cli.CLICommand; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.security.FederatedLoginService.FederatedIdentity; import hudson.util.DescriptorList; import hudson.util.PluginServletFilter; @@ -74,7 +74,7 @@ import java.util.logging.Logger; *

* If additional views/URLs need to be exposed, * an active {@link SecurityRealm} is bound to CONTEXT_ROOT/securityRealm/ - * through {@link hudson.model.Jenkins#getSecurityRealm()}, so you can define additional pages and + * through {@link jenkins.model.Jenkins#getSecurityRealm()}, so you can define additional pages and * operations on your {@link SecurityRealm}. * *

How do I implement this class?

@@ -153,7 +153,7 @@ public abstract class SecurityRealm extends AbstractDescribableImpl, AccessControlled { /** - * Uniquely identifies this {@link Cloud} instance among other instances in {@link hudson.model.Jenkins#clouds}. + * Uniquely identifies this {@link Cloud} instance among other instances in {@link jenkins.model.Jenkins#clouds}. */ public final String name; @@ -111,7 +111,7 @@ public abstract class Cloud extends AbstractModelObject implements ExtensionPoin * {@link PlannedNode}s that represent asynchronous {@link Node} * provisioning operations. Can be empty but must not be null. * {@link NodeProvisioner} will be responsible for adding the resulting {@link Node} - * into Hudson via {@link hudson.model.Jenkins#addNode(Node)}, so a {@link Cloud} implementation + * into Hudson via {@link jenkins.model.Jenkins#addNode(Node)}, so a {@link Cloud} implementation * just needs to create a new node object. */ public abstract Collection provision(Label label, int excessWorkload); diff --git a/core/src/main/java/hudson/slaves/CommandLauncher.java b/core/src/main/java/hudson/slaves/CommandLauncher.java index 4430a61da5..eb15295fb6 100644 --- a/core/src/main/java/hudson/slaves/CommandLauncher.java +++ b/core/src/main/java/hudson/slaves/CommandLauncher.java @@ -27,7 +27,7 @@ import hudson.EnvVars; import hudson.Util; import hudson.Extension; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.remoting.Channel; import hudson.util.StreamCopyThread; diff --git a/core/src/main/java/hudson/slaves/ComputerConnectorDescriptor.java b/core/src/main/java/hudson/slaves/ComputerConnectorDescriptor.java index 3321ffdc6d..c21a68b8d4 100644 --- a/core/src/main/java/hudson/slaves/ComputerConnectorDescriptor.java +++ b/core/src/main/java/hudson/slaves/ComputerConnectorDescriptor.java @@ -2,7 +2,7 @@ package hudson.slaves; import hudson.DescriptorExtensionList; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; /** * {@link Descriptor} for {@link ComputerConnector}. diff --git a/core/src/main/java/hudson/slaves/ComputerLauncher.java b/core/src/main/java/hudson/slaves/ComputerLauncher.java index d38ad83f66..c499fd24b4 100644 --- a/core/src/main/java/hudson/slaves/ComputerLauncher.java +++ b/core/src/main/java/hudson/slaves/ComputerLauncher.java @@ -156,7 +156,7 @@ public abstract class ComputerLauncher extends AbstractDescribableImpl LIST = new DescriptorList(ComputerLauncher.class); } diff --git a/core/src/main/java/hudson/slaves/ComputerListener.java b/core/src/main/java/hudson/slaves/ComputerListener.java index 7bdd2b1c24..c8e7a19b71 100644 --- a/core/src/main/java/hudson/slaves/ComputerListener.java +++ b/core/src/main/java/hudson/slaves/ComputerListener.java @@ -24,7 +24,7 @@ package hudson.slaves; import hudson.model.Computer; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.model.Node; import hudson.ExtensionPoint; diff --git a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java index 4e1a625ef8..4c9ac2b5d1 100644 --- a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java +++ b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.WeakHashMap; import hudson.model.Computer; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.PeriodicWork; import hudson.Extension; diff --git a/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java b/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java index f8a67056ae..03890303d1 100644 --- a/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java +++ b/core/src/main/java/hudson/slaves/ConnectionActivityMonitor.java @@ -25,7 +25,7 @@ package hudson.slaves; import hudson.model.AsyncPeriodicWork; import hudson.model.TaskListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Computer; import hudson.util.TimeUnit2; import hudson.remoting.VirtualChannel; diff --git a/core/src/main/java/hudson/slaves/NodeDescriptor.java b/core/src/main/java/hudson/slaves/NodeDescriptor.java index a2f666c039..38cac33966 100644 --- a/core/src/main/java/hudson/slaves/NodeDescriptor.java +++ b/core/src/main/java/hudson/slaves/NodeDescriptor.java @@ -28,7 +28,7 @@ import hudson.model.ComputerSet; import hudson.model.Descriptor; import hudson.model.Slave; import hudson.model.Node; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.DescriptorList; import hudson.util.FormValidation; import hudson.DescriptorExtensionList; diff --git a/core/src/main/java/hudson/slaves/NodeProperty.java b/core/src/main/java/hudson/slaves/NodeProperty.java index 1ab00f94ab..b202db95db 100644 --- a/core/src/main/java/hudson/slaves/NodeProperty.java +++ b/core/src/main/java/hudson/slaves/NodeProperty.java @@ -35,7 +35,7 @@ import hudson.scm.SCM; import hudson.model.AbstractBuild; import hudson.model.BuildListener; import hudson.model.Environment; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.Queue.Task; import net.sf.json.JSONObject; diff --git a/core/src/main/java/hudson/slaves/NodeProvisioner.java b/core/src/main/java/hudson/slaves/NodeProvisioner.java index b5f9ea34a6..48993d1db4 100644 --- a/core/src/main/java/hudson/slaves/NodeProvisioner.java +++ b/core/src/main/java/hudson/slaves/NodeProvisioner.java @@ -25,7 +25,7 @@ package hudson.slaves; import hudson.model.LoadStatistics; import hudson.model.Node; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.MultiStageTimeSeries; import hudson.model.Label; import hudson.model.PeriodicWork; diff --git a/core/src/main/java/hudson/slaves/RetentionStrategy.java b/core/src/main/java/hudson/slaves/RetentionStrategy.java index a3eb333390..f4c681a4f9 100644 --- a/core/src/main/java/hudson/slaves/RetentionStrategy.java +++ b/core/src/main/java/hudson/slaves/RetentionStrategy.java @@ -29,6 +29,7 @@ import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.model.*; import hudson.util.DescriptorList; +import jenkins.model.Jenkins; import org.kohsuke.stapler.DataBoundConstructor; import java.util.logging.Level; diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java index 7c38935761..0354d45349 100644 --- a/core/src/main/java/hudson/slaves/SlaveComputer.java +++ b/core/src/main/java/hudson/slaves/SlaveComputer.java @@ -24,7 +24,7 @@ package hudson.slaves; import hudson.model.*; -import hudson.model.Jenkins.MasterComputer; +import jenkins.model.Jenkins.MasterComputer; import hudson.remoting.Channel; import hudson.remoting.VirtualChannel; import hudson.remoting.Callable; @@ -57,6 +57,7 @@ import java.util.concurrent.Future; import java.security.Security; import hudson.util.io.ReopenableFileOutputStream; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.QueryParameter; @@ -454,7 +455,7 @@ public class SlaveComputer extends Computer { * Serves jar files for JNLP slave agents. * * @deprecated since 2008-08-18. - * This URL binding is no longer used and moved up directly under to {@link hudson.model.Jenkins}, + * This URL binding is no longer used and moved up directly under to {@link jenkins.model.Jenkins}, * but it's left here for now just in case some old JNLP slave agents request it. */ public Slave.JnlpJar getJnlpJars(String fileName) { diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java index 9098c9561a..de03b08612 100644 --- a/core/src/main/java/hudson/tasks/Ant.java +++ b/core/src/main/java/hudson/tasks/Ant.java @@ -35,7 +35,7 @@ import hudson.model.AbstractProject; import hudson.model.BuildListener; import hudson.model.Computer; import hudson.model.EnvironmentSpecific; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.TaskListener; import hudson.remoting.Callable; diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java index 0099e7b6ac..6af8ba2c3f 100644 --- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java +++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java @@ -175,7 +175,7 @@ public class ArtifactArchiver extends Recorder { /** * @deprecated as of 1.286 * Some plugin depends on this, so this field is left here and points to the last created instance. - * Use {@link hudson.model.Jenkins#getDescriptorByType(Class)} instead. + * Use {@link jenkins.model.Jenkins#getDescriptorByType(Class)} instead. */ public static volatile DescriptorImpl DESCRIPTOR; diff --git a/core/src/main/java/hudson/tasks/BuildStep.java b/core/src/main/java/hudson/tasks/BuildStep.java index 546c279e4d..bb5c3b6d30 100644 --- a/core/src/main/java/hudson/tasks/BuildStep.java +++ b/core/src/main/java/hudson/tasks/BuildStep.java @@ -227,7 +227,7 @@ public interface BuildStep { public static final class PublisherList extends AbstractList> { /** * {@link Descriptor}s are actually stored in here. - * Since {@link PublisherList} lives longer than {@link hudson.model.Jenkins} we cannot directly use {@link ExtensionList}. + * Since {@link PublisherList} lives longer than {@link jenkins.model.Jenkins} we cannot directly use {@link ExtensionList}. */ private final DescriptorList core = new DescriptorList(Publisher.class); diff --git a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java index 62f6e5678c..dbabe42266 100644 --- a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java +++ b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java @@ -26,7 +26,7 @@ package hudson.tasks; import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.AbstractProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.AbstractProject.AbstractProjectDescriptor; import java.util.List; diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java index 4104fa7574..2e1664441e 100644 --- a/core/src/main/java/hudson/tasks/BuildTrigger.java +++ b/core/src/main/java/hudson/tasks/BuildTrigger.java @@ -35,7 +35,7 @@ import hudson.model.Cause.UpstreamCause; import hudson.model.DependecyDeclarer; import hudson.model.DependencyGraph; import hudson.model.DependencyGraph.Dependency; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.Items; diff --git a/core/src/main/java/hudson/tasks/BuildWrapper.java b/core/src/main/java/hudson/tasks/BuildWrapper.java index 105620057f..03535e562e 100644 --- a/core/src/main/java/hudson/tasks/BuildWrapper.java +++ b/core/src/main/java/hudson/tasks/BuildWrapper.java @@ -29,6 +29,7 @@ import hudson.DescriptorExtensionList; import hudson.LauncherDecorator; import hudson.model.*; import hudson.model.Run.RunnerAbortedException; +import jenkins.model.Jenkins; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/hudson/tasks/BuildWrappers.java b/core/src/main/java/hudson/tasks/BuildWrappers.java index a284e7c44c..7778a1f11c 100644 --- a/core/src/main/java/hudson/tasks/BuildWrappers.java +++ b/core/src/main/java/hudson/tasks/BuildWrappers.java @@ -25,7 +25,7 @@ package hudson.tasks; import hudson.model.AbstractProject; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.AbstractProject.AbstractProjectDescriptor; import hudson.Extension; import hudson.util.DescriptorList; diff --git a/core/src/main/java/hudson/tasks/Builder.java b/core/src/main/java/hudson/tasks/Builder.java index 4afe99392c..b4166eda75 100644 --- a/core/src/main/java/hudson/tasks/Builder.java +++ b/core/src/main/java/hudson/tasks/Builder.java @@ -30,7 +30,7 @@ import hudson.model.Build; import hudson.model.BuildListener; import hudson.model.Describable; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; /** diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java index c27b6edbe6..edf0fe9ed4 100644 --- a/core/src/main/java/hudson/tasks/Fingerprinter.java +++ b/core/src/main/java/hudson/tasks/Fingerprinter.java @@ -37,7 +37,7 @@ import hudson.model.BuildListener; import hudson.model.Fingerprint; import hudson.model.Fingerprint.BuildPtr; import hudson.model.FingerprintMap; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Result; import hudson.model.Run; import hudson.model.RunAction; diff --git a/core/src/main/java/hudson/tasks/MailAddressResolver.java b/core/src/main/java/hudson/tasks/MailAddressResolver.java index 5e42724935..8ccbb9a82e 100644 --- a/core/src/main/java/hudson/tasks/MailAddressResolver.java +++ b/core/src/main/java/hudson/tasks/MailAddressResolver.java @@ -27,7 +27,7 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionListView; import hudson.ExtensionPoint; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.User; import hudson.model.UserProperty; import hudson.scm.SCM; diff --git a/core/src/main/java/hudson/tasks/MailSender.java b/core/src/main/java/hudson/tasks/MailSender.java index 39cd3d2b22..34b12c6392 100644 --- a/core/src/main/java/hudson/tasks/MailSender.java +++ b/core/src/main/java/hudson/tasks/MailSender.java @@ -29,6 +29,7 @@ import hudson.Util; import hudson.Functions; import hudson.model.*; import hudson.scm.ChangeLogSet; +import jenkins.model.Jenkins; import javax.mail.Address; import javax.mail.Message; diff --git a/core/src/main/java/hudson/tasks/Mailer.java b/core/src/main/java/hudson/tasks/Mailer.java index 49f6aadd94..e3480c1aa1 100644 --- a/core/src/main/java/hudson/tasks/Mailer.java +++ b/core/src/main/java/hudson/tasks/Mailer.java @@ -36,7 +36,7 @@ import hudson.model.AbstractProject; import hudson.model.BuildListener; import hudson.model.User; import hudson.model.UserPropertyDescriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.FormValidation; import hudson.util.Secret; import org.apache.tools.ant.types.selectors.SelectorUtils; diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 4998c16ce0..8568111377 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -37,7 +37,7 @@ import hudson.model.BuildListener; import hudson.model.Computer; import hudson.model.EnvironmentSpecific; import hudson.model.Node; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.remoting.Callable; import hudson.remoting.VirtualChannel; @@ -309,7 +309,7 @@ public class Maven extends Builder { /** * @deprecated as of 1.286 - * Use {@link hudson.model.Jenkins#getDescriptorByType(Class)} to obtain the current instance. + * Use {@link jenkins.model.Jenkins#getDescriptorByType(Class)} to obtain the current instance. * For compatibility, this field retains the last created {@link DescriptorImpl}. * TODO: fix sonar plugin that depends on this. That's the only plugin that depends on this field. */ diff --git a/core/src/main/java/hudson/tasks/Publisher.java b/core/src/main/java/hudson/tasks/Publisher.java index 125ca67b58..372b0c73b8 100644 --- a/core/src/main/java/hudson/tasks/Publisher.java +++ b/core/src/main/java/hudson/tasks/Publisher.java @@ -32,7 +32,7 @@ import hudson.model.BuildListener; import hudson.model.Describable; import hudson.model.Project; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.util.List; import java.util.ArrayList; @@ -126,7 +126,7 @@ public abstract class Publisher extends BuildStepCompatibilityLayer implements B /** * {@link Publisher} has a special sort semantics that requires a subtype. * - * @see DescriptorExtensionList#createDescriptorList(hudson.model.Jenkins, Class) + * @see DescriptorExtensionList#createDescriptorList(jenkins.model.Jenkins, Class) */ public static final class DescriptorExtensionListImpl extends DescriptorExtensionList> implements Comparator>> { diff --git a/core/src/main/java/hudson/tasks/UserNameResolver.java b/core/src/main/java/hudson/tasks/UserNameResolver.java index 285adeb40b..3dd3573917 100644 --- a/core/src/main/java/hudson/tasks/UserNameResolver.java +++ b/core/src/main/java/hudson/tasks/UserNameResolver.java @@ -27,7 +27,7 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionListView; import hudson.ExtensionPoint; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.User; import java.util.List; diff --git a/core/src/main/java/hudson/tasks/junit/History.java b/core/src/main/java/hudson/tasks/junit/History.java index 846fba442b..6d5333cd6f 100644 --- a/core/src/main/java/hudson/tasks/junit/History.java +++ b/core/src/main/java/hudson/tasks/junit/History.java @@ -24,7 +24,7 @@ package hudson.tasks.junit; import hudson.model.AbstractBuild; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.tasks.test.TestObject; import hudson.tasks.test.TestResult; import hudson.util.ChartUtil; diff --git a/core/src/main/java/hudson/tasks/junit/TestDataPublisher.java b/core/src/main/java/hudson/tasks/junit/TestDataPublisher.java index 857b319fbf..25139e9e26 100644 --- a/core/src/main/java/hudson/tasks/junit/TestDataPublisher.java +++ b/core/src/main/java/hudson/tasks/junit/TestDataPublisher.java @@ -28,6 +28,7 @@ import hudson.Extension; import hudson.ExtensionPoint; import hudson.Launcher; import hudson.model.*; +import jenkins.model.Jenkins; import java.io.IOException; diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java index df30381f71..b2861e5fdb 100644 --- a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java +++ b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java @@ -32,7 +32,7 @@ import hudson.Util; import static hudson.Util.fixNull; import hudson.model.BuildListener; import hudson.model.Fingerprint.RangeSet; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.Job; import hudson.model.Result; diff --git a/core/src/main/java/hudson/tasks/test/TestObject.java b/core/src/main/java/hudson/tasks/test/TestObject.java index a623f21a93..6fc4cf7463 100644 --- a/core/src/main/java/hudson/tasks/test/TestObject.java +++ b/core/src/main/java/hudson/tasks/test/TestObject.java @@ -30,6 +30,7 @@ import hudson.model.*; import hudson.tasks.junit.History; import hudson.tasks.junit.TestAction; import hudson.tasks.junit.TestResultAction; +import jenkins.model.Jenkins; import org.kohsuke.stapler.*; import org.kohsuke.stapler.export.ExportedBean; diff --git a/core/src/main/java/hudson/tasks/test/TestResultParser.java b/core/src/main/java/hudson/tasks/test/TestResultParser.java index f43e1c2cfa..a8c78761f5 100644 --- a/core/src/main/java/hudson/tasks/test/TestResultParser.java +++ b/core/src/main/java/hudson/tasks/test/TestResultParser.java @@ -28,7 +28,7 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.Launcher; import hudson.model.AbstractBuild; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.tasks.Publisher; diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java index ce4eb1c357..35c1c39cf7 100644 --- a/core/src/main/java/hudson/tools/JDKInstaller.java +++ b/core/src/main/java/hudson/tools/JDKInstaller.java @@ -29,7 +29,7 @@ import hudson.FilePath; import hudson.ProxyConfiguration; import hudson.Util; import hudson.Launcher; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.FormValidation; import hudson.util.ArgumentListBuilder; import hudson.util.IOException2; diff --git a/core/src/main/java/hudson/tools/ToolInstallation.java b/core/src/main/java/hudson/tools/ToolInstallation.java index 9803e3ae37..50849a3351 100644 --- a/core/src/main/java/hudson/tools/ToolInstallation.java +++ b/core/src/main/java/hudson/tools/ToolInstallation.java @@ -40,6 +40,7 @@ import java.util.List; import com.thoughtworks.xstream.annotations.XStreamSerializable; import com.thoughtworks.xstream.converters.UnmarshallingContext; +import jenkins.model.Jenkins; /** * Formalization of a tool installed in nodes used for builds diff --git a/core/src/main/java/hudson/tools/ToolInstaller.java b/core/src/main/java/hudson/tools/ToolInstaller.java index 5394272eec..f1d91e2af8 100644 --- a/core/src/main/java/hudson/tools/ToolInstaller.java +++ b/core/src/main/java/hudson/tools/ToolInstaller.java @@ -28,11 +28,12 @@ import hudson.ExtensionPoint; import hudson.FilePath; import hudson.Util; import hudson.model.Describable; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Label; import hudson.model.Node; import hudson.model.TaskListener; import java.io.IOException; + import org.kohsuke.stapler.DataBoundConstructor; /** diff --git a/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java b/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java index f02a5c7034..09d60b622a 100644 --- a/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java +++ b/core/src/main/java/hudson/tools/ToolInstallerDescriptor.java @@ -26,7 +26,7 @@ package hudson.tools; import hudson.DescriptorExtensionList; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import java.util.List; import java.util.ArrayList; diff --git a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java index ba3ca4fbe7..258cc309ea 100644 --- a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java +++ b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java @@ -26,7 +26,7 @@ package hudson.tools; import hudson.DescriptorExtensionList; import hudson.Extension; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.TaskListener; import hudson.slaves.NodeProperty; @@ -34,6 +34,7 @@ import hudson.slaves.NodePropertyDescriptor; import hudson.slaves.NodeSpecific; import java.io.IOException; import java.util.ArrayList; + import org.kohsuke.stapler.DataBoundConstructor; import java.util.Arrays; diff --git a/core/src/main/java/hudson/tools/ToolLocationTranslator.java b/core/src/main/java/hudson/tools/ToolLocationTranslator.java index c257f1feb0..3b8735f707 100644 --- a/core/src/main/java/hudson/tools/ToolLocationTranslator.java +++ b/core/src/main/java/hudson/tools/ToolLocationTranslator.java @@ -26,9 +26,10 @@ package hudson.tools; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.slaves.NodeSpecific; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.TaskListener; + import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/hudson/tools/ToolProperty.java b/core/src/main/java/hudson/tools/ToolProperty.java index d2b1f2636e..d1fd235a5c 100644 --- a/core/src/main/java/hudson/tools/ToolProperty.java +++ b/core/src/main/java/hudson/tools/ToolProperty.java @@ -26,7 +26,7 @@ package hudson.tools; import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.Describable; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; /** * Extensible property of {@link ToolInstallation}. diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java index 6fbccdd154..41fc4014ca 100644 --- a/core/src/main/java/hudson/triggers/SCMTrigger.java +++ b/core/src/main/java/hudson/triggers/SCMTrigger.java @@ -31,7 +31,7 @@ import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.Cause; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.Project; import hudson.model.SCMedItem; diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java index 311852c657..b7f7374bbf 100644 --- a/core/src/main/java/hudson/triggers/Trigger.java +++ b/core/src/main/java/hudson/triggers/Trigger.java @@ -36,7 +36,7 @@ import hudson.model.AperiodicWork; import hudson.model.Build; import hudson.model.ComputerSet; import hudson.model.Describable; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.PeriodicWork; import hudson.model.Project; @@ -265,7 +265,7 @@ public abstract class Trigger implements Describable> * This timer is available for all the components inside Hudson to schedule * some work. * - * Initialized and cleaned up by {@link hudson.model.Jenkins}, but value kept here for compatibility. + * Initialized and cleaned up by {@link jenkins.model.Jenkins}, but value kept here for compatibility. * * If plugins want to run periodic jobs, they should implement {@link PeriodicWork}. */ diff --git a/core/src/main/java/hudson/util/AlternativeUiTextProvider.java b/core/src/main/java/hudson/util/AlternativeUiTextProvider.java index c753e2ad75..9e1dd20730 100644 --- a/core/src/main/java/hudson/util/AlternativeUiTextProvider.java +++ b/core/src/main/java/hudson/util/AlternativeUiTextProvider.java @@ -27,7 +27,7 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.AbstractProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; /** * Provides the alternative text to be rendered in the UI. diff --git a/core/src/main/java/hudson/util/DescriptorList.java b/core/src/main/java/hudson/util/DescriptorList.java index 07d5f0dc19..3f90c68c77 100644 --- a/core/src/main/java/hudson/util/DescriptorList.java +++ b/core/src/main/java/hudson/util/DescriptorList.java @@ -28,7 +28,7 @@ import hudson.ExtensionList; import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.Stapler; @@ -52,7 +52,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * *

* The other mode is the new mode, where the {@link Descriptor}s are actually stored in {@link ExtensionList} - * (see {@link hudson.model.Jenkins#getDescriptorList(Class)}) and this class acts as a view to it. This enables + * (see {@link jenkins.model.Jenkins#getDescriptorList(Class)}) and this class acts as a view to it. This enables * bi-directional interoperability — both descriptors registred automatically and descriptors registered * manually are visible from both {@link DescriptorList} and {@link ExtensionList}. In this mode, * {@link #legacy} is null but {@link #type} is non-null. diff --git a/core/src/main/java/hudson/util/DoubleLaunchChecker.java b/core/src/main/java/hudson/util/DoubleLaunchChecker.java index 33c1dc56ac..bcdb07c74a 100644 --- a/core/src/main/java/hudson/util/DoubleLaunchChecker.java +++ b/core/src/main/java/hudson/util/DoubleLaunchChecker.java @@ -23,7 +23,7 @@ */ package hudson.util; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.triggers.SafeTimerTask; import hudson.triggers.Trigger; import org.apache.commons.io.FileUtils; diff --git a/core/src/main/java/hudson/util/FormFieldValidator.java b/core/src/main/java/hudson/util/FormFieldValidator.java index f6f0f0cc16..9e99c5033f 100644 --- a/core/src/main/java/hudson/util/FormFieldValidator.java +++ b/core/src/main/java/hudson/util/FormFieldValidator.java @@ -30,7 +30,7 @@ import hudson.ProxyConfiguration; import hudson.Util; import hudson.tasks.JavadocArchiver; import hudson.model.AbstractProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.security.Permission; import hudson.security.AccessControlled; diff --git a/core/src/main/java/hudson/util/FormValidation.java b/core/src/main/java/hudson/util/FormValidation.java index 2768d58648..3b26b72719 100644 --- a/core/src/main/java/hudson/util/FormValidation.java +++ b/core/src/main/java/hudson/util/FormValidation.java @@ -33,7 +33,7 @@ import hudson.model.AbstractBuild; import hudson.model.BuildListener; import hudson.tasks.Builder; import static hudson.Util.fixEmpty; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/core/src/main/java/hudson/util/ProcessKiller.java b/core/src/main/java/hudson/util/ProcessKiller.java index ea7e848ff2..eee545ef81 100644 --- a/core/src/main/java/hudson/util/ProcessKiller.java +++ b/core/src/main/java/hudson/util/ProcessKiller.java @@ -26,7 +26,7 @@ package hudson.util; import hudson.ExtensionList; import hudson.ExtensionPoint; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.ProcessTree.OSProcess; import java.io.IOException; diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java index ef7cd254a6..12ae118468 100644 --- a/core/src/main/java/hudson/util/ProcessTree.java +++ b/core/src/main/java/hudson/util/ProcessTree.java @@ -28,7 +28,7 @@ import com.sun.jna.Native; import com.sun.jna.ptr.IntByReference; import hudson.EnvVars; import hudson.Util; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.Callable; import hudson.remoting.Channel; import hudson.remoting.VirtualChannel; diff --git a/core/src/main/java/hudson/util/RemotingDiagnostics.java b/core/src/main/java/hudson/util/RemotingDiagnostics.java index 887527ead0..b3f7a8818b 100644 --- a/core/src/main/java/hudson/util/RemotingDiagnostics.java +++ b/core/src/main/java/hudson/util/RemotingDiagnostics.java @@ -26,7 +26,7 @@ package hudson.util; import groovy.lang.GroovyShell; import hudson.FilePath; import hudson.Functions; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.AsyncFutureImpl; import hudson.remoting.Callable; import hudson.remoting.DelegatingCallable; diff --git a/core/src/main/java/hudson/util/Secret.java b/core/src/main/java/hudson/util/Secret.java index 590018d560..4212005c6d 100644 --- a/core/src/main/java/hudson/util/Secret.java +++ b/core/src/main/java/hudson/util/Secret.java @@ -29,7 +29,7 @@ import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.trilead.ssh2.crypto.Base64; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.Util; import org.kohsuke.stapler.Stapler; @@ -44,7 +44,7 @@ import java.security.GeneralSecurityException; * Glorified {@link String} that uses encryption in the persisted form, to avoid accidental exposure of a secret. * *

- * Note that since the cryptography relies on {@link hudson.model.Jenkins#getSecretKey()}, this is not meant as a protection + * Note that since the cryptography relies on {@link jenkins.model.Jenkins#getSecretKey()}, this is not meant as a protection * against code running in the same VM, nor against an attacker who has local file system access. * *

@@ -96,7 +96,7 @@ public final class Secret implements Serializable { } /** - * Turns {@link hudson.model.Jenkins#getSecretKey()} into an AES key. + * Turns {@link jenkins.model.Jenkins#getSecretKey()} into an AES key. */ private static SecretKey getKey() throws UnsupportedEncodingException, GeneralSecurityException { String secret = SECRET; @@ -207,7 +207,7 @@ public final class Secret implements Serializable { private static final String PROVIDER = System.getProperty(Secret.class.getName()+".provider"); /** - * For testing only. Override the secret key so that we can test this class without {@link hudson.model.Jenkins}. + * For testing only. Override the secret key so that we can test this class without {@link jenkins.model.Jenkins}. */ /*package*/ static String SECRET = null; diff --git a/core/src/main/java/hudson/util/SubClassGenerator.java b/core/src/main/java/hudson/util/SubClassGenerator.java index c612ce34a8..650ed976d5 100644 --- a/core/src/main/java/hudson/util/SubClassGenerator.java +++ b/core/src/main/java/hudson/util/SubClassGenerator.java @@ -24,7 +24,7 @@ package hudson.util; import hudson.PluginManager.UberClassLoader; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Type; diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java index 61a8bc3967..7298c06c0d 100644 --- a/core/src/main/java/hudson/util/XStream2.java +++ b/core/src/main/java/hudson/util/XStream2.java @@ -41,7 +41,7 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.mapper.CannotResolveClassException; import hudson.diagnosis.OldDataMonitor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Label; import hudson.model.Result; import hudson.model.Saveable; diff --git a/core/src/main/java/hudson/views/ListViewColumn.java b/core/src/main/java/hudson/views/ListViewColumn.java index 11bb7b81a6..2e6c4b9880 100644 --- a/core/src/main/java/hudson/views/ListViewColumn.java +++ b/core/src/main/java/hudson/views/ListViewColumn.java @@ -29,7 +29,7 @@ import hudson.ExtensionPoint; import hudson.model.Describable; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.ListView; diff --git a/core/src/main/java/hudson/views/MyViewsTabBar.java b/core/src/main/java/hudson/views/MyViewsTabBar.java index 2e2298202f..bb09b0b264 100644 --- a/core/src/main/java/hudson/views/MyViewsTabBar.java +++ b/core/src/main/java/hudson/views/MyViewsTabBar.java @@ -27,7 +27,7 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.MyViewsProperty; /** diff --git a/core/src/main/java/hudson/views/ViewJobFilter.java b/core/src/main/java/hudson/views/ViewJobFilter.java index 3e66a8b20f..e6dde1f75e 100644 --- a/core/src/main/java/hudson/views/ViewJobFilter.java +++ b/core/src/main/java/hudson/views/ViewJobFilter.java @@ -27,7 +27,7 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.Describable; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TopLevelItem; import hudson.model.View; diff --git a/core/src/main/java/hudson/views/ViewsTabBar.java b/core/src/main/java/hudson/views/ViewsTabBar.java index a8b796ccc1..cf9e4a93b7 100644 --- a/core/src/main/java/hudson/views/ViewsTabBar.java +++ b/core/src/main/java/hudson/views/ViewsTabBar.java @@ -27,7 +27,7 @@ import hudson.DescriptorExtensionList; import hudson.ExtensionPoint; import hudson.model.AbstractDescribableImpl; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.ListView; /** diff --git a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java index 3f8e4743b3..a7924866d1 100644 --- a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java +++ b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java @@ -23,7 +23,7 @@ */ package hudson.widgets; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Queue.Item; import hudson.model.Queue.Task; diff --git a/core/src/main/java/hudson/widgets/Widget.java b/core/src/main/java/hudson/widgets/Widget.java index c557e9f687..69153ff3e3 100644 --- a/core/src/main/java/hudson/widgets/Widget.java +++ b/core/src/main/java/hudson/widgets/Widget.java @@ -35,7 +35,7 @@ import hudson.ExtensionPoint; * * @author Kohsuke Kawaguchi * @since 1.146 - * @see hudson.model.Jenkins#getWidgets() + * @see jenkins.model.Jenkins#getWidgets() */ public abstract class Widget implements ExtensionPoint { /** diff --git a/core/src/test/java/hudson/slaves/NodeListTest.java b/core/src/test/java/hudson/slaves/NodeListTest.java index a6eabadf38..042da99d6c 100644 --- a/core/src/test/java/hudson/slaves/NodeListTest.java +++ b/core/src/test/java/hudson/slaves/NodeListTest.java @@ -24,8 +24,8 @@ package hudson.slaves; +import jenkins.model.Jenkins; import junit.framework.TestCase; -import hudson.model.Jenkins; import hudson.model.Node; import hudson.model.TaskListener; import hudson.model.Computer; diff --git a/core/src/test/java/hudson/util/SecretTest.java b/core/src/test/java/hudson/util/SecretTest.java index 35e421552d..24102d358f 100644 --- a/core/src/test/java/hudson/util/SecretTest.java +++ b/core/src/test/java/hudson/util/SecretTest.java @@ -23,12 +23,12 @@ */ package hudson.util; +import jenkins.model.Jenkins; import junit.framework.TestCase; import java.security.SecureRandom; import hudson.Util; -import hudson.model.Jenkins; /** * @author Kohsuke Kawaguchi diff --git a/maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java b/maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java index ea0548c4eb..848a5073c8 100644 --- a/maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java +++ b/maven-plugin/src/main/java/hudson/maven/AbstractMavenBuilder.java @@ -24,7 +24,7 @@ package hudson.maven; import hudson.model.BuildListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Result; import hudson.remoting.DelegatingCallable; diff --git a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProject.java b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProject.java index 5993f9e6be..46cdd32403 100644 --- a/maven-plugin/src/main/java/hudson/maven/AbstractMavenProject.java +++ b/maven-plugin/src/main/java/hudson/maven/AbstractMavenProject.java @@ -28,7 +28,7 @@ import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; import hudson.model.DependencyGraph; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.ItemGroup; import hudson.model.Result; import hudson.model.Run; diff --git a/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java b/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java index 82d2a13076..26a7c66f97 100644 --- a/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java +++ b/maven-plugin/src/main/java/hudson/maven/ExecutedMojo.java @@ -25,7 +25,7 @@ package hudson.maven; import static hudson.Util.intern; import hudson.Util; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.Which; import hudson.util.ReflectionUtils; diff --git a/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java b/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java index e16119ad4e..511a11c796 100644 --- a/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java +++ b/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java @@ -27,7 +27,7 @@ import hudson.Launcher; import hudson.maven.MavenBuild.ProxyImpl2; import hudson.maven.util.ExecutionEventLogger; import hudson.model.BuildListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Result; import hudson.remoting.Channel; import hudson.remoting.DelegatingCallable; diff --git a/maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java index 83979376c7..6cb637d7e8 100644 --- a/maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java +++ b/maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java @@ -27,7 +27,7 @@ import hudson.EnvVars; import hudson.FilePath; import hudson.Launcher; import hudson.model.BuildListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.JDK; import hudson.model.Run.RunnerAbortedException; import hudson.model.TaskListener; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index 75293ee379..a06f31b622 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -32,7 +32,7 @@ import hudson.model.BuildListener; import hudson.model.Computer; import hudson.model.Environment; import hudson.model.Executor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.Result; import hudson.model.Run; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index 46684336da..5741a2fa40 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -32,7 +32,7 @@ import hudson.model.Action; import hudson.model.DependencyGraph; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.JDK; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index dcdca431b2..30bdb201c9 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -38,7 +38,7 @@ import hudson.model.DependencyGraph; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; import hudson.model.Executor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.ItemGroup; import hudson.model.Job; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 003b0e24e1..0705bdfca4 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -44,7 +44,7 @@ import hudson.model.Cause.UpstreamCause; import hudson.model.Computer; import hudson.model.Environment; import hudson.model.Fingerprint; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.ParameterDefinition; import hudson.model.ParametersAction; import hudson.model.ParametersDefinitionProperty; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenProbeAction.java b/maven-plugin/src/main/java/hudson/maven/MavenProbeAction.java index 378fcdd6db..e55e4545ed 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenProbeAction.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenProbeAction.java @@ -26,7 +26,7 @@ package hudson.maven; import hudson.EnvVars; import hudson.model.AbstractProject; import hudson.model.Action; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.Channel; import hudson.util.RemotingDiagnostics; import hudson.util.RemotingDiagnostics.HeapDump; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java index dd64bcda3f..55f69f0a88 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java @@ -29,7 +29,7 @@ import hudson.EnvVars; import hudson.maven.agent.Main; import hudson.maven.agent.Maven21Interceptor; import hudson.model.BuildListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.JDK; import hudson.model.Run.RunnerAbortedException; import hudson.model.TaskListener; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenReporter.java b/maven-plugin/src/main/java/hudson/maven/MavenReporter.java index e758e09547..023d18d479 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenReporter.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenReporter.java @@ -28,7 +28,7 @@ import hudson.Launcher; import hudson.model.Action; import hudson.model.BuildListener; import hudson.model.Describable; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.tasks.BuildStep; import hudson.tasks.Publisher; import org.apache.maven.plugin.MojoExecutionException; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenReporterDescriptor.java b/maven-plugin/src/main/java/hudson/maven/MavenReporterDescriptor.java index 2ea5b5795f..c47e8f69ef 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenReporterDescriptor.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenReporterDescriptor.java @@ -26,7 +26,7 @@ package hudson.maven; import hudson.maven.reporters.MavenArtifactArchiver; import hudson.model.Descriptor; import hudson.model.Describable; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.apache.commons.jelly.JellyException; import org.kohsuke.stapler.MetaClass; import org.kohsuke.stapler.StaplerRequest; diff --git a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java index 6c8cc8905f..e002cd6fae 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java @@ -28,7 +28,7 @@ import hudson.Util; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.TaskListener; import hudson.tasks.Maven.MavenInstallation; import hudson.tasks.Maven.ProjectWithMaven; diff --git a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java index 1e0452c290..3793293385 100644 --- a/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java +++ b/maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java @@ -31,7 +31,7 @@ import hudson.maven.reporters.MavenAbstractArtifactRecord; import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.BuildListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.Node; import hudson.model.Result; import hudson.model.TaskListener; diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java b/maven-plugin/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java index a6b468fe8e..d2dfe930fe 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java @@ -31,7 +31,7 @@ import hudson.maven.MojoInfo; import hudson.maven.MavenBuild; import hudson.maven.MavenBuildProxy.BuildCallable; import hudson.model.BuildListener; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.Extension; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.configuration.PlexusConfiguration; diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java index f68ccba335..9116d4fbe6 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java @@ -29,7 +29,7 @@ import hudson.maven.MavenBuild; import hudson.maven.MavenBuildProxy; import hudson.model.BuildListener; import hudson.model.FingerprintMap; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenFingerprinter.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenFingerprinter.java index ae111f5ae7..6e4ccea86d 100644 --- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenFingerprinter.java +++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenFingerprinter.java @@ -35,7 +35,7 @@ import hudson.maven.MojoInfo; import hudson.maven.MavenModuleSetBuild; import hudson.model.BuildListener; import hudson.model.FingerprintMap; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.tasks.Fingerprinter.FingerprintAction; import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index c00cace2b7..663f7244f6 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -116,6 +116,8 @@ import java.util.logging.Logger; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; +import jenkins.model.Jenkins; +import jenkins.model.JenkinsAdaptor; import junit.framework.TestCase; import net.sf.json.JSONObject; import net.sourceforge.htmlunit.corejs.javascript.Context; @@ -394,7 +396,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { } /** - * Creates a new instance of {@link hudson.model.Jenkins}. If the derived class wants to create it in a different way, + * Creates a new instance of {@link jenkins.model.Jenkins}. If the derived class wants to create it in a different way, * you can override it. */ protected Hudson newHudson() throws Exception { @@ -1436,7 +1438,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { *

* This method allows you to do just that. It is useful for testing some methods that * require {@link StaplerRequest} and {@link StaplerResponse}, or getting the credential - * of the current user (via {@link hudson.model.Jenkins#getAuthentication()}, and so on. + * of the current user (via {@link jenkins.model.Jenkins#getAuthentication()}, and so on. * * @param c * The closure to be executed on the server. @@ -1562,7 +1564,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { *

* This method allows you to do just that. It is useful for testing some methods that * require {@link StaplerRequest} and {@link StaplerResponse}, or getting the credential - * of the current user (via {@link hudson.model.Jenkins#getAuthentication()}, and so on. + * of the current user (via {@link jenkins.model.Jenkins#getAuthentication()}, and so on. * * @param c * The closure to be executed on the server. diff --git a/test/src/main/java/org/jvnet/hudson/test/NoListenerConfiguration.java b/test/src/main/java/org/jvnet/hudson/test/NoListenerConfiguration.java index 22cce9cd96..9edaef6a4e 100644 --- a/test/src/main/java/org/jvnet/hudson/test/NoListenerConfiguration.java +++ b/test/src/main/java/org/jvnet/hudson/test/NoListenerConfiguration.java @@ -32,7 +32,7 @@ import javax.servlet.ServletContextListener; * Kills off {@link ServletContextListener}s loaded from web.xml. * *

- * This is so that the harness can create the {@link hudson.model.Jenkins} object. + * This is so that the harness can create the {@link jenkins.model.Jenkins} object. * with the home directory of our choice. * * @author Kohsuke Kawaguchi diff --git a/test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java b/test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java index c44e7077f4..2dd4efb658 100644 --- a/test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java +++ b/test/src/main/java/org/jvnet/hudson/test/TestEnvironment.java @@ -60,7 +60,7 @@ public class TestEnvironment { * the wrong test environment depending on when it's created. * *

- * Since the rest of Hudson still relies on static {@link hudson.model.Jenkins#theInstance}, changing this + * Since the rest of Hudson still relies on static {@link jenkins.model.Jenkins#theInstance}, changing this * to a static field for now shouldn't cause any problem. */ private static TestEnvironment CURRENT; diff --git a/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java b/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java index face7fb962..c324fe695b 100644 --- a/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java +++ b/test/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java @@ -26,7 +26,7 @@ package org.jvnet.hudson.test; import hudson.Extension; import hudson.ExtensionComponent; import hudson.ExtensionFinder; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import net.java.sezpoz.Index; import net.java.sezpoz.IndexItem; diff --git a/test/src/main/java/org/jvnet/hudson/test/recipes/Recipe.java b/test/src/main/java/org/jvnet/hudson/test/recipes/Recipe.java index 64121c52cd..426764a9c2 100644 --- a/test/src/main/java/org/jvnet/hudson/test/recipes/Recipe.java +++ b/test/src/main/java/org/jvnet/hudson/test/recipes/Recipe.java @@ -67,7 +67,7 @@ public @interface Recipe { public void setup(HudsonTestCase testCase, T recipe) throws Exception {} /** - * Called right before {@link hudson.model.Jenkins#Hudson(File, ServletContext)} is invoked + * Called right before {@link jenkins.model.Jenkins#Hudson(File, ServletContext)} is invoked * to decorate the hudson home directory. */ public void decorateHome(HudsonTestCase testCase, File home) throws Exception {} diff --git a/test/src/test/java/CoreJellyTest.java b/test/src/test/java/CoreJellyTest.java index c1a3c7eb25..4f315a0879 100644 --- a/test/src/test/java/CoreJellyTest.java +++ b/test/src/test/java/CoreJellyTest.java @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.remoting.Which; import junit.framework.Test; import junit.framework.TestCase; diff --git a/test/src/test/java/hudson/ExtensionListTest.java b/test/src/test/java/hudson/ExtensionListTest.java index cd36fd51f9..c49e68818e 100644 --- a/test/src/test/java/hudson/ExtensionListTest.java +++ b/test/src/test/java/hudson/ExtensionListTest.java @@ -1,9 +1,9 @@ package hudson; +import jenkins.model.Jenkins; import org.jvnet.hudson.test.HudsonTestCase; import hudson.model.Descriptor; import hudson.model.Describable; -import hudson.model.Jenkins; import hudson.util.DescriptorList; import java.util.List; diff --git a/test/src/test/java/hudson/maven/ModuleDependencyLocator.java b/test/src/test/java/hudson/maven/ModuleDependencyLocator.java index 8020495c93..88f3620e4a 100644 --- a/test/src/test/java/hudson/maven/ModuleDependencyLocator.java +++ b/test/src/test/java/hudson/maven/ModuleDependencyLocator.java @@ -26,7 +26,7 @@ package hudson.maven; import hudson.ExtensionPoint; import hudson.ExtensionList; import hudson.Extension; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.apache.maven.project.MavenProject; import java.util.Collection; diff --git a/test/src/test/java/hudson/model/ExecutorTest.java b/test/src/test/java/hudson/model/ExecutorTest.java index 19bc513f56..e2f45a3ebe 100644 --- a/test/src/test/java/hudson/model/ExecutorTest.java +++ b/test/src/test/java/hudson/model/ExecutorTest.java @@ -1,6 +1,7 @@ package hudson.model; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import jenkins.model.Jenkins; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.HudsonTestCase; diff --git a/test/src/test/java/hudson/model/HudsonTest.java b/test/src/test/java/hudson/model/HudsonTest.java index 9bfea6bb69..63ea9fb4c2 100644 --- a/test/src/test/java/hudson/model/HudsonTest.java +++ b/test/src/test/java/hudson/model/HudsonTest.java @@ -38,6 +38,7 @@ import hudson.security.SecurityRealm; import hudson.tasks.Ant; import hudson.tasks.BuildStep; import hudson.tasks.Ant.AntInstallation; +import jenkins.model.Jenkins; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.Email; import org.jvnet.hudson.test.HudsonTestCase; diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java index d6c2d15c55..64463fd883 100644 --- a/test/src/test/java/hudson/model/ViewTest.java +++ b/test/src/test/java/hudson/model/ViewTest.java @@ -23,6 +23,7 @@ */ package hudson.model; +import jenkins.model.Jenkins; import org.jvnet.hudson.test.Bug; import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.html.HtmlAnchor; diff --git a/test/src/test/java/hudson/security/CliAuthenticationTest.java b/test/src/test/java/hudson/security/CliAuthenticationTest.java index 4d4b84f753..997ed20099 100644 --- a/test/src/test/java/hudson/security/CliAuthenticationTest.java +++ b/test/src/test/java/hudson/security/CliAuthenticationTest.java @@ -5,7 +5,7 @@ import hudson.cli.CLICommand; import hudson.cli.ClientAuthenticationCache; import hudson.cli.LoginCommand; import hudson.cli.LogoutCommand; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.acegisecurity.Authentication; import org.jvnet.hudson.test.For; import org.jvnet.hudson.test.HudsonTestCase; diff --git a/test/src/test/java/hudson/security/PermissionGroupTest.java b/test/src/test/java/hudson/security/PermissionGroupTest.java index d211a924ce..b06d4e02a4 100644 --- a/test/src/test/java/hudson/security/PermissionGroupTest.java +++ b/test/src/test/java/hudson/security/PermissionGroupTest.java @@ -23,9 +23,9 @@ */ package hudson.security; +import jenkins.model.Jenkins; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.Email; -import hudson.model.Jenkins; /** * @author Kohsuke Kawaguchi diff --git a/test/src/test/java/hudson/tasks/MavenTest.java b/test/src/test/java/hudson/tasks/MavenTest.java index 3546800121..49cd68531f 100644 --- a/test/src/test/java/hudson/tasks/MavenTest.java +++ b/test/src/test/java/hudson/tasks/MavenTest.java @@ -25,7 +25,7 @@ package hudson.tasks; import hudson.model.Build; import hudson.model.FreeStyleProject; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.JDK; import hudson.model.ParametersDefinitionProperty; import hudson.model.Result; diff --git a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java b/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java index 4af23c1a47..e1592d57c2 100644 --- a/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java +++ b/test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java @@ -39,6 +39,7 @@ import hudson.maven.MavenModuleSet; import java.io.IOException; +import jenkins.model.Jenkins; import junit.framework.Assert; import org.jvnet.hudson.test.HudsonTestCase; diff --git a/test/src/test/java/hudson/tools/ToolLocationTest.java b/test/src/test/java/hudson/tools/ToolLocationTest.java index 7c7a0890b8..0cc9f6d3db 100644 --- a/test/src/test/java/hudson/tools/ToolLocationTest.java +++ b/test/src/test/java/hudson/tools/ToolLocationTest.java @@ -1,11 +1,11 @@ package hudson.tools; +import jenkins.model.Jenkins; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.recipes.LocalData; import hudson.tasks.Maven; import hudson.tasks.Ant; import hudson.model.JDK; -import hudson.model.Jenkins; import java.util.Arrays; diff --git a/test/src/test/java/lib/form/RepeatablePropertyTest.java b/test/src/test/java/lib/form/RepeatablePropertyTest.java index 16018908bb..c6e1a2491b 100644 --- a/test/src/test/java/lib/form/RepeatablePropertyTest.java +++ b/test/src/test/java/lib/form/RepeatablePropertyTest.java @@ -31,7 +31,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlTextInput; import hudson.Extension; import hudson.model.Describable; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.jvnet.hudson.test.HudsonTestCase; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/test/src/test/java/lib/form/RepeatableTest.java b/test/src/test/java/lib/form/RepeatableTest.java index 879f4cbb1e..ee6286849f 100644 --- a/test/src/test/java/lib/form/RepeatableTest.java +++ b/test/src/test/java/lib/form/RepeatableTest.java @@ -39,7 +39,7 @@ import hudson.Extension; import hudson.ExtensionPoint; import hudson.model.Describable; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.jvnet.hudson.test.HudsonTestCase; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/DropdownList.java b/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/DropdownList.java index f009e51a6e..96462d1ca8 100644 --- a/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/DropdownList.java +++ b/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/DropdownList.java @@ -5,11 +5,12 @@ import hudson.Extension; import hudson.ExtensionPoint; import hudson.model.Describable; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.util.XStream2; import java.io.IOException; import java.util.List; import javax.servlet.ServletException; + import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/UISample.java b/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/UISample.java index 83da52b7fa..723b34092f 100644 --- a/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/UISample.java +++ b/ui-samples-plugin/src/main/java/hudson/plugins/ui_samples/UISample.java @@ -4,7 +4,7 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.model.Action; import hudson.model.Describable; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; diff --git a/war/src/main/webapp/WEB-INF/security/AbstractPasswordBasedSecurityRealm.groovy b/war/src/main/webapp/WEB-INF/security/AbstractPasswordBasedSecurityRealm.groovy index 6236b96da7..453687de55 100644 --- a/war/src/main/webapp/WEB-INF/security/AbstractPasswordBasedSecurityRealm.groovy +++ b/war/src/main/webapp/WEB-INF/security/AbstractPasswordBasedSecurityRealm.groovy @@ -27,7 +27,7 @@ import org.acegisecurity.providers.ProviderManager import org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider import org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider -import hudson.model.Jenkins +import jenkins.model.Jenkins authenticationManager(ProviderManager) { providers = [ diff --git a/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy b/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy index 613b00c0d8..db70277f0b 100644 --- a/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy +++ b/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy @@ -28,7 +28,7 @@ import org.acegisecurity.providers.ldap.authenticator.BindAuthenticator2 import org.acegisecurity.ldap.DefaultInitialDirContextFactory import org.acegisecurity.ldap.search.FilterBasedLdapUserSearch import org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider -import hudson.model.Jenkins +import jenkins.model.Jenkins import hudson.security.LDAPSecurityRealm.AuthoritiesPopulatorImpl import hudson.Util import javax.naming.Context diff --git a/war/src/main/webapp/WEB-INF/security/PAMSecurityRealm.groovy b/war/src/main/webapp/WEB-INF/security/PAMSecurityRealm.groovy index e84f407641..8c37d978f3 100644 --- a/war/src/main/webapp/WEB-INF/security/PAMSecurityRealm.groovy +++ b/war/src/main/webapp/WEB-INF/security/PAMSecurityRealm.groovy @@ -29,7 +29,7 @@ import org.acegisecurity.providers.ProviderManager import hudson.security.PAMSecurityRealm.PAMAuthenticationProvider import org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider import org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider -import hudson.model.Jenkins +import jenkins.model.Jenkins authenticationManager(ProviderManager) { providers = [