提交 e59283e6 编写于 作者: S sogabe

added RemoteCause for triggering build remotely.


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15542 71c3de6d-444a-0410-be80-ed276b4c234a
上级 8647389b
......@@ -31,6 +31,7 @@ import hudson.Util;
import hudson.maven.MavenModule;
import hudson.model.Cause.LegacyCodeCause;
import hudson.model.Cause.UserCause;
import hudson.model.Cause.RemoteCause;
import hudson.model.Descriptor.FormException;
import hudson.model.Fingerprint.RangeSet;
import hudson.model.RunMap.Constructor;
......@@ -1067,6 +1068,13 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
return;
}
Cause cause;
if (authToken != null && authToken.getToken() != null && req.getParameter("token") != null) {
cause = new RemoteCause(req.getRemoteAddr());
} else {
cause = new UserCause();
}
String delay = req.getParameter("delay");
if (delay!=null) {
if (!isDisabled()) {
......@@ -1075,17 +1083,17 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
if(delay.endsWith("sec")) delay=delay.substring(0,delay.length()-3);
if(delay.endsWith("secs")) delay=delay.substring(0,delay.length()-4);
Hudson.getInstance().getQueue().add(this, Integer.parseInt(delay),
new CauseAction(new UserCause()));
new CauseAction(cause));
} catch (NumberFormatException e) {
throw new ServletException("Invalid delay parameter value: "+delay);
}
}
} else {
scheduleBuild(new UserCause());
scheduleBuild(cause);
}
rsp.forwardToPreviousPage(req);
}
/**
* Supports build trigger with parameters via an HTTP GET or POST.
* Currently only String parameters are supported.
......
......@@ -97,4 +97,18 @@ public abstract class Cause {
return Messages.Cause_UserCause_HTMLDescription(authenticationName, Stapler.getCurrentRequest().getContextPath());
}
}
public static class RemoteCause extends Cause {
private String addr;
public RemoteCause(String addr) {
this.addr = addr;
}
@Override
public String getShortDescription() {
return Messages.Cause_RemoteCause_ShortDescription(addr);
}
}
}
......@@ -183,3 +183,4 @@ Cause.UpstreamCause.ShortDescription=Started by upstream project "{0}" build num
Cause.UpstreamCause.HTMLDescription=Started by upstream project <a href="{3}/{2}">{0}</a> build number <a href="{3}/{2}{1}/">{1}</a>
Cause.UserCause.ShortDescription=Started by user {0}
Cause.UserCause.HTMLDescription=Started by user <a href="{1}/user/{0}/">{0}</a>
Cause.RemoteCause.ShortDescription=Started from remote {0}
......@@ -178,4 +178,5 @@ Cause.LegacyCodeCause.ShortDescription=\u975E\u63A8\u5968\u306E\u30B3\u30FC\u30C
Cause.UpstreamCause.ShortDescription=\u4E0A\u6D41\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8"{0}"\u306E#{1}\u304C\u5B9F\u884C\u3000
Cause.UpstreamCause.HTMLDescription=\u4E0A\u6D41\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8<a href="{3}/{2}">{0}</a>\u306E#<a href="{3}/{2}{1}/">{1}</a>\u304C\u5B9F\u884C
Cause.UserCause.ShortDescription=\u30E6\u30FC\u30B6\u30FC{0}\u304C\u5B9F\u884C
Cause.UserCause.HTMLDescription=\u30E6\u30FC\u30B6\u30FC<a href="{1}/user/{0}/">{0}</a>\u304C\u5B9F\u884C
\ No newline at end of file
Cause.UserCause.HTMLDescription=\u30E6\u30FC\u30B6\u30FC<a href="{1}/user/{0}/">{0}</a>\u304C\u5B9F\u884C
Cause.RemoteCause.ShortDescription=\u30EA\u30E2\u30FC\u30C8{0}\u304B\u3089\u5B9F\u884C
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册