Commit Graph

21208 Commits

Author SHA1 Message Date
Phillip Webb
38585ec4eb Merge branch '1.1.x' 2014-09-25 10:40:49 -07:00
Phillip Webb
258059ea08 Fix failing ThymeleafAutoConfigurationTests
Remove accidental addition of a 1.2 test.
2014-09-25 10:27:05 -07:00
Dave Syer
9d9819c338 Merge branch '1.1.x' 2014-09-25 18:15:33 +01:00
Dave Syer
c1404b1e41 Tidy some Javadocs 2014-09-25 18:15:15 +01:00
Phillip Webb
0d0e5eb590 Merge branch '1.1.x' 2014-09-25 10:05:35 -07:00
Dave Syer
336b96b81c Copy server customization to management context
If the actuator endpoints are configured on a different port then there
are some settings in the main ServerProperties that we would like to
re-use (e.g. the access log). The easiest way to do that is to just
configure the management server using the same ServerProperties instance
and then overwrite the things that are different (and stored in
ManagementServerProperties).

Fixes gh-1581
2014-09-25 09:57:24 -07:00
Dave Syer
304920df07 Make Thymeleaf @ConditionalOnWebApplication
If user creates a Thymeleaf app with a parent-child context then the
child should contain all the web-specific pieces (and they are likely
to fail fast if they need to be ServletContextAware, or slower if they
try to locate a WebApplicationContext at runtime). This can't happen
if the view resolver is being added to the parent.

Freemarker and Velocity already have similar tests because it is assumed
that they should be usable outside a web app, so this change just does the
same for Thymeleaf.

Fixes gh-1611
2014-09-25 09:54:50 -07:00
Stéphane DERACO
68ff7d4592 Fix broken documentation links
Fix links to `actuator-noweb`, `actuator-log4j` and `hornetq` samples.

Fixes gh-1613
2014-09-25 09:47:07 -07:00
Phillip Webb
0b50fe4eff Support String to char[] bindings
Update RelaxedConversionService to also support String to char[]
conversion. Primarily to support the `password` field in
MongoProperties.

Fixes gh-1572
2014-09-24 16:03:51 -07:00
Phillip Webb
55a84c7bd7 Merge branch '1.1.x' 2014-09-24 14:12:02 -07:00
Phillip Webb
23ff7c91d6 Add debug logging to ConfigFileApplicationListener
Update ConfigFileApplicationListener to include more debug level output.
Debug messages are recorded during onApplicationEnvironmentPreparedEvent
but not actually output until onApplicationPreparedEvent. This is
because the logging level might not have been correctly set until the
context is completely prepared.

Fixes gh-1584
2014-09-24 14:08:14 -07:00
Phillip Webb
142216400a Polish formatting 2014-09-24 12:04:40 -07:00
Andy Wilkinson
b4c94f427a Merge branch '1.1.x' 2014-09-23 12:07:39 +01:00
Andy Wilkinson
c420249f7d Detect startup failures in additional Tomcat connectors
Previously, only the state of the primary connector was checked when
verifying that the embedded Tomcat instance has started successfully.
This commit updates the verification logic to examine all of the
service's connectors, thereby also detecting startup failures of any
additional connectors the have been configured.

A check on the primary connector's state has been removed from
initialize as, at this stage, its state will always be NEW.

Fixes gh-1591
2014-09-23 11:56:40 +01:00
Andy Wilkinson
5d1a114aa6 Merge branch '1.1.x'
Redundant @ConditionalOnMissingBean annotation has been removed.
ActiveMQConnectionFactoryConfiguration is not auto-configuration and
is imported by ActiveMQAutoConfiguration which is protected by
@ConditionalOnMissingBean(ConnectionFactory.class)
2014-09-23 10:14:03 +01:00
Andy Wilkinson
cf22e28ddc Add tests to verify that ActiveMQAutoConfiguration backs off
See gh-1599
2014-09-23 10:11:26 +01:00
Andy Wilkinson
42821990f4 Merge branch '1.1.x' 2014-09-23 09:42:29 +01:00
Tomas Lin
38d8a5cda0 Fix typo in comment
Closes gh-1596
2014-09-23 09:42:03 +01:00
Dave Syer
97dcd24668 Merge branch '1.1.x' 2014-09-22 12:16:21 +01:00
Dave Syer
a63d0b4e16 Update docs with DispatcherType.ERROR for filters
Some frameworks handle all requests in a Filter, so you have to
explicitly register it as an ERROR dispatcher.

See gh-1272
2014-09-22 12:15:02 +01:00
Andy Wilkinson
944045cd34 Merge branch '1.1.x' 2014-09-22 09:27:13 +01:00
Marius Bogoevici
5c84e17d10 Activate WebSecurityEnabler only for web applications
Done in order to align with the rest of the configuration. Absent this
check, the bean will be installed in non-web applications without the
corresponding dependencies, causing the bootstrap to fail.

