Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
5db814b6
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,发现更多精彩内容 >>
未验证
提交
5db814b6
编写于
4月 09, 2019
作者:
B
Baptiste Mathus
提交者:
GitHub
4月 09, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2691 from daniel-beck/JENKINS-40750
[FIX JENKINS-40750] Remove cc.xml from core
上级
93306358
b206e3c5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
83 deletion
+5
-83
core/src/main/java/hudson/Functions.java
core/src/main/java/hudson/Functions.java
+5
-32
core/src/main/resources/hudson/model/View/builds.jelly
core/src/main/resources/hudson/model/View/builds.jelly
+0
-3
core/src/main/resources/hudson/model/View/cc.xml.jelly
core/src/main/resources/hudson/model/View/cc.xml.jelly
+0
-48
未找到文件。
core/src/main/java/hudson/Functions.java
浏览文件 @
5db814b6
...
...
@@ -1556,30 +1556,13 @@ public class Functions {
/**
* Converts the Hudson build status to CruiseControl build status,
* which is either Success, Failure, Exception, or Unknown.
*
* @deprecated This functionality has been moved to ccxml plugin.
*/
@Deprecated
@Restricted
(
DoNotUse
.
class
)
@RestrictedSince
(
"since TODO"
)
public
static
String
toCCStatus
(
Item
i
)
{
if
(
i
instanceof
Job
)
{
Job
j
=
(
Job
)
i
;
switch
(
j
.
getIconColor
())
{
case
ABORTED:
case
ABORTED_ANIME:
case
RED:
case
RED_ANIME:
case
YELLOW:
case
YELLOW_ANIME:
return
"Failure"
;
case
BLUE:
case
BLUE_ANIME:
return
"Success"
;
case
DISABLED:
case
DISABLED_ANIME:
case
GREY:
case
GREY_ANIME:
case
NOTBUILT:
case
NOTBUILT_ANIME:
return
"Unknown"
;
}
}
return
"Unknown"
;
}
...
...
@@ -2071,14 +2054,4 @@ public class Functions {
return
true
;
}
}
@Restricted
(
NoExternalUse
.
class
)
// for cc.xml.jelly
public
static
Collection
<
TopLevelItem
>
getCCItems
(
View
v
)
{
if
(
Stapler
.
getCurrentRequest
().
getParameter
(
"recursive"
)
!=
null
)
{
return
v
.
getOwner
().
getItemGroup
().
getAllItems
(
TopLevelItem
.
class
);
}
else
{
return
v
.
getItems
();
}
}
}
core/src/main/resources/hudson/model/View/builds.jelly
浏览文件 @
5db814b6
...
...
@@ -38,9 +38,6 @@ THE SOFTWARE.
</j:if>
<div style="height:2em"/><!-- spacer -->
<div>
<a href="cc.xml">${%Export as plain XML}</a> (<a href="cc.xml?recursive">${%Recurse in subfolders}</a>)
</div>
<t:buildListTable builds="${it.builds}"/>
</l:main-panel>
</l:layout>
...
...
core/src/main/resources/hudson/model/View/cc.xml.jelly
已删除
100644 → 0
浏览文件 @
93306358
<!--
The MIT License
Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<!--
Generate status XML compatible with CruiseControl.
See http://confluence.public.thoughtworks.org/display/CI/Multiple+Project+Summary+Reporting+Standard
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<st:contentType value="text/xml;charset=UTF-8" />
<j:new var="h" className="hudson.Functions" />
<Projects>
<j:forEach var="p" items="${h.getCCItems(it)}">
<j:set var="lb" value="${p.lastCompletedBuild}"/>
<j:if test="${lb!=null}">
<Project name="${p.fullDisplayName}"
activity="${p.isBuilding() ? 'Building' : 'Sleeping'}"
lastBuildStatus="${h.toCCStatus(p)}"
lastBuildLabel="${lb.number}"
lastBuildTime="${lb.timestampString2}"
webUrl="${app.rootUrl}${p.url}"
/>
</j:if>
</j:forEach>
</Projects>
</j:jelly>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录