← Back to branch summary

~ubuntu-branches/ubuntu/saucy/jenkins/saucy-proposed

« back to all changes in this revision

Viewing changes to core/src/main/java/hudson/model/ParametersDefinitionProperty.java

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-13 12:35:19 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130813123519-tizgfxcr70trl7r0
Tags: 1.509.2+dfsg-1
http://bugs.debian.org/706725
http://bugs.debian.org/701163
http://bugs.debian.org/704848
* New upstream release (Closes: #706725):
  - d/control: Update versioned BD's:
    * jenkins-executable-war >= 1.28.
    * jenkins-instance-identity >= 1.3.
    * libjenkins-remoting-java >= 2.23.
    * libjenkins-winstone-java >= 0.9.10-jenkins-44.
    * libstapler-java >= 1.207.
    * libjenkins-json-java >= 2.4-jenkins-1.
    * libstapler-adjunct-timeline-java >= 1.4.
    * libstapler-adjunct-codemirror-java >= 1.2.
    * libmaven-hpi-plugin-java >= 1.93.
    * libjenkins-xstream-java >= 1.4.4-jenkins-3.
  - d/maven.rules: Map to older version of animal-sniffer-maven-plugin.
  - Add patch for compatibility with guava >= 0.14.
  - Add patch to exclude asm4 dependency via jnr-posix.
  - Fixes the following security vulnerabilities:
    CVE-2013-2034, CVE-2013-2033, CVE-2013-2034, CVE-2013-1808
* d/patches/*: Switch to using git patch-queue for managing patches.
* De-duplicate jars between libjenkins-java and jenkins-external-job-monitor
  (Closes: #701163):
  - d/control: Add dependency between jenkins-external-job-monitor ->
    libjenkins-java.
  - d/rules: 
    Drop installation of jenkins-core in jenkins-external-job-monitor.
  - d/jenkins-external-job-monitor.{links,install}: Link to jenkins-core
    in /usr/share/java instead of included version.
* Wait longer for jenkins to stop during restarts (Closes: #704848):
  - d/jenkins.init: Re-sync init script from upstream codebase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/java/hudson/model/ParametersDefinitionProperty.java
35
35
import javax.servlet.ServletException;
36
36
 
37
37
import jenkins.model.Jenkins;
 
38
import jenkins.util.TimeDuration;
38
39
import net.sf.json.JSONArray;
39
40
import net.sf.json.JSONObject;
40
41
 
 
42
import org.kohsuke.stapler.QueryParameter;
41
43
import org.kohsuke.stapler.StaplerRequest;
42
44
import org.kohsuke.stapler.StaplerResponse;
43
45
import org.kohsuke.stapler.export.Exported;
100
102
        return (AbstractProject<?, ?>) owner;
101
103
    }
102
104
 
 
105
    public void _doBuild(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
 
106
        _doBuild(req,rsp,TimeDuration.fromString(req.getParameter("delay")));
 
107
    }
 
108
 
103
109
    /**
104
110
     * Interprets the form submission and schedules a build for a parameterized job.
105
111
     *
106
112
     * <p>
107
 
     * This method is supposed to be invoked from {@link AbstractProject#doBuild(StaplerRequest, StaplerResponse)}.
 
113
     * This method is supposed to be invoked from {@link AbstractProject#doBuild(StaplerRequest, StaplerResponse, TimeDuration)}.
108
114
     */
109
 
    public void _doBuild(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
 
115
    public void _doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
 
116
        if (delay==null)    delay=new TimeDuration(owner.getQuietPeriod());
 
117
 
 
118
 
110
119
        List<ParameterValue> values = new ArrayList<ParameterValue>();
111
120
        
112
121
        JSONObject formData = req.getSubmittedForm();
124
133
        }
125
134
 
126
135
        Jenkins.getInstance().getQueue().schedule(
127
 
                owner, owner.getDelay(req), new ParametersAction(values), new CauseAction(new Cause.UserIdCause()));
 
136
                owner, delay.getTime(), new ParametersAction(values), new CauseAction(new Cause.UserIdCause()));
128
137
 
129
138
        // send the user back to the job top page.
130
139
        rsp.sendRedirect(".");
131
140
    }
132
141
 
133
142
    public void buildWithParameters(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
 
143
        buildWithParameters(req,rsp,TimeDuration.fromString(req.getParameter("delay")));
 
144
    }
 
145
 
 
146
    public void buildWithParameters(StaplerRequest req, StaplerResponse rsp, TimeDuration delay) throws IOException, ServletException {
134
147
        List<ParameterValue> values = new ArrayList<ParameterValue>();
135
148
        for (ParameterDefinition d: parameterDefinitions) {
136
149
                ParameterValue value = d.createValue(req);
138
151
                        values.add(value);
139
152
                }
140
153
        }
 
154
        if (delay==null)    delay=new TimeDuration(owner.getQuietPeriod());
141
155
 
142
156
        Jenkins.getInstance().getQueue().schedule(
143
 
                owner, owner.getDelay(req), new ParametersAction(values), owner.getBuildCause(req));
 
157
                owner, delay.getTime(), new ParametersAction(values), owner.getBuildCause(req));
144
158
 
145
159
        if (requestWantsJson(req)) {
146
160
            rsp.setContentType("application/json");