Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
e9dfb229
Commit
e9dfb229
authored
Dec 14, 2015
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish contribution
Closes gh-4753
parent
ad1ae8df
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
SpringApplication.java
...main/java/org/springframework/boot/SpringApplication.java
+12
-11
No files found.
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View file @
e9dfb229
...
...
@@ -145,16 +145,6 @@ import org.springframework.web.context.support.StandardServletEnvironment;
*/
public
class
SpringApplication
{
/**
* The banner location property value used to load default banner.
*/
public
static
final
String
BANNER_LOCATION_PROPERTY_VALUE
=
"banner.txt"
;
/**
* The banner location property key.
*/
public
static
final
String
BANNER_LOCATION_PROPERTY
=
"banner.location"
;
/**
* The class name of application context that will be used by default for non-web
* environments.
...
...
@@ -172,6 +162,16 @@ public class SpringApplication {
private
static
final
String
[]
WEB_ENVIRONMENT_CLASSES
=
{
"javax.servlet.Servlet"
,
"org.springframework.web.context.ConfigurableWebApplicationContext"
};
/**
* Default banner location.
*/
public
static
final
String
BANNER_LOCATION_PROPERTY_VALUE
=
"banner.txt"
;
/**
* Banner location property key.
*/
public
static
final
String
BANNER_LOCATION_PROPERTY
=
"banner.location"
;
private
static
final
String
CONFIGURABLE_WEB_ENVIRONMENT_CLASS
=
"org.springframework.web.context.ConfigurableWebEnvironment"
;
private
static
final
String
SYSTEM_PROPERTY_JAVA_AWT_HEADLESS
=
"java.awt.headless"
;
...
...
@@ -546,7 +546,8 @@ public class SpringApplication {
}
private
Banner
selectBanner
(
Environment
environment
)
{
String
location
=
environment
.
getProperty
(
BANNER_LOCATION_PROPERTY
,
BANNER_LOCATION_PROPERTY_VALUE
);
String
location
=
environment
.
getProperty
(
BANNER_LOCATION_PROPERTY
,
BANNER_LOCATION_PROPERTY_VALUE
);
ResourceLoader
resourceLoader
=
this
.
resourceLoader
!=
null
?
this
.
resourceLoader
:
new
DefaultResourceLoader
(
getClassLoader
());
Resource
resource
=
resourceLoader
.
getResource
(
location
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment