Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CSDN专家-深度学习进阶
jenkins
提交
24052ea5
J
jenkins
项目概览
CSDN专家-深度学习进阶
/
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,发现更多精彩内容 >>
提交
24052ea5
编写于
11月 15, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Deprecating Hudson.getInstance.
上级
15ac490a
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
21 addition
and
21 deletion
+21
-21
core/src/main/java/hudson/ExtensionFinder.java
core/src/main/java/hudson/ExtensionFinder.java
+2
-2
core/src/main/java/hudson/model/AbstractProject.java
core/src/main/java/hudson/model/AbstractProject.java
+1
-1
core/src/main/java/hudson/model/Computer.java
core/src/main/java/hudson/model/Computer.java
+1
-1
core/src/main/java/hudson/model/ComputerPanelBox.java
core/src/main/java/hudson/model/ComputerPanelBox.java
+2
-1
core/src/main/java/hudson/model/Fingerprint.java
core/src/main/java/hudson/model/Fingerprint.java
+1
-1
core/src/main/java/hudson/model/Hudson.java
core/src/main/java/hudson/model/Hudson.java
+2
-1
core/src/main/java/hudson/model/ManageJenkinsAction.java
core/src/main/java/hudson/model/ManageJenkinsAction.java
+2
-1
core/src/main/java/hudson/model/View.java
core/src/main/java/hudson/model/View.java
+2
-2
core/src/main/java/hudson/model/WorkspaceListener.java
core/src/main/java/hudson/model/WorkspaceListener.java
+2
-1
core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java
...java/hudson/os/windows/ManagedWindowsServiceLauncher.java
+0
-4
core/src/main/java/hudson/security/captcha/CaptchaSupport.java
...src/main/java/hudson/security/captcha/CaptchaSupport.java
+2
-2
core/src/main/java/jenkins/ExtensionComponentSet.java
core/src/main/java/jenkins/ExtensionComponentSet.java
+1
-2
core/src/main/resources/META-INF/upgrade/Hudson.hint
core/src/main/resources/META-INF/upgrade/Hudson.hint
+1
-0
test/src/test/java/hudson/tasks/FingerprinterTest.java
test/src/test/java/hudson/tasks/FingerprinterTest.java
+2
-2
未找到文件。
core/src/main/java/hudson/ExtensionFinder.java
浏览文件 @
24052ea5
...
@@ -256,7 +256,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
...
@@ -256,7 +256,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
private
Map
<
Class
<?
extends
Annotation
>,
GuiceExtensionAnnotation
<?>>
extensionAnnotations
=
Maps
.
newHashMap
();
private
Map
<
Class
<?
extends
Annotation
>,
GuiceExtensionAnnotation
<?>>
extensionAnnotations
=
Maps
.
newHashMap
();
public
GuiceFinder
()
{
public
GuiceFinder
()
{
for
(
ExtensionComponent
<
GuiceExtensionAnnotation
>
ec
:
moduleFinder
.
find
(
GuiceExtensionAnnotation
.
class
,
Hudson
.
getInstance
()))
{
for
(
ExtensionComponent
<
GuiceExtensionAnnotation
>
ec
:
moduleFinder
.
find
(
GuiceExtensionAnnotation
.
class
,
Jenkins
.
getInstance
()))
{
GuiceExtensionAnnotation
gea
=
ec
.
getInstance
();
GuiceExtensionAnnotation
gea
=
ec
.
getInstance
();
extensionAnnotations
.
put
(
gea
.
annotationType
,
gea
);
extensionAnnotations
.
put
(
gea
.
annotationType
,
gea
);
}
}
...
@@ -274,7 +274,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
...
@@ -274,7 +274,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
});
});
modules
.
add
(
new
SezpozModule
(
sezpozIndex
));
modules
.
add
(
new
SezpozModule
(
sezpozIndex
));
for
(
ExtensionComponent
<
Module
>
ec
:
moduleFinder
.
find
(
Module
.
class
,
Hudson
.
getInstance
()))
{
for
(
ExtensionComponent
<
Module
>
ec
:
moduleFinder
.
find
(
Module
.
class
,
Jenkins
.
getInstance
()))
{
modules
.
add
(
ec
.
getInstance
());
modules
.
add
(
ec
.
getInstance
());
}
}
...
...
core/src/main/java/hudson/model/AbstractProject.java
浏览文件 @
24052ea5
...
@@ -2329,7 +2329,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
...
@@ -2329,7 +2329,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
* @see Items#findNearest
* @see Items#findNearest
*/
*/
public
static
AbstractProject
findNearest
(
String
name
)
{
public
static
AbstractProject
findNearest
(
String
name
)
{
return
findNearest
(
name
,
Hudson
.
getInstance
());
return
findNearest
(
name
,
Jenkins
.
getInstance
());
}
}
/**
/**
...
...
core/src/main/java/hudson/model/Computer.java
浏览文件 @
24052ea5
...
@@ -929,7 +929,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
...
@@ -929,7 +929,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
}
}
// TODO: hmm, they don't really belong
// TODO: hmm, they don't really belong
String
rootUrl
=
Hudson
.
getInstance
().
getRootUrl
();
String
rootUrl
=
Jenkins
.
getInstance
().
getRootUrl
();
if
(
rootUrl
!=
null
)
{
if
(
rootUrl
!=
null
)
{
env
.
put
(
"HUDSON_URL"
,
rootUrl
);
// Legacy.
env
.
put
(
"HUDSON_URL"
,
rootUrl
);
// Legacy.
env
.
put
(
"JENKINS_URL"
,
rootUrl
);
env
.
put
(
"JENKINS_URL"
,
rootUrl
);
...
...
core/src/main/java/hudson/model/ComputerPanelBox.java
浏览文件 @
24052ea5
...
@@ -3,6 +3,7 @@ package hudson.model;
...
@@ -3,6 +3,7 @@ package hudson.model;
import
hudson.ExtensionPoint
;
import
hudson.ExtensionPoint
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
jenkins.model.Jenkins
;
/**
/**
* Adds box rendered in the computer side panel.
* Adds box rendered in the computer side panel.
...
@@ -37,7 +38,7 @@ public abstract class ComputerPanelBox implements ExtensionPoint{
...
@@ -37,7 +38,7 @@ public abstract class ComputerPanelBox implements ExtensionPoint{
*/
*/
public
static
List
<
ComputerPanelBox
>
all
(
Computer
computer
)
{
public
static
List
<
ComputerPanelBox
>
all
(
Computer
computer
)
{
List
<
ComputerPanelBox
>
boxs
=
new
ArrayList
<
ComputerPanelBox
>();
List
<
ComputerPanelBox
>
boxs
=
new
ArrayList
<
ComputerPanelBox
>();
for
(
ComputerPanelBox
box:
Hudson
.
getInstance
().
getExtensionList
(
ComputerPanelBox
.
class
)){
for
(
ComputerPanelBox
box:
Jenkins
.
getInstance
().
getExtensionList
(
ComputerPanelBox
.
class
)){
box
.
setComputer
(
computer
);
box
.
setComputer
(
computer
);
boxs
.
add
(
box
);
boxs
.
add
(
box
);
}
}
...
...
core/src/main/java/hudson/model/Fingerprint.java
浏览文件 @
24052ea5
...
@@ -729,7 +729,7 @@ public class Fingerprint implements ModelObject, Saveable {
...
@@ -729,7 +729,7 @@ public class Fingerprint implements ModelObject, Saveable {
@Override
@Override
public
void
onRenamed
(
Item
item
,
String
oldName
,
String
newName
)
{
public
void
onRenamed
(
Item
item
,
String
oldName
,
String
newName
)
{
if
(
item
instanceof
AbstractProject
)
{
if
(
item
instanceof
AbstractProject
)
{
AbstractProject
p
=
Hudson
.
getInstance
().
getItemByFullName
(
newName
,
AbstractProject
.
class
);
AbstractProject
p
=
Jenkins
.
getInstance
().
getItemByFullName
(
newName
,
AbstractProject
.
class
);
if
(
p
!=
null
)
{
if
(
p
!=
null
)
{
RunList
builds
=
p
.
getBuilds
();
RunList
builds
=
p
.
getBuilds
();
for
(
Object
build
:
builds
)
{
for
(
Object
build
:
builds
)
{
...
...
core/src/main/java/hudson/model/Hudson.java
浏览文件 @
24052ea5
...
@@ -67,7 +67,8 @@ public class Hudson extends Jenkins {
...
@@ -67,7 +67,8 @@ public class Hudson extends Jenkins {
*/
*/
private
transient
final
CopyOnWriteList
<
ComputerListener
>
computerListeners
=
ExtensionListView
.
createCopyOnWriteList
(
ComputerListener
.
class
);
private
transient
final
CopyOnWriteList
<
ComputerListener
>
computerListeners
=
ExtensionListView
.
createCopyOnWriteList
(
ComputerListener
.
class
);
/** @deprecated Here only for compatibility. Use {@link Jenkins#getInstance} instead. */
@Deprecated
@CLIResolver
@CLIResolver
public
static
Hudson
getInstance
()
{
public
static
Hudson
getInstance
()
{
return
(
Hudson
)
Jenkins
.
getInstance
();
return
(
Hudson
)
Jenkins
.
getInstance
();
...
...
core/src/main/java/hudson/model/ManageJenkinsAction.java
浏览文件 @
24052ea5
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
package
hudson.model
;
package
hudson.model
;
import
hudson.Extension
;
import
hudson.Extension
;
import
jenkins.model.Jenkins
;
/**
/**
* Adds the "Manage Jenkins" link to the top page.
* Adds the "Manage Jenkins" link to the top page.
...
@@ -33,7 +34,7 @@ import hudson.Extension;
...
@@ -33,7 +34,7 @@ import hudson.Extension;
@Extension
(
ordinal
=
100
)
@Extension
(
ordinal
=
100
)
public
class
ManageJenkinsAction
implements
RootAction
{
public
class
ManageJenkinsAction
implements
RootAction
{
public
String
getIconFileName
()
{
public
String
getIconFileName
()
{
if
(
Hudson
.
getInstance
().
hasPermission
(
Hudson
.
ADMINISTER
))
if
(
Jenkins
.
getInstance
().
hasPermission
(
Jenkins
.
ADMINISTER
))
return
"setting.png"
;
return
"setting.png"
;
else
else
return
null
;
return
null
;
...
...
core/src/main/java/hudson/model/View.java
浏览文件 @
24052ea5
...
@@ -255,7 +255,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
...
@@ -255,7 +255,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
try
{
try
{
return
_getOwnerItemGroup
();
return
_getOwnerItemGroup
();
}
catch
(
AbstractMethodError
e
)
{
}
catch
(
AbstractMethodError
e
)
{
return
Hudson
.
getInstance
();
return
Jenkins
.
getInstance
();
}
}
}
}
...
@@ -283,7 +283,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
...
@@ -283,7 +283,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
try
{
try
{
return
_getOwnerViewActions
();
return
_getOwnerViewActions
();
}
catch
(
AbstractMethodError
e
)
{
}
catch
(
AbstractMethodError
e
)
{
return
Hudson
.
getInstance
().
getActions
();
return
Jenkins
.
getInstance
().
getActions
();
}
}
}
}
...
...
core/src/main/java/hudson/model/WorkspaceListener.java
浏览文件 @
24052ea5
...
@@ -3,6 +3,7 @@ package hudson.model;
...
@@ -3,6 +3,7 @@ package hudson.model;
import
hudson.ExtensionList
;
import
hudson.ExtensionList
;
import
hudson.ExtensionPoint
;
import
hudson.ExtensionPoint
;
import
hudson.FilePath
;
import
hudson.FilePath
;
import
jenkins.model.Jenkins
;
public
abstract
class
WorkspaceListener
implements
ExtensionPoint
{
public
abstract
class
WorkspaceListener
implements
ExtensionPoint
{
...
@@ -28,7 +29,7 @@ public abstract class WorkspaceListener implements ExtensionPoint {
...
@@ -28,7 +29,7 @@ public abstract class WorkspaceListener implements ExtensionPoint {
* All registered {@link WorkspaceListener}s.
* All registered {@link WorkspaceListener}s.
*/
*/
public
static
ExtensionList
<
WorkspaceListener
>
all
()
{
public
static
ExtensionList
<
WorkspaceListener
>
all
()
{
return
Hudson
.
getInstance
().
getExtensionList
(
WorkspaceListener
.
class
);
return
Jenkins
.
getInstance
().
getExtensionList
(
WorkspaceListener
.
class
);
}
}
}
}
core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java
浏览文件 @
24052ea5
...
@@ -414,10 +414,6 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher {
...
@@ -414,10 +414,6 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher {
}
}
}
}
private
EnvVars
getEnvVars
(
Hudson
h
)
{
return
getEnvVars
(
h
.
getGlobalNodeProperties
());
}
private
EnvVars
getEnvVars
(
Node
n
)
{
private
EnvVars
getEnvVars
(
Node
n
)
{
return
getEnvVars
(
n
.
getNodeProperties
());
return
getEnvVars
(
n
.
getNodeProperties
());
}
}
...
...
core/src/main/java/hudson/security/captcha/CaptchaSupport.java
浏览文件 @
24052ea5
...
@@ -28,10 +28,10 @@ import hudson.DescriptorExtensionList;
...
@@ -28,10 +28,10 @@ import hudson.DescriptorExtensionList;
import
hudson.ExtensionPoint
;
import
hudson.ExtensionPoint
;
import
hudson.model.AbstractDescribableImpl
;
import
hudson.model.AbstractDescribableImpl
;
import
hudson.model.Descriptor
;
import
hudson.model.Descriptor
;
import
hudson.model.Hudson
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.io.OutputStream
;
import
jenkins.model.Jenkins
;
/**
/**
...
@@ -52,7 +52,7 @@ public abstract class CaptchaSupport extends AbstractDescribableImpl<CaptchaSupp
...
@@ -52,7 +52,7 @@ public abstract class CaptchaSupport extends AbstractDescribableImpl<CaptchaSupp
* Returns all the registered {@link CaptchaSupport} descriptors.
* Returns all the registered {@link CaptchaSupport} descriptors.
*/
*/
public
static
DescriptorExtensionList
<
CaptchaSupport
,
Descriptor
<
CaptchaSupport
>>
all
()
{
public
static
DescriptorExtensionList
<
CaptchaSupport
,
Descriptor
<
CaptchaSupport
>>
all
()
{
return
Hudson
.
getInstance
().<
CaptchaSupport
,
Descriptor
<
CaptchaSupport
>>
getDescriptorList
(
CaptchaSupport
.
class
);
return
Jenkins
.
getInstance
().<
CaptchaSupport
,
Descriptor
<
CaptchaSupport
>>
getDescriptorList
(
CaptchaSupport
.
class
);
}
}
abstract
public
boolean
validateCaptcha
(
String
id
,
String
text
);
abstract
public
boolean
validateCaptcha
(
String
id
,
String
text
);
...
...
core/src/main/java/jenkins/ExtensionComponentSet.java
浏览文件 @
24052ea5
...
@@ -28,7 +28,6 @@ import hudson.ExtensionComponent;
...
@@ -28,7 +28,6 @@ import hudson.ExtensionComponent;
import
hudson.ExtensionFinder
;
import
hudson.ExtensionFinder
;
import
hudson.ExtensionPoint
;
import
hudson.ExtensionPoint
;
import
hudson.model.Descriptor
;
import
hudson.model.Descriptor
;
import
hudson.model.Hudson
;
import
jenkins.model.Jenkins
;
import
jenkins.model.Jenkins
;
import
java.util.Arrays
;
import
java.util.Arrays
;
...
@@ -113,7 +112,7 @@ public abstract class ExtensionComponentSet {
...
@@ -113,7 +112,7 @@ public abstract class ExtensionComponentSet {
return
new
ExtensionComponentSet
()
{
return
new
ExtensionComponentSet
()
{
@Override
@Override
public
<
T
>
Collection
<
ExtensionComponent
<
T
>>
find
(
Class
<
T
>
type
)
{
public
<
T
>
Collection
<
ExtensionComponent
<
T
>>
find
(
Class
<
T
>
type
)
{
return
f
.
find
(
type
,
Hudson
.
getInstance
());
return
f
.
find
(
type
,
Jenkins
.
getInstance
());
}
}
};
};
}
}
...
...
core/src/main/resources/META-INF/upgrade/Hudson.hint
0 → 100644
浏览文件 @
24052ea5
hudson.model.Hudson.getInstance() => jenkins.model.Jenkins.getInstance();;
test/src/test/java/hudson/tasks/FingerprinterTest.java
浏览文件 @
24052ea5
...
@@ -34,7 +34,6 @@ import hudson.model.Fingerprint;
...
@@ -34,7 +34,6 @@ import hudson.model.Fingerprint;
import
hudson.model.FingerprintCleanupThread
;
import
hudson.model.FingerprintCleanupThread
;
import
hudson.model.FreeStyleBuild
;
import
hudson.model.FreeStyleBuild
;
import
hudson.model.FreeStyleProject
;
import
hudson.model.FreeStyleProject
;
import
hudson.model.Hudson
;
import
hudson.model.Result
;
import
hudson.model.Result
;
import
hudson.util.RunList
;
import
hudson.util.RunList
;
import
java.io.File
;
import
java.io.File
;
...
@@ -47,6 +46,7 @@ import java.util.List;
...
@@ -47,6 +46,7 @@ import java.util.List;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
junit
.
Assert
.*;
import
hudson.util.StreamTaskListener
;
import
hudson.util.StreamTaskListener
;
import
jenkins.model.Jenkins
;
import
org.junit.Assume
;
import
org.junit.Assume
;
import
org.junit.BeforeClass
;
import
org.junit.BeforeClass
;
import
org.junit.Rule
;
import
org.junit.Rule
;
...
@@ -161,7 +161,7 @@ public class FingerprinterTest {
...
@@ -161,7 +161,7 @@ public class FingerprinterTest {
upstreamBuild
.
delete
();
upstreamBuild
.
delete
();
Hudson
.
getInstance
().
rebuildDependencyGraph
();
Jenkins
.
getInstance
().
rebuildDependencyGraph
();
List
<
AbstractProject
>
upstreamProjects
=
downstream
.
getUpstreamProjects
();
List
<
AbstractProject
>
upstreamProjects
=
downstream
.
getUpstreamProjects
();
List
<
AbstractProject
>
downstreamProjects
=
upstream
.
getDownstreamProjects
();
List
<
AbstractProject
>
downstreamProjects
=
upstream
.
getDownstreamProjects
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录