From 8ca078eec581a3385793390d37e399adb6bd2899 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Wed, 12 Oct 2011 11:37:49 +0200 Subject: [PATCH] [FIXED JENKINS-11326] expose originalFileName as a (string) parameter --- changelog.html | 3 + .../java/hudson/model/FileParameterValue.java | 56 +++++++++++++------ 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/changelog.html b/changelog.html index 34cd29d1b1..24bf59c930 100644 --- a/changelog.html +++ b/changelog.html @@ -63,6 +63,9 @@ Upcoming changes (issue 11229)
  • Improved the classloading performance +
  • + Expose original file name as a String parameter on for FileParameters + (issue 11326) diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java index d686ff8700..88ac210993 100644 --- a/core/src/main/java/hudson/model/FileParameterValue.java +++ b/core/src/main/java/hudson/model/FileParameterValue.java @@ -23,27 +23,29 @@ */ package hudson.model; +import hudson.EnvVars; +import hudson.FilePath; +import hudson.Launcher; +import hudson.tasks.BuildWrapper; +import hudson.util.VariableResolver; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import javax.servlet.ServletException; + +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItem; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.disk.DiskFileItem; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.io.IOUtils; - -import hudson.tasks.BuildWrapper; -import hudson.Launcher; -import hudson.FilePath; - -import java.io.IOException; -import java.io.File; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.io.OutputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import javax.servlet.ServletException; /** * {@link ParameterValue} for {@link FileParameterDefinition}. @@ -86,6 +88,24 @@ public class FileParameterValue extends ParameterValue { this.location = location; } + + /** + * Exposes the originalFileName as an environment variable. + */ + @Override + public void buildEnvVars(AbstractBuild build, EnvVars env) { + env.put(name,originalFileName); + } + + @Override + public VariableResolver createVariableResolver(AbstractBuild build) { + return new VariableResolver() { + public String resolve(String name) { + return FileParameterValue.this.name.equals(name) ? originalFileName : null; + } + }; + } + /** * Get the name of the originally uploaded file. If this * {@link FileParameterValue} was created prior to 1.362, this method will