Commit Graph
1465 Commits
Author SHA1 Message Date
Stephane Nicoll b167a03b3d Merge branch '1.3.x' 2016-05-06 11:12:06 +02:00
Stephane Nicoll daf0b081e7 Revert "Add support for UTF-8 in application.properties"
This reverts commit d6a424f94c.

Closes gh-5361

# Conflicts:
#	spring-boot/src/test/resources/org/springframework/boot/env/test-encoded.properties
2016-05-06 11:10:36 +02:00
Stephane Nicoll fb9a61cd85 Polish "Fix customization of Jetty's SSL trust store"
Closes gh-5852
2016-05-04 09:58:52 +02:00
Johnny Lim 727dd12852 Fix customization of Jetty's SSL trust store
See gh-5852
2016-05-04 09:32:58 +02:00
Johnny Lim 0efa0038c3 Polish
Closes gh-5815
2016-04-30 10:24:33 +02:00
Phillip Webb 08ef5f4b1f Make ErrorPageRegistry first class concern
Create ErrorPageRegistry and ErrorPageRegistrar interfaces that allow
error page registration to be a first class concern.

Prior to this commit ErrorPageFilter needed to implement
ConfigurableEmbeddedServletContainer in order to receive ErrorPage
registrations.

Closes gh-5789
2016-04-28 12:45:15 -07:00
Phillip Webb 609cb52cd4 Move to relocated web classes
Refactor code to move from recently deprecated classes.

Closes gh-5822
2016-04-28 12:45:15 -07:00
Phillip Webb aea18671c1 Restructure web related classes
Reorganize web related classes for better separation of concerns.
Mainly this involves moving classes from `o.s.b.context.embedded`
that aren't directly tied to embedded servlet containers to
`o.s.b.web` and relocating everything from `o.s.b.context.web`.

See gh-5822
2016-04-28 12:45:15 -07:00
Phillip Webb a7cb689f95 Move @LocalServerPort annotation
Move the @LocalServerPort to org.springframework.boot.context.embedded
since it's only really useful when working with embedded servlet
containers.

See gh-5822
2016-04-28 12:45:15 -07:00
Phillip Webb 3de48d2603 Refactor ServletComponentRegisteringPostProcessor
Rework ServletComponentRegisteringPostProcessor to break the direct link
to the `org.springframework.boot.context.embedded` package.

See gh-5822
2016-04-28 12:45:15 -07:00
Ruben Dijkstra 36c0ceb92a Move AnsiColorsTests to src/test/java
Closes gh-5809
2016-04-27 13:27:53 -07:00
cjstehno 309f8484a7 Fix remote shell to support custom banners
Update the remote shell to use the `Banner` interface when possible.

Fixes gh-3988
Closes gh-5453
2016-04-26 17:05:19 -07:00
Phillip Webb b567959482 Add support for dynamic SSL key stores
Add a SslStoreProvider interface that can be used to load key and trust
stores from non file locations.

Fixes gh-5208
2016-04-26 15:03:00 -07:00
Johnny Lim db2092e27d Polish
Closes gh-5798
2016-04-26 08:17:13 +02:00
Matt Benson 15d6662c0d Fix SpringProfileDocumentMatcher negation bug
Prior to this commit SpringProfileDocumentMatcher was returning 'found'
anytime a negated profile was not found, even if there were positive
profile matches required and unsatisfied.

Closes gh-5747
See gh-4953
2016-04-25 14:38:20 -07:00
Venil Noronha 0d47abbac4 Extract ApplicationContextHeaderFilter
Extract ApplicationContextHeaderFilter to a top-level class from
EndpointWebMvcAutoConfiguration and make the header field public.

Fixes gh-5726
Closes gh-5784
2016-04-25 14:16:08 -07:00
Phillip Webb 93382648ab Formatting 2016-04-24 22:54:27 -07:00
Andy Wilkinson e1cea8a98c Perform failure analysis of BindExceptions
Closes gh-5738
2016-04-20 17:10:32 +01:00
Andy Wilkinson aa19c19753 Merge branch '1.3.x' 2016-04-20 10:58:50 +01:00
Andy Wilkinson 7709543e67 Set web application context on ServletContext in plain web app tests
Previously, the web application context was only set on the
ServletContext in a full-blown integration test or when MockMvc was
used.

This commit updates SpringApplicationContextLoader so that the context
is also set on the context in a plain web application test (one where
MockMvc is not being used). The change is a partial backport of commit
7dffb702.

Closes gh-4370
2016-04-20 10:39:42 +01:00
Johnny Lim b914b4aa52 Remove the second parameter of substring() if possible
Closes gh-5720
2016-04-20 09:18:35 +02:00
Andy Wilkinson e69ec6bb09 Log classpath once environment has been prepared
Previously, the classpath would be logged in response to the
ApplicationStartedEvent. At this point, logging could be disabled
while the logging system is being initialized, or because the
log levels configured in the environment have not yet been applied.

This commit moves the logging to happen in response to an
ApplicationEnvironmentPreparedEvent by which point the logging
system has been initialized and its levels have been configured.

Closes gh-5313
2016-04-19 16:23:50 +01:00
Johnny Lim 61b47079a4 Remove duplicate words
Closes gh-5731
2016-04-19 08:21:58 +02:00
Johnny Lim 6d48ee9593 Polish
Closes gh-5714
2016-04-17 09:26:05 +02:00
Andy Wilkinson eb8b77e350 Improve analysis of failures due to NoUniqueBeanDefinitionException
Closes gh-5683
2016-04-15 11:46:18 +01:00
Phillip Webb 85d2f2950a Use RegEx for test to make Windows happy 2016-04-14 18:27:33 -07:00
Johnny Lim 90d897eb9d Polish
Closes gh-5685
2016-04-14 08:03:52 +02:00
Johnny Lim e769f20477 Close the context in TypeExcludeFilterTests
Closes gh-5672
2016-04-12 22:49:31 -07:00
Phillip Webb 6eeda76af7 Merge branch '1.3.x' 2016-04-12 14:50:14 -07:00
Phillip Webb b1656be3d0 Fix possible binder IndexOutOfBoundsException
Update RelaxedDataBinder.extendCollectionIfNecessary to use the current
index when checking if the path node is an array.

Fixes gh-5635
2016-04-12 14:36:36 -07:00
Phillip Webb 0968d411e6 Fix reference to non-final field 2016-04-12 13:23:42 -07:00
Phillip Webb fa18d2ccbf Attempt to prevent BindExceptions in tests
Update tests that use `doWithBlockedPort` so that the port is obtained
and bound early to ensure that something else doesn't grab it.
2016-04-12 12:54:57 -07:00
Andy Wilkinson acda000975 Polish "Allow Jetty's ThreadPool to be customized" (gh-5324) 2016-04-12 10:04:37 +01:00
Henri Kerola 6f094243bb Allow Jetty's ThreadPool to be customized
This commit enhances JettyEmbeddedServletContainerFactory to allow
Jetty to be created with a custom ThreadPool via a new
setThreadPool(ThreadPool) method.

Closes gh-5324
2016-04-12 09:56:56 +01:00
Andy Wilkinson 69499bf329 Make configuration of acceptors and selectors compatible with Jetty 8
The ServerConnector class doesn’t exist in Jetty 8 so we have to
resort to reflection to create and configure a SelectChannelConnector
instead.

Closes gh-5649
See gh-5380
2016-04-11 21:03:06 +01:00
Phillip Webb fa142d929a Restore Jetty 8 compatibility
Acceptors and Selectors aren't supported with Jetty 8.

See gh-5380
2016-04-11 12:17:43 -07:00
Phillip Webb 7956e68224 Fix warnings 2016-04-11 11:41:38 -07:00
Venil Noronha 1def64e49e Add Jetty acceptors and selectors support
Add support for Jetty `acceptors` and `selectors` configuration, either
directly on the `JettyEmbeddedServletContainerFactory` or via
`server.jetty.acceptors`/`server.jetty.selectors` server properties.

Fixes gh-5380
Closes gh-5649
2016-04-11 11:30:55 -07:00
Phillip Webb 1bf10f2926 Fix accidental banner regression
Fix accidental regression introduced when I tweaked the updated
banner support (commit aaed87d1).

See gh-5636
2016-04-11 11:30:13 -07:00
Michael J. Simons aaed87d176 Register printed banner in ApplicationContext
Update SpringApplication to store the banner that was actually printed
as a bean named `springBootBanner`.

Closes gh-5636
2016-04-11 10:54:22 -07:00
Phillip Webb 2d992c1324 Polish 2016-04-11 09:59:16 -07:00
Stephane Nicoll c38bb9657d Polish 2016-04-11 16:11:51 +02:00
Phillip Webb abe8c2ec17 Fix checkstyle error 2016-04-10 23:37:35 -07:00
Phillip Webb a39d351eed Polish profile negation in YAML sub-documents
Closes gh-4953
2016-04-10 23:23:59 -07:00
Matt Benson bd010494c9 Support profile negation in YAML sub-documents
See gh-4953
2016-04-10 23:22:31 -07:00
Johnny Lim a0c8d1f5b5 Polish 2016-04-10 22:18:28 -07:00
Phillip Webb 07fc6fd5f8 Fix Windows test issues 2016-04-10 13:33:53 -07:00
Phillip Webb 1815bb5b66 Fix Windows test failures 2016-04-10 13:08:34 -07:00
Ruben Dijkstra 94d5c714a9 Fix some Windows build issues
Closes gh-5640
2016-04-10 10:36:04 -07:00
Phillip Webb 2861c7651d Polish 2016-04-10 07:55:59 -07:00