Move hudson.model.Jenkins to be jenkins.model.Jenkins - part II

Just import changes, from hudson.model.Jenkins -> jenkins.model.Jenkins,
and Javadoc comments.
Signed-off-by: NNigel Magnay <nigel.magnay@gmail.com>

core/src/findbugs-filter.xml

@@ -126,7 +126,7 @@ THE SOFTWARE.
 
   <Match>
     <!-- just a diagnostics method -->
-    <Class name="hudson.model.Jenkins" />
+    <Class name="jenkins.model.Jenkins" />
     <Bug pattern="DM_GC" />
   </Match>
 

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

core/src/main/java/hudson/BulkChange.java

@@ -77,7 +77,7 @@ import java.io.IOException;
  * </ol>
  *
  * <p>
- * 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

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());

core/src/main/java/hudson/DNSMultiCast.java

 package hudson;
 
-import hudson.model.Jenkins;
+import jenkins.model.Jenkins;
 
 import javax.jmdns.JmDNS;
 import javax.jmdns.ServiceInfo;

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;
 

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 <D>
  *      Represents the descriptor type. This is {@code Descriptor<T>} normally but often there are subtypes

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 <T> Collection<T> findExtensions(Class<T> 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 <T> Collection<ExtensionComponent<T>> find(Class<T> type, Jenkins hudson);
 
@@ -115,7 +115,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
      * This inconsistent locking order results in a dead lock, you see.
      *
      * <p>
-     * 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.
      *

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,
  *
  * <p>
- * 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 <T>
  *      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<T> extends AbstractList<T> {
     public final Jenkins hudson;

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;
  *
  * <p>
  * 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}.
  *
  * <p>

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)

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;

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;
 

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 {
      * </pre>
      *
      * <p>
-     * 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.
      *

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;

core/src/main/java/hudson/LauncherDecorator.java

 package hudson;
 
-import hudson.model.Jenkins;
+import jenkins.model.Jenkins;
 import hudson.model.Node;
 import hudson.model.Executor;
 import hudson.tasks.BuildWrapper;

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;

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 {
      *
      * <p>
      * 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.
      *

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;

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;

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;

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;
  * <a href="http://java.sun.com/javase/6/docs/technotes/guides/net/http-auth.html">
  * Http Authentication</a>).
  * 
- * @see hudson.model.Jenkins#proxy
+ * @see jenkins.model.Jenkins#proxy
  */
 public final class ProxyConfiguration implements Saveable {
     public final String name;

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.
  *
  * <p>
- * 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 <tt>.jnlp</tt> file
  * (this file itself is protected by HTTP form-based authentication that
  * we use everywhere else in Hudson), and the slave sends this

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;
 

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;

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;

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 {

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.
      *
      * <p>
-     * 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);

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;

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();

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;

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;

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;

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;

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;

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;

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;

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;

core/src/main/java/hudson/cli/LoginCommand.java

 package hudson.cli;
 
 import hudson.Extension;
-import hudson.model.Jenkins;
+import jenkins.model.Jenkins;
 import org.acegisecurity.Authentication;
 import org.kohsuke.args4j.CmdLineException;
 

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;

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.

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;

core/src/main/java/hudson/cli/declarative/CLIResolver.java

@@ -47,7 +47,7 @@ import java.lang.annotation.Target;
  * <p>
  * If the chosen resolver method is an instance method on type <tt>S</tt>, 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.)
  *
  * <p>

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;

core/src/main/java/hudson/cli/handlers/TopLevelItemOptionHandler.java

 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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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 {
 }

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;
 
 /**

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;
 

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;
 

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;

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;
 
 /**

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

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;

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;
 

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;
  *
  * <h3>Access Control</h3>
  * {@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

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;

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<MarkupFormatter> implements ExtensionPoint {
     /**

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}.

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;

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;
 

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;

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;
 

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;

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;

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;

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;

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;
 

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;

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}.
  *

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;

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;

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 <tt>floatBox.jelly</tt>
      *      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();
 

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;
 

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;

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;

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;
 
 /**

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;
 

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.*;

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.
  *
  * <p>
@@ -41,7 +41,7 @@ public interface DescriptorByNameOwner extends ModelObject {
      * Exposes all {@link Descriptor}s by its name to URL.
      *
      * <p>
-     * 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.

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;