From 49ace47432e473b8f5febb6cc00f177be5854ffb Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 21 May 2009 18:22:02 +0000 Subject: [PATCH] Added automatic tool installation for Ant. - Most of the installer logic is made reusable in DownloadFromUrlInstaller. - ToolDescriptor can now contribute global.jelly to the system configuration page. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@18260 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/model/DownloadService.java | 35 +++- core/src/main/java/hudson/model/Hudson.java | 5 + .../java/hudson/model/UsageStatistics.java | 2 +- core/src/main/java/hudson/tasks/Ant.java | 132 +++++++++----- .../tools/DownloadFromUrlInstaller.java | 172 ++++++++++++++++++ .../main/java/hudson/tools/JDKInstaller.java | 27 +-- .../hudson/model/Hudson/configure.jelly | 17 +- .../Ant/{ => AntInstallation}/global.jelly | 22 ++- .../global_de.properties | 0 .../global_fr.properties | 0 .../global_ja.properties | 0 .../global_nl.properties | 0 .../global_pt_BR.properties | 0 .../global_ru.properties | 0 .../global_tr.properties | 0 .../DownloadFromUrlInstaller/config.jelly | 41 +++++ .../org/jvnet/hudson/test/HudsonTestCase.java | 8 + .../test/java/hudson/model/HudsonTest.java | 2 +- test/src/test/java/hudson/tasks/AntTest.java | 51 ++++++ .../java/hudson/tools/ToolLocationTest.java | 1 - 20 files changed, 424 insertions(+), 91 deletions(-) create mode 100644 core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java rename core/src/main/resources/hudson/tasks/Ant/{ => AntInstallation}/global.jelly (75%) rename core/src/main/resources/hudson/tasks/Ant/{ => AntInstallation}/global_de.properties (100%) rename core/src/main/resources/hudson/tasks/Ant/{ => AntInstallation}/global_fr.properties (100%) rename core/src/main/resources/hudson/tasks/Ant/{ => AntInstallation}/global_ja.properties (100%) rename core/src/main/resources/hudson/tasks/Ant/{ => AntInstallation}/global_nl.properties (100%) rename core/src/main/resources/hudson/tasks/Ant/{ => AntInstallation}/global_pt_BR.properties (100%) rename core/src/main/resources/hudson/tasks/Ant/{ => AntInstallation}/global_ru.properties (100%) rename core/src/main/resources/hudson/tasks/Ant/{ => AntInstallation}/global_tr.properties (100%) create mode 100644 core/src/main/resources/hudson/tools/DownloadFromUrlInstaller/config.jelly diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java index 4f9c55772f..e9a84933b4 100644 --- a/core/src/main/java/hudson/model/DownloadService.java +++ b/core/src/main/java/hudson/model/DownloadService.java @@ -5,6 +5,7 @@ import hudson.ExtensionList; import hudson.ExtensionPoint; import hudson.util.QuotedStringTokenizer; import hudson.util.TextFile; +import hudson.util.TimeUnit2; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.Stapler; @@ -39,7 +40,7 @@ public class DownloadService extends PageDecorator { long now = System.currentTimeMillis(); for (Downloadable d : Downloadable.all()) { if(d.getDue()downloadService.download(") + buf.append("