Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
27949aab
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
27949aab
编写于
12月 17, 2018
作者:
M
Matt Sicker
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into flaky-util-test
上级
685fb49c
bcc4e4fe
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
40 addition
and
41 deletion
+40
-41
core/src/main/java/hudson/slaves/SlaveComputer.java
core/src/main/java/hudson/slaves/SlaveComputer.java
+11
-5
core/src/main/resources/lib/layout/copyButton/clipboard.png
core/src/main/resources/lib/layout/copyButton/clipboard.png
+0
-0
core/src/main/resources/lib/layout/copyButton/copyButton.css
core/src/main/resources/lib/layout/copyButton/copyButton.css
+5
-2
core/src/main/resources/lib/layout/copyButton/copyButton.js
core/src/main/resources/lib/layout/copyButton/copyButton.js
+21
-31
essentials.yml
essentials.yml
+2
-2
pom.xml
pom.xml
+1
-1
未找到文件。
core/src/main/java/hudson/slaves/SlaveComputer.java
浏览文件 @
27949aab
...
...
@@ -76,7 +76,6 @@ import org.kohsuke.stapler.interceptor.RequirePOST;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
import
javax.annotation.OverridingMethodsMustInvokeSuper
;
import
javax.servlet.ServletException
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.InputStream
;
...
...
@@ -716,7 +715,7 @@ public class SlaveComputer extends Computer {
}
@RequirePOST
public
HttpResponse
doDoDisconnect
(
@QueryParameter
String
offlineMessage
)
throws
IOException
,
ServletException
{
public
HttpResponse
doDoDisconnect
(
@QueryParameter
String
offlineMessage
)
{
if
(
channel
!=
null
)
{
//does nothing in case computer is already disconnected
checkPermission
(
DISCONNECT
);
...
...
@@ -741,11 +740,18 @@ public class SlaveComputer extends Computer {
}
@RequirePOST
public
void
doLaunchSlaveAgent
(
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
,
ServletException
{
@Override
public
void
doLaunchSlaveAgent
(
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
{
checkPermission
(
CONNECT
);
if
(
channel
!=
null
)
{
req
.
getView
(
this
,
"already-launched.jelly"
).
forward
(
req
,
rsp
);
try
{
req
.
getView
(
this
,
"already-launched.jelly"
).
forward
(
req
,
rsp
);
}
catch
(
IOException
x
)
{
throw
x
;
}
catch
(
/*Servlet*/
Exception
x
)
{
throw
new
IOException
(
x
);
}
return
;
}
...
...
@@ -778,7 +784,7 @@ public class SlaveComputer extends Computer {
}
@WebMethod
(
name
=
"slave-agent.jnlp"
)
public
HttpResponse
doSlaveAgentJnlp
(
StaplerRequest
req
,
StaplerResponse
res
)
throws
IOException
,
ServletException
{
public
HttpResponse
doSlaveAgentJnlp
(
StaplerRequest
req
,
StaplerResponse
res
)
{
return
new
EncryptedSlaveAgentJnlpFile
(
this
,
"slave-agent.jnlp.jelly"
,
getName
(),
CONNECT
);
}
...
...
core/src/main/resources/lib/layout/copyButton/clipboard.png
已删除
100644 → 0
浏览文件 @
685fb49c
此差异由.gitattributes 抑制。
core/src/main/resources/lib/layout/copyButton/copyButton.css
浏览文件 @
27949aab
.copy-button
{
display
:
inline-block
;
}
.copy-button
BUTTON
{
background
:
url('clipboard.png')
center
center
no-repeat
;
.copy-button
button
{
background-image
:
url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHZlcnNpb249IjEuMSIgIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBmaWxsPSJyZ2IoMCwwLDApIiBkPSJNMTcsOUg3VjdIMTdNMTcsMTNIN1YxMUgxN00xNCwxN0g3VjE1SDE0TTEyLDNBMSwxIDAgMCwxIDEzLDRBMSwxIDAgMCwxIDEyLDVBMSwxIDAgMCwxIDExLDRBMSwxIDAgMCwxIDEyLDNNMTksM0gxNC44MkMxNC40LDEuODQgMTMuMywxIDEyLDFDMTAuNywxIDkuNiwxLjg0IDkuMTgsM0g1QTIsMiAwIDAsMCAzLDVWMTlBMiwyIDAgMCwwIDUsMjFIMTlBMiwyIDAgMCwwIDIxLDE5VjVBMiwyIDAgMCwwIDE5LDNaIiAvPjwvc3ZnPg==')
;
background-size
:
18px
;
background-position
:
center
center
;
background-repeat
:
no-repeat
;
width
:
20px
;
height
:
20px
;
}
core/src/main/resources/lib/layout/copyButton/copyButton.js
浏览文件 @
27949aab
// @include org.kohsuke.stapler.zeroclipboard
Behaviour
.
specify
(
"
span.copy-button
"
,
'
copyButton
'
,
0
,
function
(
e
)
{
var
btn
=
e
.
firstChild
;
var
id
=
"
copy-button
"
+
(
iota
++
);
btn
.
id
=
id
;
var
btn
=
e
.
firstChild
;
var
id
=
"
copy-button
"
+
(
iota
++
);
btn
.
id
=
id
;
makeButton
(
btn
,
function
()
{
//make an invisible textarea element containing the text
var
el
=
document
.
createElement
(
'
textarea
'
);
el
.
value
=
e
.
getAttribute
(
"
text
"
);
el
.
style
.
width
=
"
1px
"
;
el
.
style
.
height
=
"
1px
"
;
el
.
style
.
border
=
"
none
"
;
el
.
style
.
padding
=
"
0px
"
;
document
.
body
.
appendChild
(
el
);
var
clip
=
new
ZeroClipboard
(
e
);
makeButton
(
btn
);
clip
.
setHandCursor
(
true
);
//select the text and copy it to the clipboard
el
.
select
(
);
document
.
execCommand
(
'
copy
'
);
var
container
=
e
.
getAttribute
(
"
container
"
);
if
(
container
)
{
container
=
$
(
e
).
up
(
container
);
container
.
style
.
position
=
"
relative
"
;
}
//remove the textarea element
document
.
body
.
removeChild
(
el
);
clip
.
on
(
'
datarequested
'
,
function
()
{
clip
.
setText
(
e
.
getAttribute
(
"
text
"
));
});
clip
.
on
(
'
complete
'
,
function
()
{
notificationBar
.
show
(
e
.
getAttribute
(
"
message
"
));
});
clip
.
on
(
'
mouseOver
'
,
function
()
{
$
(
id
).
addClassName
(
'
yui-button-hover
'
)
});
clip
.
on
(
'
mouseOut
'
,
function
()
{
$
(
id
).
removeClassName
(
'
yui-button-hover
'
)
});
clip
.
on
(
'
mouseDown
'
,
function
()
{
$
(
id
).
addClassName
(
'
yui-button-active
'
)
});
clip
.
on
(
'
mouseUp
'
,
function
()
{
$
(
id
).
removeClassName
(
'
yui-button-active
'
)
});
//show the notification
notificationBar
.
show
(
e
.
getAttribute
(
"
message
"
));
});
});
essentials.yml
浏览文件 @
27949aab
---
ath
:
useLocalSnapshots
:
false
athRevision
:
"
06caf67d37d945ec5228a80d73714fac692c28d3
"
athImage
:
"
jenkins/ath:acceptance-test-harness-1.6
2
"
athRevision
:
"
809fb7629c311ebddc6cada91fc865a950155bb0
"
athImage
:
"
jenkins/ath:acceptance-test-harness-1.6
3
"
categories
:
-
org.jenkinsci.test.acceptance.junit.SmokeTest
pom.xml
浏览文件 @
27949aab
...
...
@@ -76,7 +76,7 @@ THE SOFTWARE.
</issueManagement>
<properties>
<revision>
2.15
6
</revision>
<revision>
2.15
7
</revision>
<changelist>
-SNAPSHOT
</changelist>
<!-- *.html files are in UTF-8, and *.properties are in iso-8859-1, so this configuration is actually incorrect,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录