Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
a2341e6b
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
a2341e6b
编写于
8月 18, 2014
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-24251] Do not issue bogus warning about missing default JDK.
上级
9532b550
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
11 addition
and
6 deletion
+11
-6
core/src/main/java/hudson/model/AbstractProject.java
core/src/main/java/hudson/model/AbstractProject.java
+1
-1
core/src/main/java/hudson/model/JDK.java
core/src/main/java/hudson/model/JDK.java
+7
-0
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+1
-1
core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly
...urces/hudson/model/AbstractProject/configure-common.jelly
+2
-1
core/src/main/resources/hudson/model/AbstractProject/configure-common.properties
.../hudson/model/AbstractProject/configure-common.properties
+0
-1
core/src/main/resources/hudson/model/AbstractProject/configure-common_pt_BR.properties
...n/model/AbstractProject/configure-common_pt_BR.properties
+0
-2
未找到文件。
core/src/main/java/hudson/model/AbstractProject.java
浏览文件 @
a2341e6b
...
@@ -350,7 +350,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
...
@@ -350,7 +350,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
jdkTool
=
jdkTool
.
forNode
(
node
,
listener
);
jdkTool
=
jdkTool
.
forNode
(
node
,
listener
);
}
}
jdkTool
.
buildEnvVars
(
env
);
jdkTool
.
buildEnvVars
(
env
);
}
else
if
(
jdk
!=
null
)
{
}
else
if
(
jdk
!=
null
&&
!
jdk
.
equals
(
JDK
.
DEFAULT_NAME
)
)
{
listener
.
getLogger
().
println
(
"No JDK named ‘"
+
jdk
+
"’ found"
);
listener
.
getLogger
().
println
(
"No JDK named ‘"
+
jdk
+
"’ found"
);
}
}
...
...
core/src/main/java/hudson/model/JDK.java
浏览文件 @
a2341e6b
...
@@ -52,6 +52,13 @@ import org.kohsuke.stapler.DataBoundConstructor;
...
@@ -52,6 +52,13 @@ import org.kohsuke.stapler.DataBoundConstructor;
* @author Kohsuke Kawaguchi
* @author Kohsuke Kawaguchi
*/
*/
public
final
class
JDK
extends
ToolInstallation
implements
NodeSpecific
<
JDK
>,
EnvironmentSpecific
<
JDK
>
{
public
final
class
JDK
extends
ToolInstallation
implements
NodeSpecific
<
JDK
>,
EnvironmentSpecific
<
JDK
>
{
/**
* Name of the “default JDK”, meaning no specific JDK selected.
* @since 1.577
*/
public
static
final
String
DEFAULT_NAME
=
"(Default)"
;
/**
/**
* @deprecated since 2009-02-25
* @deprecated since 2009-02-25
*/
*/
...
...
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
a2341e6b
...
@@ -3598,7 +3598,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
...
@@ -3598,7 +3598,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
* If the user chose the default JDK, make sure we got 'java' in PATH.
* If the user chose the default JDK, make sure we got 'java' in PATH.
*/
*/
public
FormValidation
doDefaultJDKCheck
(
StaplerRequest
request
,
@QueryParameter
String
value
)
{
public
FormValidation
doDefaultJDKCheck
(
StaplerRequest
request
,
@QueryParameter
String
value
)
{
if
(!
value
.
equals
(
"(Default)"
))
if
(!
value
.
equals
(
JDK
.
DEFAULT_NAME
))
// assume the user configured named ones properly in system config ---
// assume the user configured named ones properly in system config ---
// or else system config should have reported form field validation errors.
// or else system config should have reported form field validation errors.
return
FormValidation
.
ok
();
return
FormValidation
.
ok
();
...
...
core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly
浏览文件 @
a2341e6b
...
@@ -37,7 +37,8 @@ THE SOFTWARE.
...
@@ -37,7 +37,8 @@ THE SOFTWARE.
<f:entry title="JDK"
<f:entry title="JDK"
description="${%JDK to be used for this project}">
description="${%JDK to be used for this project}">
<select class="setting-input validated" name="jdk" checkUrl="'${rootURL}/defaultJDKCheck?value='+this.value">
<select class="setting-input validated" name="jdk" checkUrl="'${rootURL}/defaultJDKCheck?value='+this.value">
<option>${%default.value}</option>
<j:getStatic var="DEFAULT_NAME" className="hudson.model.JDK" field="DEFAULT_NAME"/>
<option>${DEFAULT_NAME}</option>
<j:forEach var="inst" items="${jdks}">
<j:forEach var="inst" items="${jdks}">
<f:option selected="${inst.name==it.JDK.name}" value="${inst.name}">${inst.name}</f:option>
<f:option selected="${inst.name==it.JDK.name}" value="${inst.name}">${inst.name}</f:option>
</j:forEach>
</j:forEach>
...
...
core/src/main/resources/hudson/model/AbstractProject/configure-common.properties
浏览文件 @
a2341e6b
...
@@ -20,6 +20,5 @@
...
@@ -20,6 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
# THE SOFTWARE.
default.value
=
(Default)
Advanced\
Project\
Options
=
Advanced Project Options
Advanced\
Project\
Options
=
Advanced Project Options
Display\
Name
=
Display Name
Display\
Name
=
Display Name
core/src/main/resources/hudson/model/AbstractProject/configure-common_pt_BR.properties
浏览文件 @
a2341e6b
...
@@ -21,8 +21,6 @@
...
@@ -21,8 +21,6 @@
# THE SOFTWARE.
# THE SOFTWARE.
Advanced\
Project\
Options
=
Op
\u
00e7
\u
00f5es avan
\u
00e7adas do projeto
Advanced\
Project\
Options
=
Op
\u
00e7
\u
00f5es avan
\u
00e7adas do projeto
# (Default)
default.value
=
Default
Node
=
N
\u
00f3
Node
=
N
\u
00f3
Tie\
this\
project\
to\
a\
node
=
Vincular esse projeto a um n
\u
00f3
Tie\
this\
project\
to\
a\
node
=
Vincular esse projeto a um n
\u
00f3
Display\
Name
=
Nome de exibi
\u
00e7
\u
00e3o
Display\
Name
=
Nome de exibi
\u
00e7
\u
00e3o
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录