Deprecating Hudson.getInstance.

core/src/main/java/hudson/ExtensionFinder.java

@@ -256,7 +256,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
         private Map<Class<? extends Annotation>,GuiceExtensionAnnotation<?>> extensionAnnotations = Maps.newHashMap();
 
         public GuiceFinder() {
-            for (ExtensionComponent<GuiceExtensionAnnotation> ec : moduleFinder.find(GuiceExtensionAnnotation.class, Hudson.getInstance())) {
+            for (ExtensionComponent<GuiceExtensionAnnotation> ec : moduleFinder.find(GuiceExtensionAnnotation.class, Jenkins.getInstance())) {
                 GuiceExtensionAnnotation gea = ec.getInstance();
                 extensionAnnotations.put(gea.annotationType,gea);
             }
@@ -274,7 +274,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
             });
             modules.add(new SezpozModule(sezpozIndex));
 
-            for (ExtensionComponent<Module> ec : moduleFinder.find(Module.class, Hudson.getInstance())) {
+            for (ExtensionComponent<Module> ec : moduleFinder.find(Module.class, Jenkins.getInstance())) {
                 modules.add(ec.getInstance());
             }
 

core/src/main/java/hudson/model/AbstractProject.java

@@ -2329,7 +2329,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
      * @see Items#findNearest
      */
     public static AbstractProject findNearest(String name) {
-        return findNearest(name,Hudson.getInstance());
+        return findNearest(name,Jenkins.getInstance());
     }
 
     /**

core/src/main/java/hudson/model/Computer.java

@@ -929,7 +929,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
         }
 
         // TODO: hmm, they don't really belong
-        String rootUrl = Hudson.getInstance().getRootUrl();
+        String rootUrl = Jenkins.getInstance().getRootUrl();
         if(rootUrl!=null) {
             env.put("HUDSON_URL", rootUrl); // Legacy.
             env.put("JENKINS_URL", rootUrl);

core/src/main/java/hudson/model/ComputerPanelBox.java

@@ -3,6 +3,7 @@ package hudson.model;
 import hudson.ExtensionPoint;
 import java.util.ArrayList;
 import java.util.List;
+import jenkins.model.Jenkins;
 
 /**
  * Adds box rendered in the computer side panel.
@@ -37,7 +38,7 @@ public abstract class ComputerPanelBox implements ExtensionPoint{
      */
     public static List<ComputerPanelBox> all(Computer computer) {
         List<ComputerPanelBox> boxs = new ArrayList<ComputerPanelBox>();
-        for(ComputerPanelBox box:  Hudson.getInstance().getExtensionList(ComputerPanelBox.class)){
+        for(ComputerPanelBox box:  Jenkins.getInstance().getExtensionList(ComputerPanelBox.class)){
             box.setComputer(computer);
             boxs.add(box);
         }

core/src/main/java/hudson/model/Fingerprint.java

@@ -729,7 +729,7 @@ public class Fingerprint implements ModelObject, Saveable {
         @Override
         public void onRenamed(Item item, String oldName, String newName) {
             if (item instanceof AbstractProject) {
-                AbstractProject p = Hudson.getInstance().getItemByFullName(newName, AbstractProject.class);
+                AbstractProject p = Jenkins.getInstance().getItemByFullName(newName, AbstractProject.class);
                 if (p != null) {
                     RunList builds = p.getBuilds();
                     for (Object build : builds) {

core/src/main/java/hudson/model/Hudson.java

@@ -67,7 +67,8 @@ public class Hudson extends Jenkins {
      */
     private transient final CopyOnWriteList<ComputerListener> computerListeners = ExtensionListView.createCopyOnWriteList(ComputerListener.class);
 
-
+    /** @deprecated Here only for compatibility. Use {@link Jenkins#getInstance} instead. */
+    @Deprecated
     @CLIResolver
     public static Hudson getInstance() {
         return (Hudson)Jenkins.getInstance();

core/src/main/java/hudson/model/ManageJenkinsAction.java

@@ -24,6 +24,7 @@
 package hudson.model;
 
 import hudson.Extension;
+import jenkins.model.Jenkins;
 
 /**
  * Adds the "Manage Jenkins" link to the top page.
@@ -33,7 +34,7 @@ import hudson.Extension;
 @Extension(ordinal=100)
 public class ManageJenkinsAction implements RootAction {
     public String getIconFileName() {
-        if (Hudson.getInstance().hasPermission(Hudson.ADMINISTER))
+        if (Jenkins.getInstance().hasPermission(Jenkins.ADMINISTER))
             return "setting.png";
         else
             return null;

core/src/main/java/hudson/model/View.java

@@ -255,7 +255,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
         try {
             return _getOwnerItemGroup();
         } catch (AbstractMethodError e) {
-            return Hudson.getInstance();
+            return Jenkins.getInstance();
         }
     }
 
@@ -283,7 +283,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
         try {
             return _getOwnerViewActions();
         } catch (AbstractMethodError e) {
-            return Hudson.getInstance().getActions();
+            return Jenkins.getInstance().getActions();
         }
     }
 

core/src/main/java/hudson/model/WorkspaceListener.java

@@ -3,6 +3,7 @@ package hudson.model;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.FilePath;
+import jenkins.model.Jenkins;
 
 public abstract class WorkspaceListener implements ExtensionPoint {
     
@@ -28,7 +29,7 @@ public abstract class WorkspaceListener implements ExtensionPoint {
      * All registered {@link WorkspaceListener}s.
      */
     public static ExtensionList<WorkspaceListener> all() {
-        return Hudson.getInstance().getExtensionList(WorkspaceListener.class);
+        return Jenkins.getInstance().getExtensionList(WorkspaceListener.class);
     }
 
 }

core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java

@@ -414,10 +414,6 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher {
         }
     }
 
-    private EnvVars getEnvVars(Hudson h) {
-        return getEnvVars(h.getGlobalNodeProperties());
-    }
-
     private EnvVars getEnvVars(Node n) {
         return getEnvVars(n.getNodeProperties());
     }

core/src/main/java/hudson/security/captcha/CaptchaSupport.java

@@ -28,10 +28,10 @@ import hudson.DescriptorExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
-import hudson.model.Hudson;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import jenkins.model.Jenkins;
 
 
 /**
@@ -52,7 +52,7 @@ public abstract class CaptchaSupport extends AbstractDescribableImpl<CaptchaSupp
      * Returns all the registered {@link CaptchaSupport} descriptors.
      */
     public static DescriptorExtensionList<CaptchaSupport, Descriptor<CaptchaSupport>> all() {
-        return Hudson.getInstance().<CaptchaSupport, Descriptor<CaptchaSupport>>getDescriptorList(CaptchaSupport.class);
+        return Jenkins.getInstance().<CaptchaSupport, Descriptor<CaptchaSupport>>getDescriptorList(CaptchaSupport.class);
     }
     
     abstract public  boolean validateCaptcha(String id, String text); 

core/src/main/java/jenkins/ExtensionComponentSet.java

@@ -28,7 +28,6 @@ import hudson.ExtensionComponent;
 import hudson.ExtensionFinder;
 import hudson.ExtensionPoint;
 import hudson.model.Descriptor;
-import hudson.model.Hudson;
 import jenkins.model.Jenkins;
 
 import java.util.Arrays;
@@ -113,7 +112,7 @@ public abstract class ExtensionComponentSet {
         return new ExtensionComponentSet() {
             @Override
             public <T> Collection<ExtensionComponent<T>> find(Class<T> type) {
-                return f.find(type,Hudson.getInstance());
+                return f.find(type,Jenkins.getInstance());
             }
         };
     }

core/src/main/resources/META-INF/upgrade/Hudson.hint

+hudson.model.Hudson.getInstance() => jenkins.model.Jenkins.getInstance();;

test/src/test/java/hudson/tasks/FingerprinterTest.java

@@ -34,7 +34,6 @@ import hudson.model.Fingerprint;
 import hudson.model.FingerprintCleanupThread;
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
-import hudson.model.Hudson;
 import hudson.model.Result;
 import hudson.util.RunList;
 import java.io.File;
@@ -47,6 +46,7 @@ import java.util.List;
 import static org.junit.Assert.*;
 
 import hudson.util.StreamTaskListener;
+import jenkins.model.Jenkins;
 import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -161,7 +161,7 @@ public class FingerprinterTest {
 
         upstreamBuild.delete();
 
-        Hudson.getInstance().rebuildDependencyGraph();
+        Jenkins.getInstance().rebuildDependencyGraph();
 
         List<AbstractProject> upstreamProjects = downstream.getUpstreamProjects();
         List<AbstractProject> downstreamProjects = upstream.getDownstreamProjects();