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
f4f668a5
Commit
f4f668a5
authored
Nov 26, 2013
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
c5911e86
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
16 additions
and
14 deletions
+16
-14
pom.xml
spring-boot-actuator/pom.xml
+3
-3
CrshAutoConfiguration.java
...ork/boot/actuate/autoconfigure/CrshAutoConfiguration.java
+0
-1
PropertyPlaceholderAutoConfigurationTests.java
...oconfigure/PropertyPlaceholderAutoConfigurationTests.java
+2
-0
RepositoryConfigurationFactory.java
...ork/boot/cli/compiler/RepositoryConfigurationFactory.java
+2
-0
pom.xml
spring-boot-dependencies/pom.xml
+4
-4
SampleProfileApplicationTests.java
...rk/boot/sample/profile/SampleProfileApplicationTests.java
+2
-1
PropertiesConfigurationFactory.java
...ngframework/boot/bind/PropertiesConfigurationFactory.java
+0
-1
RelaxedDataBinder.java
...java/org/springframework/boot/bind/RelaxedDataBinder.java
+0
-1
RelaxedNames.java
...main/java/org/springframework/boot/bind/RelaxedNames.java
+1
-1
JettyEmbeddedServletContainerFactory.java
.../embedded/jetty/JettyEmbeddedServletContainerFactory.java
+1
-1
TomcatEmbeddedServletContainerFactory.java
...mbedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+1
-1
No files found.
spring-boot-actuator/pom.xml
View file @
f4f668a5
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
<dependency>
<dependency>
<groupId>
org.springframework.security
</groupId>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-config
</artifactId>
<artifactId>
spring-security-config
</artifactId>
<optional>
true
</optional>
<optional>
true
</optional>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.apache.tomcat.embed
</groupId>
<groupId>
org.apache.tomcat.embed
</groupId>
...
@@ -79,9 +79,9 @@
...
@@ -79,9 +79,9 @@
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.jolokia
</groupId>
<groupId>
org.jolokia
</groupId>
<artifactId>
jolokia-core
</artifactId>
<artifactId>
jolokia-core
</artifactId>
<optional>
true
</optional>
<optional>
true
</optional>
</dependency>
</dependency>
<!-- Test -->
<!-- Test -->
<dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<groupId>
org.springframework
</groupId>
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
View file @
f4f668a5
...
@@ -374,7 +374,6 @@ public class CrshAutoConfiguration {
...
@@ -374,7 +374,6 @@ public class CrshAutoConfiguration {
return
plugins
;
return
plugins
;
}
}
@SuppressWarnings
(
"rawtypes"
)
protected
boolean
isEnabled
(
CRaSHPlugin
<?>
plugin
)
{
protected
boolean
isEnabled
(
CRaSHPlugin
<?>
plugin
)
{
Assert
.
notNull
(
plugin
,
"Plugin must not be null"
);
Assert
.
notNull
(
plugin
,
"Plugin must not be null"
);
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfigurationTests.java
View file @
f4f668a5
...
@@ -29,6 +29,8 @@ import org.springframework.util.StringUtils;
...
@@ -29,6 +29,8 @@ import org.springframework.util.StringUtils;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
/**
/**
* Tests for {@link PropertyPlaceholderAutoConfiguration}.
*
* @author Dave Syer
* @author Dave Syer
*/
*/
public
class
PropertyPlaceholderAutoConfigurationTests
{
public
class
PropertyPlaceholderAutoConfigurationTests
{
...
...
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
View file @
f4f668a5
...
@@ -23,6 +23,8 @@ import java.util.List;
...
@@ -23,6 +23,8 @@ import java.util.List;
import
org.springframework.boot.cli.compiler.grape.RepositoryConfiguration
;
import
org.springframework.boot.cli.compiler.grape.RepositoryConfiguration
;
/**
/**
* Factory used to create {@link RepositoryConfiguration}s.
*
* @author Andy Wilkinson
* @author Andy Wilkinson
* @author Dave Syer
* @author Dave Syer
*/
*/
...
...
spring-boot-dependencies/pom.xml
View file @
f4f668a5
...
@@ -531,10 +531,10 @@
...
@@ -531,10 +531,10 @@
<version>
${crashub.version}
</version>
<version>
${crashub.version}
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.jolokia
</groupId>
<groupId>
org.jolokia
</groupId>
<artifactId>
jolokia-core
</artifactId>
<artifactId>
jolokia-core
</artifactId>
<version>
${jolokia.version}
</version>
<version>
${jolokia.version}
</version>
</dependency>
</dependency>
</dependencies>
</dependencies>
</dependencyManagement>
</dependencyManagement>
<build>
<build>
...
...
spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java
View file @
f4f668a5
...
@@ -40,7 +40,8 @@ public class SampleProfileApplicationTests {
...
@@ -40,7 +40,8 @@ public class SampleProfileApplicationTests {
public
void
after
()
{
public
void
after
()
{
if
(
this
.
profiles
!=
null
)
{
if
(
this
.
profiles
!=
null
)
{
System
.
setProperty
(
"spring.profiles.active"
,
this
.
profiles
);
System
.
setProperty
(
"spring.profiles.active"
,
this
.
profiles
);
}
else
{
}
else
{
System
.
clearProperty
(
"spring.profiles.active"
);
System
.
clearProperty
(
"spring.profiles.active"
);
}
}
}
}
...
...
spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
View file @
f4f668a5
...
@@ -99,7 +99,6 @@ public class PropertiesConfigurationFactory<T> implements FactoryBean<T>,
...
@@ -99,7 +99,6 @@ public class PropertiesConfigurationFactory<T> implements FactoryBean<T>,
* Flag to disable binding of nested properties (i.e. those with period separators in
* Flag to disable binding of nested properties (i.e. those with period separators in
* their paths). Can be useful to disable this if the name prefix is empty and you
* their paths). Can be useful to disable this if the name prefix is empty and you
* don't want to ignore unknown fields.
* don't want to ignore unknown fields.
*
* @param ignoreNestedProperties the flag to set (default false)
* @param ignoreNestedProperties the flag to set (default false)
*/
*/
public
void
setIgnoreNestedProperties
(
boolean
ignoreNestedProperties
)
{
public
void
setIgnoreNestedProperties
(
boolean
ignoreNestedProperties
)
{
...
...
spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
View file @
f4f668a5
...
@@ -75,7 +75,6 @@ public class RelaxedDataBinder extends DataBinder {
...
@@ -75,7 +75,6 @@ public class RelaxedDataBinder extends DataBinder {
* Flag to disable binding of nested properties (i.e. those with period separators in
* Flag to disable binding of nested properties (i.e. those with period separators in
* their paths). Can be useful to disable this if the name prefix is empty and you
* their paths). Can be useful to disable this if the name prefix is empty and you
* don't want to ignore unknown fields.
* don't want to ignore unknown fields.
*
* @param ignoreNestedProperties the flag to set (default false)
* @param ignoreNestedProperties the flag to set (default false)
*/
*/
public
void
setIgnoreNestedProperties
(
boolean
ignoreNestedProperties
)
{
public
void
setIgnoreNestedProperties
(
boolean
ignoreNestedProperties
)
{
...
...
spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
View file @
f4f668a5
...
@@ -43,7 +43,7 @@ public final class RelaxedNames implements Iterable<String> {
...
@@ -43,7 +43,7 @@ public final class RelaxedNames implements Iterable<String> {
* using dashed notation (e.g. {@literal my-property-name}
* using dashed notation (e.g. {@literal my-property-name}
*/
*/
public
RelaxedNames
(
String
name
)
{
public
RelaxedNames
(
String
name
)
{
this
.
name
=
name
==
null
?
""
:
name
;
this
.
name
=
(
name
==
null
?
""
:
name
)
;
initialize
(
RelaxedNames
.
this
.
name
,
this
.
values
);
initialize
(
RelaxedNames
.
this
.
name
,
this
.
values
);
}
}
...
...
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View file @
f4f668a5
...
@@ -97,7 +97,7 @@ public class JettyEmbeddedServletContainerFactory extends
...
@@ -97,7 +97,7 @@ public class JettyEmbeddedServletContainerFactory extends
public
EmbeddedServletContainer
getEmbeddedServletContainer
(
public
EmbeddedServletContainer
getEmbeddedServletContainer
(
ServletContextInitializer
...
initializers
)
{
ServletContextInitializer
...
initializers
)
{
WebAppContext
context
=
new
WebAppContext
();
WebAppContext
context
=
new
WebAppContext
();
int
port
=
getPort
()
>=
0
?
getPort
()
:
0
;
int
port
=
(
getPort
()
>=
0
?
getPort
()
:
0
)
;
Server
server
=
new
Server
(
new
InetSocketAddress
(
getAddress
(),
port
));
Server
server
=
new
Server
(
new
InetSocketAddress
(
getAddress
(),
port
));
if
(
this
.
resourceLoader
!=
null
)
{
if
(
this
.
resourceLoader
!=
null
)
{
...
...
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View file @
f4f668a5
...
@@ -193,7 +193,7 @@ public class TomcatEmbeddedServletContainerFactory extends
...
@@ -193,7 +193,7 @@ public class TomcatEmbeddedServletContainerFactory extends
// Needs to be protected so it can be used by subclasses
// Needs to be protected so it can be used by subclasses
protected
void
customizeConnector
(
Connector
connector
)
{
protected
void
customizeConnector
(
Connector
connector
)
{
int
port
=
getPort
()
>=
0
?
getPort
()
:
0
;
int
port
=
(
getPort
()
>=
0
?
getPort
()
:
0
)
;
connector
.
setPort
(
port
);
connector
.
setPort
(
port
);
if
(
connector
.
getProtocolHandler
()
instanceof
AbstractProtocol
)
{
if
(
connector
.
getProtocolHandler
()
instanceof
AbstractProtocol
)
{
if
(
getAddress
()
!=
null
)
{
if
(
getAddress
()
!=
null
)
{
...
...
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