From aaf1bf29e630ad251efc21b962987d8d2be32f6d Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 13 Nov 2012 20:53:27 +0100
Subject: [PATCH] integrating new installers

---
 changelog.html                                         |  2 ++
 .../java/hudson/lifecycle/WindowsSlaveInstaller.java   |  3 +++
 core/src/main/java/hudson/os/SU.java                   |  2 ++
 core/src/main/java/hudson/slaves/SlaveComputer.java    |  2 +-
 war/pom.xml                                            | 10 ++++++++++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index 21106fbacd..5a721ec994 100644
--- a/changelog.html
+++ b/changelog.html
@@ -75,6 +75,8 @@ Upcoming changes</a>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15408">issue 15408</a>)
   <li class=bug>
     Failure to initialie the SSH daemon shouldn't fail the boot.
+  <li class=rfe>
+    Added new GUI-based slave installer for upstart
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java b/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java
index 09c5da284e..9a92824bc0 100644
--- a/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java
+++ b/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java
@@ -57,6 +57,9 @@ import static javax.swing.JOptionPane.*;
 
 /**
  * @author Kohsuke Kawaguchi
+ * @deprecated as of 1.491
+ *      The functionality is moved to windows-slave-installer-module to support
+ *      multiple platforms uniformly.
  */
 public class WindowsSlaveInstaller implements Callable<Void,RuntimeException>, ActionListener {
     /**
diff --git a/core/src/main/java/hudson/os/SU.java b/core/src/main/java/hudson/os/SU.java
index 4bd33957f5..b254f54c43 100644
--- a/core/src/main/java/hudson/os/SU.java
+++ b/core/src/main/java/hudson/os/SU.java
@@ -62,6 +62,8 @@ public abstract class SU {
     /**
      * Returns a {@link VirtualChannel} that's connected to the priviledge-escalated environment.
      *
+     * @param listener
+     *      What this method is doing (such as what process it's invoking) will be sent here.
      * @return
      *      Never null. This may represent a channel to a separate JVM, or just {@link LocalChannel}.
      *      Close this channel and the SU environment will be shut down.
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index fa16b13518..05311ba5f4 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -365,7 +365,7 @@ public class SlaveComputer extends Computer {
         channel.pinClassLoader(getClass().getClassLoader());
 
         channel.call(new SlaveInitializer());
-        channel.call(new WindowsSlaveInstaller(remoteFs));
+//        channel.call(new WindowsSlaveInstaller(remoteFs));
         for (ComputerListener cl : ComputerListener.all())
             cl.preOnline(this,channel,root,taskListener);
 
diff --git a/war/pom.xml b/war/pom.xml
index 55fd5fa1c6..f32bd3ae65 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -117,9 +117,19 @@ THE SOFTWARE.
       <artifactId>ssh-cli-auth</artifactId>
       <version>1.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.modules</groupId>
+      <artifactId>windows-slave-installer</artifactId>
+      <version>1.0</version>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>launchd-slave-installer</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.modules</groupId>
+      <artifactId>upstart-slave-installer</artifactId>
       <version>1.0</version>
     </dependency>
     <dependency>
-- 
GitLab