Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Meiracle
spring-framework
提交
1899fb37
S
spring-framework
项目概览
Meiracle
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
1899fb37
编写于
2月 22, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
a3789120
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
15 deletion
+7
-15
spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
.../org/springframework/core/io/support/EncodedResource.java
+4
-4
spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java
...pringframework/core/io/support/PropertiesLoaderUtils.java
+2
-2
spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
...java/org/springframework/test/context/ActiveProfiles.java
+1
-9
未找到文件。
spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
浏览文件 @
1899fb37
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -52,7 +52,7 @@ public class EncodedResource implements InputStreamSource {
/**
* Create a new {@code EncodedResource} for the given {@code Resource},
* not specifying an explicit encoding or {@code Charset}.
* @param resource the {@code Resource} to hold
; never {@code null}
* @param resource the {@code Resource} to hold
(never {@code null})
*/
public
EncodedResource
(
Resource
resource
)
{
this
(
resource
,
null
,
null
);
...
...
@@ -61,7 +61,7 @@ public class EncodedResource implements InputStreamSource {
/**
* Create a new {@code EncodedResource} for the given {@code Resource},
* using the specified {@code encoding}.
* @param resource the {@code Resource} to hold
; never {@code null}
* @param resource the {@code Resource} to hold
(never {@code null})
* @param encoding the encoding to use for reading from the resource
*/
public
EncodedResource
(
Resource
resource
,
String
encoding
)
{
...
...
@@ -71,7 +71,7 @@ public class EncodedResource implements InputStreamSource {
/**
* Create a new {@code EncodedResource} for the given {@code Resource},
* using the specified {@code Charset}.
* @param resource the {@code Resource} to hold
; never {@code null}
* @param resource the {@code Resource} to hold
(never {@code null})
* @param charset the {@code Charset} to use for reading from the resource
*/
public
EncodedResource
(
Resource
resource
,
Charset
charset
)
{
...
...
spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java
浏览文件 @
1899fb37
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -183,7 +183,7 @@ public abstract class PropertiesLoaderUtils {
ResourceUtils
.
useCachesIfNecessary
(
con
);
InputStream
is
=
con
.
getInputStream
();
try
{
if
(
resourceName
!=
null
&&
resourceName
.
endsWith
(
XML_FILE_EXTENSION
))
{
if
(
resourceName
.
endsWith
(
XML_FILE_EXTENSION
))
{
props
.
loadFromXML
(
is
);
}
else
{
...
...
spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
浏览文件 @
1899fb37
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -51,7 +51,6 @@ public @interface ActiveProfiles {
/**
* Alias for {@link #profiles}.
*
* <p>This attribute may <strong>not</strong> be used in conjunction with
* {@link #profiles}, but it may be used <em>instead</em> of {@link #profiles}.
*/
...
...
@@ -60,7 +59,6 @@ public @interface ActiveProfiles {
/**
* The bean definition profiles to activate.
*
* <p>This attribute may <strong>not</strong> be used in conjunction with
* {@link #value}, but it may be used <em>instead</em> of {@link #value}.
*/
...
...
@@ -70,7 +68,6 @@ public @interface ActiveProfiles {
/**
* The type of {@link ActiveProfilesResolver} to use for resolving the active
* bean definition profiles programmatically.
*
* @since 4.0
* @see ActiveProfilesResolver
*/
...
...
@@ -79,18 +76,15 @@ public @interface ActiveProfiles {
/**
* Whether or not bean definition profiles from superclasses should be
* <em>inherited</em>.
*
* <p>The default value is {@code true}, which means that a test
* class will <em>inherit</em> bean definition profiles defined by a
* test superclass. Specifically, the bean definition profiles for a test
* class will be appended to the list of bean definition profiles
* defined by a test superclass. Thus, subclasses have the option of
* <em>extending</em> the list of bean definition profiles.
*
* <p>If {@code inheritProfiles} is set to {@code false}, the bean
* definition profiles for the test class will <em>shadow</em> and
* effectively replace any bean definition profiles defined by a superclass.
*
* <p>In the following example, the {@code ApplicationContext} for
* {@code BaseTest} will be loaded using only the "base"
* bean definition profile; beans defined in the "extended" profile
...
...
@@ -110,11 +104,9 @@ public @interface ActiveProfiles {
* // ...
* }
* </pre>
*
* <p>Note: {@code @ActiveProfiles} can be used when loading an
* {@code ApplicationContext} from path-based resource locations or
* annotated classes.
*
* @see ContextConfiguration#locations
* @see ContextConfiguration#classes
* @see ContextConfiguration#inheritLocations
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录