Switched from annotation based scheme to a function based scheme.

core/src/main/java/hudson/Launcher.java

@@ -38,7 +38,7 @@ import hudson.remoting.VirtualChannel;
 import hudson.util.StreamCopyThread;
 import hudson.util.ArgumentListBuilder;
 import hudson.util.ProcessTree;
-import jenkins.security.MasterToSlave;
+import jenkins.security.MasterToSlaveCallable;
 import org.apache.commons.io.input.NullInputStream;
 
 import java.io.BufferedOutputStream;
@@ -888,8 +888,7 @@ public abstract class Launcher {
             getChannel().call(new KillTask(modelEnvVars));
         }
 
-        @MasterToSlave
-        private static final class KillTask implements Callable<Void,RuntimeException> {
+        private static final class KillTask extends MasterToSlaveCallable<Void,RuntimeException> {
             private final Map<String, String> modelEnvVars;
 
             public KillTask(Map<String, String> modelEnvVars) {
@@ -964,8 +963,7 @@ public abstract class Launcher {
         IOTriplet getIOtriplet();
     }
 
-    @MasterToSlave
-    private static class RemoteLaunchCallable implements Callable<RemoteProcess,IOException> {
+    private static class RemoteLaunchCallable extends MasterToSlaveCallable<RemoteProcess,IOException> {
         private final List<String> cmd;
         private final boolean[] masks;
         private final String[] env;
@@ -1035,8 +1033,7 @@ public abstract class Launcher {
         private static final long serialVersionUID = 1L;
     }
 
-    @MasterToSlave
-    private static class RemoteChannelLaunchCallable implements Callable<OutputStream,IOException> {
+    private static class RemoteChannelLaunchCallable extends MasterToSlaveCallable<OutputStream,IOException> {
         private final String[] cmd;
         private final Pipe out;
         private final String workDir;