Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
46f2f02f
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
46f2f02f
编写于
1月 15, 2011
作者:
S
Seiji Sogabe
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED HUDSON-8438] Node names can be edited to include slashes and then cannot be removed.
上级
7fbb893f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
33 addition
and
22 deletion
+33
-22
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/slaves/NodeDescriptor.java
core/src/main/java/hudson/slaves/NodeDescriptor.java
+10
-4
core/src/main/resources/hudson/slaves/Messages.properties
core/src/main/resources/hudson/slaves/Messages.properties
+2
-1
core/src/main/resources/hudson/slaves/Messages_ja.properties
core/src/main/resources/hudson/slaves/Messages_ja.properties
+18
-17
未找到文件。
changelog.html
浏览文件 @
46f2f02f
...
...
@@ -48,6 +48,9 @@ Upcoming changes</a>
(
<a
href=
"http://issues.hudson-ci.org/browse/HUDSON-8415"
>
issue 8415
</a>
)
<li
class=
bug
>
Hudson was failing to record the connection termination problem in slave logs.
<li
class=
bug
>
Node names can be edited to include slashes and then cannot be removed.
(
<a
href=
"http://issues.hudson-ci.org/browse/HUDSON-8438"
>
issue 8437
</a>
)
<li
class=
rfe
>
Startup performance improvement
<li
class=
rfe
>
...
...
core/src/main/java/hudson/slaves/NodeDescriptor.java
浏览文件 @
46f2f02f
...
...
@@ -33,6 +33,7 @@ import hudson.util.DescriptorList;
import
hudson.util.FormValidation
;
import
hudson.DescriptorExtensionList
;
import
hudson.Util
;
import
hudson.model.Failure
;
import
java.io.IOException
;
import
java.util.List
;
...
...
@@ -96,10 +97,15 @@ public abstract class NodeDescriptor extends Descriptor<Node> {
}
public
FormValidation
doCheckName
(
@QueryParameter
String
value
)
{
if
(
Util
.
fixEmptyAndTrim
(
value
)==
null
)
return
FormValidation
.
error
(
"Name is mandatory"
);
else
return
FormValidation
.
ok
();
String
name
=
Util
.
fixEmptyAndTrim
(
value
);
if
(
name
==
null
)
return
FormValidation
.
error
(
Messages
.
NodeDescripter_CheckName_Mandatory
());
try
{
Hudson
.
checkGoodName
(
name
);
}
catch
(
Failure
f
)
{
return
FormValidation
.
error
(
f
.
getMessage
());
}
return
FormValidation
.
ok
();
}
/**
...
...
core/src/main/resources/hudson/slaves/Messages.properties
浏览文件 @
46f2f02f
# The MIT License
#
# Copyright (c) 2004-20
09
, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, Stephen Connolly
# Copyright (c) 2004-20
11
, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, Stephen Connolly
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
...
...
@@ -37,3 +37,4 @@ SimpleScheduledRetentionStrategy.FinishedUpTime=Computer has finished its schedu
SimpleScheduledRetentionStrategy.displayName
=
Take this slave on-line according to a schedule
EnvironmentVariablesNodeProperty.displayName
=
Environment variables
SlaveComputer.DisconnectedBy
=
Disconnected by {0}{1}
NodeDescripter.CheckName.Mandatory
=
Name is mandatory
core/src/main/resources/hudson/slaves/Messages_ja.properties
浏览文件 @
46f2f02f
# The MIT License
#
# Copyright (c) 2004-201
0
, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
# Copyright (c) 2004-201
1
, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
...
...
@@ -20,20 +20,21 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
RetentionStrategy.Always.displayName
=
\u
53
EF
\u
80FD
\u
306A
\u9650\u
308A
\u
30AA
\u
30F3
\u
30E9
\u
30A4
\u
30F3
\u
306E
\u
307E
\u
307E
\u
306B
\u3059\u
308B
RetentionStrategy.Demand.displayName
=
\u8981\u
6
C42
\u6642\u
306B
\u
306F
\u
30AA
\u
30F3
\u
30E9
\u
30A4
\u
30F3
\u
306B
\u3057\u3001\u
5F85
\u
6A5F
\u
4E2D
\u
306B
\u
306F
\u
30AA
\u
30D5
\u
30E9
\u
30A4
\u
30F3
\u
306B
\u3059\u
308B
RetentionStrategy.Demand.OfflineIdle
=
\u
30
B3
\u
30F3
\u
30D4
\u
30E5
\u
30FC
\u
30BF
\u
304C
\u
5F85
\u
6A5F
\u
4E2D
\u
306A
\u
306E
\u3067\u
30AA
\u
30D5
\u
30E9
\u
30A4
\u
30F3
\u3067\u3059\u3002\u
5FC5
\u8981\u
306B
\u
306A
\u3063\u
305F
\u3089\u
518D
\u3073\u
8D77
\u
52D5
\u3057\u
307E
\u3059\u3002
CommandLauncher.displayName
=
\u
30
DE
\u
30B9
\u
30BF
\u
30FC
\u3067\u
30B3
\u
30DE
\u
30F3
\u
30C9
\u3092\u
5B9F
\u
884C
\u3057\u3066\u
30B9
\u
30EC
\u
30FC
\u
30D6
\u3092\u
8D77
\u
52D
5
JNLPLauncher.displayName
=
JNLP
\u
7
D4C
\u7531\u3067\u
30B9
\u
30EC
\u
30FC
\u
30D6
\u3092\u
8D77
\u
52D
5
ComputerLauncher.unexpectedError
=
\u
30
B9
\u
30EC
\u
30FC
\u
30D6
\u
306E
\u
8D77
\u
52D5
\u
4E2D
\u
306B
\u
4E88
\u
671F
\u3057\u
306A
\u3044\u
30A8
\u
30E9
\u
30FC
\u
304C
\u
767A
\u
751F
\u3057\u
307E
\u3057\u
305F
\u3002\u3053\u
308C
\u
306F
\u
305F
\u3076\u3093
Hudson
\u
306E
\u
30D0
\u
30B
0
\u3067\u3059\u3002
ComputerLauncher.abortedLaunch
=
\u
30
B9
\u
30EC
\u
30FC
\u
30D6
\u
306E
\u
8D77
\u
52D5
\u
30D7
\u
30ED
\u
30BB
\u
30B9
\u
304C
\u
4E2D
\u
65AD
\u3057\u
307E
\u3057\u
305F
\u3002
CommandLauncher.NoLaunchCommand
=
\u
8
D77
\u
52D5
\u
30B3
\u
30DE
\u
30F3
\u
30C9
\u
304C
\u6307\u
5B9A
\u3055\u
308C
\u3066\u3044\u
307E
\u
305B
\u3093\u3002
ConnectionActivityMonitor.OfflineCause
=
\u
4
F55
\u
5EA6
\u3082
ping
\u
304C
\u5931\u6557\u3057\u
307E
\u3057\u
305F
\u3002
DumbSlave.displayName
=
\u
30
C0
\u
30E0
\u
30B9
\u
30EC
\u
30FC
\u
30D
6
RetentionStrategy.Always.displayName
=
\u
53
ef
\u
80fd
\u
306a
\u9650\u
308a
\u
30aa
\u
30f3
\u
30e9
\u
30a4
\u
30f3
\u
306e
\u
307e
\u
307e
\u
306b
\u3059\u
308b
RetentionStrategy.Demand.displayName
=
\u8981\u
6
c42
\u6642\u
306b
\u
306f
\u
30aa
\u
30f3
\u
30e9
\u
30a4
\u
30f3
\u
306b
\u3057\u3001\u
5f85
\u
6a5f
\u
4e2d
\u
306b
\u
306f
\u
30aa
\u
30d5
\u
30e9
\u
30a4
\u
30f3
\u
306b
\u3059\u
308b
RetentionStrategy.Demand.OfflineIdle
=
\u
30
b3
\u
30f3
\u
30d4
\u
30e5
\u
30fc
\u
30bf
\u
304c
\u
5f85
\u
6a5f
\u
4e2d
\u
306a
\u
306e
\u3067\u
30aa
\u
30d5
\u
30e9
\u
30a4
\u
30f3
\u3067\u3059\u3002\u
5fc5
\u8981\u
306b
\u
306a
\u3063\u
305f
\u3089\u
518d
\u3073\u
8d77
\u
52d5
\u3057\u
307e
\u3059\u3002
CommandLauncher.displayName
=
\u
30
de
\u
30b9
\u
30bf
\u
30fc
\u3067\u
30b3
\u
30de
\u
30f3
\u
30c9
\u3092\u
5b9f
\u
884c
\u3057\u3066\u
30b9
\u
30ec
\u
30fc
\u
30d6
\u3092\u
8d77
\u
52d
5
JNLPLauncher.displayName
=
JNLP
\u
7
d4c
\u7531\u3067\u
30b9
\u
30ec
\u
30fc
\u
30d6
\u3092\u
8d77
\u
52d
5
ComputerLauncher.unexpectedError
=
\u
30
b9
\u
30ec
\u
30fc
\u
30d6
\u
306e
\u
8d77
\u
52d5
\u
4e2d
\u
306b
\u
4e88
\u
671f
\u3057\u
306a
\u3044\u
30a8
\u
30e9
\u
30fc
\u
304c
\u
767a
\u
751f
\u3057\u
307e
\u3057\u
305f
\u3002\u3053\u
308c
\u
306f
\u
305f
\u3076\u3093
Hudson
\u
306e
\u
30d0
\u
30b
0
\u3067\u3059\u3002
ComputerLauncher.abortedLaunch
=
\u
30
b9
\u
30ec
\u
30fc
\u
30d6
\u
306e
\u
8d77
\u
52d5
\u
30d7
\u
30ed
\u
30bb
\u
30b9
\u
304c
\u
4e2d
\u
65ad
\u3057\u
307e
\u3057\u
305f
\u3002
CommandLauncher.NoLaunchCommand
=
\u
8
d77
\u
52d5
\u
30b3
\u
30de
\u
30f3
\u
30c9
\u
304c
\u6307\u
5b9a
\u3055\u
308c
\u3066\u3044\u
307e
\u
305b
\u3093\u3002
ConnectionActivityMonitor.OfflineCause
=
\u
4
f55
\u
5ea6
\u3082
ping
\u
304c
\u5931\u6557\u3057\u
307e
\u3057\u
305f
\u3002
DumbSlave.displayName
=
\u
30
c0
\u
30e0
\u
30b9
\u
30ec
\u
30fc
\u
30d
6
NodeProvisioner.EmptyString
=
OfflineCause.DisconnectedFromCLI
=
CLI
\u3068\u
306E
\u
63A5
\u
7D9A
\u
304C
\u5207\u
65AD
\u3055\u
308C
\u
307E
\u3057\u
305F
\u3002
OfflineCause.LaunchFailed
=
\u
30B9
\u
30EC
\u
30FC
\u
30D6
\u
30A8
\u
30FC
\u
30B8
\u
30A7
\u
30F3
\u
30C8
\u
306E
\u
8D77
\u
52D5
\u
306B
\u5931\u6557\u3057\u
305F
\u
305F
\u3081\u3001\u3053\u
306E
\u
30CE
\u
30FC
\u
30C9
\u
306F
\u
30AA
\u
30D5
\u
30E9
\u
30A4
\u
30F3
\u3067\u3059\u3002
SimpleScheduledRetentionStrategy.FinishedUpTime
=
\u
30B3
\u
30F3
\u
30D4
\u
30E5
\u
30FC
\u
30BF
\u
306E
\u
52D5
\u
4F5C
\u
53EF
\u
80FD
\u6642\u9593\u
304C
\u
7D42
\u
4E86
\u3057\u
307E
\u3057\u
305F
\u3002
SimpleScheduledRetentionStrategy.displayName
=
\u
30B9
\u
30B1
\u
30B8
\u
30E5
\u
30FC
\u
30EB
\u
306B
\u
5F93
\u3063\u3066\u
30AA
\u
30F3
\u
30E9
\u
30A4
\u
30F3
\u
306B
\u3059\u
308B
EnvironmentVariablesNodeProperty.displayName
=
\u
74B0
\u5883\u5909\u6570
SlaveComputer.DisconnectedBy
=
{0}
\u
304C
\u
30AA
\u
30D5
\u
30E9
\u
30A4
\u
30F3
\u
306B
\u3057\u3066\u3044\u
307E
\u3059\u3002
{1}
OfflineCause.DisconnectedFromCLI
=
CLI
\u3068\u
306e
\u
63a5
\u
7d9a
\u
304c
\u5207\u
65ad
\u3055\u
308c
\u
307e
\u3057\u
305f
\u3002
OfflineCause.LaunchFailed
=
\u
30b9
\u
30ec
\u
30fc
\u
30d6
\u
30a8
\u
30fc
\u
30b8
\u
30a7
\u
30f3
\u
30c8
\u
306e
\u
8d77
\u
52d5
\u
306b
\u5931\u6557\u3057\u
305f
\u
305f
\u3081\u3001\u3053\u
306e
\u
30ce
\u
30fc
\u
30c9
\u
306f
\u
30aa
\u
30d5
\u
30e9
\u
30a4
\u
30f3
\u3067\u3059\u3002
SimpleScheduledRetentionStrategy.FinishedUpTime
=
\u
30b3
\u
30f3
\u
30d4
\u
30e5
\u
30fc
\u
30bf
\u
306e
\u
52d5
\u
4f5c
\u
53ef
\u
80fd
\u6642\u9593\u
304c
\u
7d42
\u
4e86
\u3057\u
307e
\u3057\u
305f
\u3002
SimpleScheduledRetentionStrategy.displayName
=
\u
30b9
\u
30b1
\u
30b8
\u
30e5
\u
30fc
\u
30eb
\u
306b
\u
5f93
\u3063\u3066\u
30aa
\u
30f3
\u
30e9
\u
30a4
\u
30f3
\u
306b
\u3059\u
308b
EnvironmentVariablesNodeProperty.displayName
=
\u
74b0
\u5883\u5909\u6570
SlaveComputer.DisconnectedBy
=
{0}
\u
304c
\u
30aa
\u
30d5
\u
30e9
\u
30a4
\u
30f3
\u
306b
\u3057\u3066\u3044\u
307e
\u3059\u3002
{1}
NodeDescripter.CheckName.Mandatory
=
\u
30ce
\u
30fc
\u
30c9
\u
540d
\u
306f
\u
5fc5
\u9808\u3067\u3059\u3002
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录