Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
072556e8
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,发现更多精彩内容 >>
提交
072556e8
编写于
12月 14, 2010
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
allowing TopLevelItems to be used under ItemGroups other than Hudson.
上级
4207cf93
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
34 addition
and
27 deletion
+34
-27
core/pom.xml
core/pom.xml
+2
-2
core/src/main/java/hudson/matrix/MatrixProject.java
core/src/main/java/hudson/matrix/MatrixProject.java
+5
-6
core/src/main/java/hudson/model/AbstractItem.java
core/src/main/java/hudson/model/AbstractItem.java
+5
-0
core/src/main/java/hudson/model/ExternalJob.java
core/src/main/java/hudson/model/ExternalJob.java
+3
-4
core/src/main/java/hudson/model/FreeStyleProject.java
core/src/main/java/hudson/model/FreeStyleProject.java
+7
-5
core/src/main/java/hudson/model/TopLevelItem.java
core/src/main/java/hudson/model/TopLevelItem.java
+1
-6
core/src/main/java/hudson/model/ViewJob.java
core/src/main/java/hudson/model/ViewJob.java
+7
-0
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+4
-4
未找到文件。
core/pom.xml
浏览文件 @
072556e8
...
...
@@ -61,7 +61,7 @@ THE SOFTWARE.
<plugin>
<groupId>
com.infradna.tool
</groupId>
<artifactId>
bridge-method-injector
</artifactId>
<version>
1.
3
</version>
<version>
1.
4
</version>
<executions>
<execution>
<goals>
...
...
@@ -410,7 +410,7 @@ THE SOFTWARE.
<dependency>
<groupId>
com.infradna.tool
</groupId>
<artifactId>
bridge-method-annotation
</artifactId>
<version>
1.
2
</version>
<version>
1.
4
</version>
</dependency>
<dependency>
<!-- until we get this version through Stapler -->
...
...
core/src/main/java/hudson/matrix/MatrixProject.java
浏览文件 @
072556e8
...
...
@@ -151,7 +151,11 @@ public class MatrixProject extends AbstractProject<MatrixProject,MatrixBuild> im
private
String
customWorkspace
;
public
MatrixProject
(
String
name
)
{
super
(
Hudson
.
getInstance
(),
name
);
this
(
Hudson
.
getInstance
(),
name
);
}
public
MatrixProject
(
ItemGroup
parent
,
String
name
)
{
super
(
parent
,
name
);
}
public
AxisList
getAxes
()
{
...
...
@@ -471,11 +475,6 @@ public class MatrixProject extends AbstractProject<MatrixProject,MatrixBuild> im
return
f
;
}
@Override
public
Hudson
getParent
()
{
return
Hudson
.
getInstance
();
}
/**
* @see #getJDKs()
*/
...
...
core/src/main/java/hudson/model/AbstractItem.java
浏览文件 @
072556e8
...
...
@@ -24,6 +24,7 @@
*/
package
hudson.model
;
import
com.infradna.tool.bridge_method_injector.WithBridgeMethods
;
import
hudson.XmlFile
;
import
hudson.Util
;
import
hudson.Functions
;
...
...
@@ -115,6 +116,10 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
return
parent
.
getRootDirFor
(
this
);
}
/**
* This bridge method is to maintain binary compatibility with {@link TopLevelItem#getParent()}.
*/
@WithBridgeMethods
(
value
=
Hudson
.
class
,
castRequired
=
true
)
public
ItemGroup
getParent
()
{
assert
parent
!=
null
;
return
parent
;
...
...
core/src/main/java/hudson/model/ExternalJob.java
浏览文件 @
072556e8
...
...
@@ -42,12 +42,11 @@ import java.io.IOException;
*/
public
class
ExternalJob
extends
ViewJob
<
ExternalJob
,
ExternalRun
>
implements
TopLevelItem
{
public
ExternalJob
(
String
name
)
{
super
(
Hudson
.
getInstance
(),
name
);
this
(
Hudson
.
getInstance
(),
name
);
}
@Override
public
Hudson
getParent
()
{
return
(
Hudson
)
super
.
getParent
();
public
ExternalJob
(
ItemGroup
parent
,
String
name
)
{
super
(
parent
,
name
);
}
@Override
...
...
core/src/main/java/hudson/model/FreeStyleProject.java
浏览文件 @
072556e8
...
...
@@ -46,18 +46,20 @@ public class FreeStyleProject extends Project<FreeStyleProject,FreeStyleBuild> i
*/
private
String
customWorkspace
;
/**
* @deprecated as of 1.390
*/
public
FreeStyleProject
(
Hudson
parent
,
String
name
)
{
super
(
parent
,
name
);
}
@Override
protected
Class
<
FreeStyleBuild
>
getBuildClass
()
{
return
FreeStyleBuild
.
class
;
public
FreeStyleProject
(
ItemGroup
parent
,
String
name
)
{
super
(
parent
,
name
);
}
@Override
p
ublic
Hudson
getParent
()
{
return
Hudson
.
getInstance
()
;
p
rotected
Class
<
FreeStyleBuild
>
getBuildClass
()
{
return
FreeStyleBuild
.
class
;
}
public
String
getCustomWorkspace
()
{
...
...
core/src/main/java/hudson/model/TopLevelItem.java
浏览文件 @
072556e8
...
...
@@ -23,8 +23,8 @@
*/
package
hudson.model
;
import
hudson.ExtensionPoint
;
import
hudson.Extension
;
import
hudson.ExtensionPoint
;
/**
* {@link Item} that can be directly displayed under {@link Hudson}.
...
...
@@ -36,11 +36,6 @@ import hudson.Extension;
* @author Kohsuke Kawaguchi
*/
public
interface
TopLevelItem
extends
Item
,
ExtensionPoint
,
Describable
<
TopLevelItem
>
{
/**
* By definition the parent of the top-level item is always {@link Hudson}.
*/
Hudson
getParent
();
/**
*
* @see Describable#getDescriptor()
...
...
core/src/main/java/hudson/model/ViewJob.java
浏览文件 @
072556e8
...
...
@@ -76,10 +76,17 @@ public abstract class ViewJob<JobT extends ViewJob<JobT,RunT>, RunT extends Run<
reloadThread
.
start
();
}
/**
* @deprecated as of 1.390
*/
protected
ViewJob
(
Hudson
parent
,
String
name
)
{
super
(
parent
,
name
);
}
protected
ViewJob
(
ItemGroup
parent
,
String
name
)
{
super
(
parent
,
name
);
}
public
boolean
isBuildable
()
{
return
false
;
}
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
浏览文件 @
072556e8
...
...
@@ -225,6 +225,10 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
new
DescribableList
<
BuildWrapper
,
Descriptor
<
BuildWrapper
>>(
this
);
public
MavenModuleSet
(
String
name
)
{
this
(
Hudson
.
getInstance
(),
name
);
}
public
MavenModuleSet
(
ItemGroup
parent
,
String
name
)
{
super
(
Hudson
.
getInstance
(),
name
);
}
...
...
@@ -233,10 +237,6 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
return
"."
;
}
public
Hudson
getParent
()
{
return
Hudson
.
getInstance
();
}
public
Collection
<
MavenModule
>
getItems
()
{
return
modules
.
values
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录