Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
155bbf50
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
155bbf50
编写于
10月 13, 2015
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ResourceUtils supports Tomcat's "war:jar:" URL format
Issue: SPR-13393
上级
b15f4047
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
16 addition
and
5 deletion
+16
-5
spring-core/src/main/java/org/springframework/util/ResourceUtils.java
...src/main/java/org/springframework/util/ResourceUtils.java
+10
-5
spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
...est/java/org/springframework/util/ResourceUtilsTests.java
+6
-0
未找到文件。
spring-core/src/main/java/org/springframework/util/ResourceUtils.java
浏览文件 @
155bbf50
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -69,6 +69,9 @@ public abstract class ResourceUtils {
/** URL protocol for an entry from a zip file: "zip" */
public
static
final
String
URL_PROTOCOL_ZIP
=
"zip"
;
/** URL protocol for an entry from a Tomcat war file: "war" */
public
static
final
String
URL_PROTOCOL_WAR
=
"war"
;
/** URL protocol for an entry from a WebSphere jar file: "wsjar" */
public
static
final
String
URL_PROTOCOL_WSJAR
=
"wsjar"
;
...
...
@@ -275,7 +278,8 @@ public abstract class ResourceUtils {
public
static
boolean
isJarURL
(
URL
url
)
{
String
protocol
=
url
.
getProtocol
();
return
(
URL_PROTOCOL_JAR
.
equals
(
protocol
)
||
URL_PROTOCOL_ZIP
.
equals
(
protocol
)
||
URL_PROTOCOL_VFSZIP
.
equals
(
protocol
)
||
URL_PROTOCOL_WSJAR
.
equals
(
protocol
));
URL_PROTOCOL_WAR
.
equals
(
protocol
)
||
URL_PROTOCOL_WSJAR
.
equals
(
protocol
)
||
URL_PROTOCOL_VFSZIP
.
equals
(
protocol
));
}
/**
...
...
@@ -299,9 +303,10 @@ public abstract class ResourceUtils {
*/
public
static
URL
extractJarFileURL
(
URL
jarUrl
)
throws
MalformedURLException
{
String
urlFile
=
jarUrl
.
getFile
();
int
separatorIndex
=
urlFile
.
indexOf
(
JAR_URL_SEPARATOR
);
if
(
separatorIndex
!=
-
1
)
{
String
jarFile
=
urlFile
.
substring
(
0
,
separatorIndex
);
int
startIndex
=
(
urlFile
.
startsWith
(
JAR_URL_PREFIX
)
?
JAR_URL_PREFIX
.
length
()
:
0
);
int
endIndex
=
urlFile
.
indexOf
(
JAR_URL_SEPARATOR
);
if
(
endIndex
!=
-
1
)
{
String
jarFile
=
urlFile
.
substring
(
startIndex
,
endIndex
);
try
{
return
new
URL
(
jarFile
);
}
...
...
spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
浏览文件 @
155bbf50
...
...
@@ -35,6 +35,7 @@ public class ResourceUtilsTests {
assertTrue
(
ResourceUtils
.
isJarURL
(
new
URL
(
"jar:file:myjar.jar!/mypath"
)));
assertTrue
(
ResourceUtils
.
isJarURL
(
new
URL
(
null
,
"zip:file:myjar.jar!/mypath"
,
new
DummyURLStreamHandler
())));
assertTrue
(
ResourceUtils
.
isJarURL
(
new
URL
(
null
,
"wsjar:file:myjar.jar!/mypath"
,
new
DummyURLStreamHandler
())));
assertTrue
(
ResourceUtils
.
isJarURL
(
new
URL
(
null
,
"war:jar:file:myjar.jar!/mypath"
,
new
DummyURLStreamHandler
())));
assertFalse
(
ResourceUtils
.
isJarURL
(
new
URL
(
"file:myjar.jar"
)));
assertFalse
(
ResourceUtils
.
isJarURL
(
new
URL
(
"http:myserver/myjar.jar"
)));
}
...
...
@@ -49,12 +50,17 @@ public class ResourceUtilsTests {
ResourceUtils
.
extractJarFileURL
(
new
URL
(
null
,
"zip:file:myjar.jar!/mypath"
,
new
DummyURLStreamHandler
())));
assertEquals
(
new
URL
(
"file:myjar.jar"
),
ResourceUtils
.
extractJarFileURL
(
new
URL
(
null
,
"wsjar:file:myjar.jar!/mypath"
,
new
DummyURLStreamHandler
())));
assertEquals
(
new
URL
(
"file:myjar.jar"
),
ResourceUtils
.
extractJarFileURL
(
new
URL
(
null
,
"war:jar:file:myjar.jar!/mypath"
,
new
DummyURLStreamHandler
())));
assertEquals
(
new
URL
(
"file:myjar.jar"
),
ResourceUtils
.
extractJarFileURL
(
new
URL
(
"jar:file:myjar.jar!/"
)));
assertEquals
(
new
URL
(
"file:myjar.jar"
),
ResourceUtils
.
extractJarFileURL
(
new
URL
(
null
,
"zip:file:myjar.jar!/"
,
new
DummyURLStreamHandler
())));
assertEquals
(
new
URL
(
"file:myjar.jar"
),
ResourceUtils
.
extractJarFileURL
(
new
URL
(
null
,
"wsjar:file:myjar.jar!/"
,
new
DummyURLStreamHandler
())));
assertEquals
(
new
URL
(
"file:myjar.jar"
),
ResourceUtils
.
extractJarFileURL
(
new
URL
(
null
,
"war:jar:file:myjar.jar!/"
,
new
DummyURLStreamHandler
())));
assertEquals
(
new
URL
(
"file:myjar.jar"
),
ResourceUtils
.
extractJarFileURL
(
new
URL
(
"file:myjar.jar"
)));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录