From 4b6758b89bbab9994f25d19df683fc76e9225e6c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 3 Nov 2008 21:52:23 +0000 Subject: [PATCH] check the presence of the .NET framwork before attempting the service installation git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@12953 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/lifecycle/WindowsInstallerLink.java | 5 +++++ .../main/java/hudson/lifecycle/WindowsSlaveInstaller.java | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java index dbb0c30ddd..33f95855c7 100644 --- a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java +++ b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java @@ -5,6 +5,7 @@ import hudson.model.Hudson; import hudson.AbortException; import hudson.FilePath; import hudson.util.StreamTaskListener; +import hudson.util.jna.DotNet; import hudson.Launcher.LocalLauncher; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; @@ -77,6 +78,10 @@ public class WindowsInstallerLink extends ManagementLink { sendError("Installation is already complete",req,rsp); return; } + if(!DotNet.isInstalled(2,0)) { + sendError(".NET Framework 2.0 or later is required for this feature",req,rsp); + return; + } Hudson.getInstance().checkPermission(Hudson.ADMINISTER); diff --git a/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java b/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java index 75e22b1544..d1f33f3ce9 100644 --- a/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java +++ b/core/src/main/java/hudson/lifecycle/WindowsSlaveInstaller.java @@ -7,6 +7,7 @@ import hudson.remoting.Engine; import hudson.remoting.jnlp.MainDialog; import hudson.remoting.jnlp.MainMenu; import hudson.util.StreamTaskListener; +import hudson.util.jna.DotNet; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.ByteArrayOutputStream; @@ -75,6 +76,13 @@ public class WindowsSlaveInstaller implements Callable, A JOptionPane.OK_CANCEL_OPTION); if(r!=JOptionPane.OK_OPTION) return; + if(!DotNet.isInstalled(2,0)) { + JOptionPane.showMessageDialog(dialog,".NET Framework 2.0 or later is required for this feature", + Messages.WindowsInstallerLink_DisplayName(), + JOptionPane.ERROR_MESSAGE); + return; + } + final File dir = new File(rootDir);