Closes gh-1588
2014-09-22 09:26:41 +01:00
Andy Wilkinson
c2e588a37c Merge branch '1.1.x' 2014-09-22 09:13:21 +01:00
N Jain
a8af254765 Fix description of test file to be tests.groovy
Corrected the documentation to refer to file as tests.groovy, rather
than test.groovy. Updated cope snippet as tests.groovy should expect
"Hello World!" rather than "Hello World".

Closes gh-1593
2014-09-22 09:12:59 +01:00
Phillip Webb
0468cf5a8f Merge branch '1.1.x' 2014-09-19 22:42:53 -07:00
Phillip Webb
468db03aef Formatting 2014-09-19 22:41:10 -07:00
Phillip Webb
a3e0fa22a2 Add version properties for banner.txt usage
Extract banner.txt logic to ResourceBanner and include support for
`spring-boot.version` and `application.version` properties.

Fixes gh-1586
2014-09-19 22:38:35 -07:00
Dave Syer
b06d10ddb0 Merge branch '1.1.x' 2014-09-19 16:12:38 +01:00
Dave Syer
d6165d97dd A few tweaks that might improve performance on startup
... or couldn't hurt anyway.

1. Extends the definition of a web application for @ConditionalOnWebapp
so that a StandardEnvironment can be used (cutting out JNDI failures
for Environment properties)

2. Doesn't bother using StandardServletEnvironment in integration tests

3. Make the NON_ENUMERABLE_ENUMERABLES in PropertySourcesPropertyValues
static so they only get initialized once (not a huge issue at all)
2014-09-19 16:11:10 +01:00
Andy Wilkinson
2dbe4d706b Merge branch '1.1.x' 2014-09-18 16:45:19 +01:00
Andy Wilkinson
6248fc0d60 Fix logic for identifying test classes on Windows
Use File.separator rather than hard-coding the use of ‘/‘

Closes gh-1571
2014-09-18 16:45:07 +01:00
Phillip Webb
3c5b007ff9 Add @Order annotations to conditions
Fixes gh-1574
2014-09-17 21:55:43 -07:00
Phillip Webb
22378698fe Upgrade to Spring Framework 4.1.1.BUILD-SNAPSHOT 2014-09-17 21:37:23 -07:00
Phillip Webb
51b8b1e590 Merge branch '1.1.x' 2014-09-17 18:06:06 -07:00
Phillip Webb
bebcd60b7c Call LoggerContext.reset() during logback init
Update `LogbackLoggingSystem` to call the `reset()` method on the
`LoggerContext` before initialization.

This will hopefully reset the context to prevent the same appenders
from being accidentally added more than once.

Fixes gh-1091
2014-09-17 18:05:08 -07:00
Andy Wilkinson
3c93d9a803 Merge branch '1.1.x' 2014-09-17 19:41:14 +01:00
Andy Wilkinson
6dcaec2fef Make all @Bean methods public
This is a continuation of the changes made in 611f978. It makes some
more @Bean methods public and adds tests to spring-boot-actuator and
spring-boot-autoconfigure to prevent against non-public methods being
introduced in the future

Closes gh-1571
2014-09-17 19:39:39 +01:00
Stephane Nicoll
aeeade2ed5 Merge missed documentation update
Cherry pick documentation updates which appear to have been
lost during a previous merge.

Fixes gh-1523
Cheery-picked from 16c2477d
2014-09-17 11:20:56 -07:00
Phillip Webb
88f8eb7fa4 Merge branch '1.1.x' 2014-09-17 10:46:30 -07:00
Phillip Webb
611f978181 Make all @Bean methods public
Fixes gh-1571
2014-09-17 10:45:23 -07:00
Phillip Webb
d441e7af93 Fix merge error 2014-09-17 10:20:08 -07:00
Phillip Webb
52853085a9 Merge branch '1.1.x' 2014-09-17 10:13:02 -07:00
Phillip Webb
9e9e450211 Fix @Since tag 2014-09-17 10:12:48 -07:00
Phillip Webb
4f610fa5a1 Merge branch '1.1.x'
Conflicts:
	spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
	spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java
	spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
	spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
2014-09-17 10:11:30 -07:00
Phillip Webb
62a5ce52d0 Backport Jetty/Tomcat SSL support
Fixes gh-1570
Cherry-picked from 0960908 and 258c6f1
2014-09-17 10:08:05 -07:00
Phillip Webb
fae9ab4140 Fix failing tests 2014-09-17 10:08:05 -07:00
Phillip Webb
c0f69d28d3 Remove inadvertently committed debug System.out 2014-09-17 10:08:05 -07:00
Dave Syer
5946ade199 Merge branch '1.1.x' 2014-09-17 10:20:03 +01:00
Dave Syer
95c15733bc Use ErrorController.getErrorPath() to ignore the error path for security
Fixes gh-1548 again
2014-09-17 10:19:18 +01:00
Andy Wilkinson
e8ce93715a Merge branch '1.1.x' 2014-09-16 17:20:35 +01:00