Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
f1669601
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,发现更多精彩内容 >>
提交
f1669601
编写于
4月 24, 2013
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-4543] Identify the short name of the plugin from the manifest.
上级
6ec5d518
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
27 addition
and
3 deletion
+27
-3
core/src/main/java/hudson/PluginManager.java
core/src/main/java/hudson/PluginManager.java
+27
-3
未找到文件。
core/src/main/java/hudson/PluginManager.java
浏览文件 @
f1669601
...
...
@@ -101,6 +101,7 @@ import java.util.concurrent.ConcurrentHashMap;
import
java.util.concurrent.ConcurrentMap
;
import
java.util.concurrent.CopyOnWriteArrayList
;
import
java.util.concurrent.Future
;
import
java.util.jar.JarFile
;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
org.xml.sax.Attributes
;
...
...
@@ -729,11 +730,19 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
if
(!
fileName
.
endsWith
(
".jpi"
)
&&
!
fileName
.
endsWith
(
".hpi"
)){
throw
new
Failure
(
hudson
.
model
.
Messages
.
Hudson_NotAPlugin
(
fileName
));
}
final
String
baseName
=
FilenameUtils
.
getBaseName
(
fileName
);
new
File
(
rootDir
,
baseName
+
".hpi"
).
delete
();
// don't keep confusing legacy *.hpi
fileItem
.
write
(
new
File
(
rootDir
,
baseName
+
".jpi"
));
// rename all new plugins to *.jpi
// first copy into a temporary file name
File
t
=
File
.
createTempFile
(
"uploaded"
,
"jp_"
,
rootDir
);
fileItem
.
write
(
t
);
// rename all new plugins to *.jpi
fileItem
.
delete
();
final
String
baseName
=
identifyPluginShortName
(
t
);
// and move the temp file into a proper name
new
File
(
rootDir
,
baseName
+
".hpi"
).
delete
();
// don't keep confusing legacy *.hpi
new
File
(
rootDir
,
baseName
+
".jpi"
).
delete
();
// rename can fail if the file already exists
t
.
renameTo
(
new
File
(
rootDir
,
baseName
+
".jpi"
));
PluginWrapper
existing
=
getPlugin
(
baseName
);
if
(
existing
!=
null
&&
existing
.
isBundled
){
existing
.
doPin
();
...
...
@@ -749,6 +758,21 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
}
protected
String
identifyPluginShortName
(
File
t
)
{
try
{
JarFile
j
=
new
JarFile
(
t
);
try
{
String
name
=
j
.
getManifest
().
getMainAttributes
().
getValue
(
"Short-Name"
);
if
(
name
!=
null
)
return
name
;
}
finally
{
j
.
close
();
}
}
catch
(
IOException
e
)
{
LOGGER
.
log
(
WARNING
,
"Failed to identify the short name from "
+
t
,
e
);
}
return
FilenameUtils
.
getBaseName
(
t
.
getName
());
// fall back to the base name of what's uploaded
}
public
Descriptor
<
ProxyConfiguration
>
getProxyDescriptor
()
{
return
Jenkins
.
getInstance
().
getDescriptor
(
ProxyConfiguration
.
class
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录