Commit Graph

50613 Commits

Author SHA1 Message Date
Dave Syer
d8eeba98e8 Add JAVA_OPTS advice to some docs 2014-05-28 12:11:07 +01:00
Dave Syer
3d9da64382 Add auto imports for integration testing
JUnit tests can now be @SpringApplicationConfiguration
and @IntegrationTest without any explicit imports. Also
makes @RunWith(SpringJUnit4ClassRunner) optional.

Fixes gh-969
2014-05-28 10:58:56 +01:00
Phillip Webb
3d76d9d73b Merge branch '1.0.x' 2014-05-28 10:23:33 +01:00
Phillip Webb
819b3b9761 Fix JasperInitializerLifecycleListener
Update JasperInitializerLifecycleListener to call JasperInitializer as
a ServletContainerInitializer (not a ServletContextInitializer).

Fixes gh-962
See gh-919
2014-05-28 10:21:10 +01:00
Dave Syer
f746cd5dc2 Upgrade to reactor 1.1.1 (fixes gh-845) 2014-05-28 09:38:38 +01:00
bjornerik
769ffe2834 Missing space destroys formatting in doc 2014-05-28 09:11:19 +01:00
Graeme Rocher
514dad6d22 allow subclassing of SpringApplicationBuilder 2014-05-28 09:09:03 +01:00
bjornerik
021f8eba03 Missing space destroys formatting in doc 2014-05-28 08:59:26 +01:00
Dave Syer
27aa644b52 Merge branch '1.0.x' 2014-05-28 08:41:50 +01:00
Dave Syer
f659a2e253 Use the ServerProperties to add prefixes to paths
when server.servletPath is set we need to add prefixes to
the security filter paths, and the /error path.

Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfiguration.java
2014-05-28 08:41:22 +01:00
Phillip Webb
d4d3ffa93c Unify versions in POMs started by the invoker
Unify the versions used in integration tests launched by the
maven-invoker-plugin. Allows for already cached local copies to be
used, hopefully speeding up the build.
2014-05-27 21:25:34 +01:00
Phillip Webb
a91e85b848 Add local.management.port when on same port
Add a `local.management.port` alias when the management server is
running on the same port as the main server.

Fixes gh-952
2014-05-27 21:25:33 +01:00
Phillip Webb
91bd78047e Rename TraceWebFilterAutoConfigurationTest
Rename TraceWebFilterAutoConfigurationTest to
TraceWebFilterAutoConfigurationTests
2014-05-27 21:25:33 +01:00
Christian Dupuis
057e149846 Introduce Health.Builder to clean up HealthIndicator implementations 2014-05-27 20:44:54 +02:00
Phillip Webb
0ed4afd647 Fix a couple of velocity documentation issues
Fixes gh-961
2014-05-27 16:36:05 +01:00
Andy Wilkinson
96c92fd3b8 Merge branch '1.0.x' 2014-05-27 15:03:57 +01:00
Andy Wilkinson
362df05f65 Upgrade to Tomcat 7.0.54
Closes #960
2014-05-27 15:02:50 +01:00
Dave Syer
55f3ca0172 Remove misplaced re-ordering of default property source
The early re-ordering (and in particular the temporary remove of the
default properties) seemed to be a relic of an older approach that is
no longer there since we refactored to support more sane profile ordering.
Removing it doesn't seem to break anything and it allows you to specify
the config file locations in SpringApplicationBuilder.properties().

Fixes gh-953, fixes gh-920
2014-05-27 12:11:25 +01:00
Phillip Webb
3c1815ef43 Revert "Add spring-boot-versions to the full build"
This reverts commit 50ea717a0b.
2014-05-27 10:13:52 +01:00
Spring Buildmaster
b643600060 Next development version 2014-05-26 18:24:01 -07:00
Phillip Webb
50ea717a0b Add spring-boot-versions to the full build 2014-05-27 01:03:44 +01:00
Phillip Webb
9391b2c594 Add parent to prepare build
Hopefully allowing us to release
2014-05-27 00:11:47 +01:00
Phillip Webb
4fd4e2f7cb Downgrade to Reactor 1.1.0
Downgrade the Reactor version since we cannot depend on snapshots for
the M2 release.

See gh-845
2014-05-26 22:07:16 +01:00
Phillip Webb
6381fdcb49 Polish 2014-05-26 21:48:19 +01:00
Stephane Nicoll
96adb87bbd Fix typo
Relates to gh-667
2014-05-26 19:00:14 +02:00
Stephane Nicoll
a51739c0e1 Integration tests documentation
This commit clarifies how @IntegrationTest can be used as an
alternative of starting the (web) application prior to running the
tests suite.

Fixes gh-667
2014-05-26 15:40:38 +02:00
Dave Syer
b3022fd24a Use PropertiesConfigurationFactory to bind to SpringApplication
Then non-enumerable property sources will be accessible (like
SystemProperties in principle). This is the same way that other
beans are bound to the environment, but this one never got the
same treatment.

Fixes gh-951, gh-934
2014-05-26 10:40:24 +01:00
Dave Syer
43481725b9 Fix bug in DataSourceBuilder 2014-05-26 10:06:18 +01:00
Dave Syer
0938a874ad Ensure startup error is logged (and rethrown)
Fixes gh-948
2014-05-26 09:21:27 +01:00
Dave Syer
32295b9bdc Add options for Flyway to have its own DataSource
Either set flyway.[url,user,password] or create a DataSource
@Bean and mark it @FlywayDataSource.

Fixes gh-807
2014-05-26 08:55:28 +01:00
Roy Clarkson
9f52a0dbd7 Add Spring Mobile SitePreferenceAutoConfiguration
New feature in Spring Mobile (user preferences per site).

Fixes gh-946
2014-05-26 07:00:03 +01:00
Dave Syer
3d99a5dd98 Add test for inaccessible configuration class
See gh-948
2014-05-26 06:40:50 +01:00
Dave Syer
f1f36cd002 Extract closure grabber into AstUtils 2014-05-25 18:58:25 +01:00
Dave Syer
b71f07932e Support for explicit module path in dependency
Instead of *always* needing to pull auto-import dependencies
from the master parent pom, we now allow normal @Grab-style
module specifications, e.g. "io.ratpack:ratpack-groovy:0.9.2"
2014-05-25 18:58:07 +01:00
Stephane Nicoll
6bdc229c84 Merge pull request #949 from bclozel/fixdoc
* fixdoc:
  Fix table row format in documentation
2014-05-25 08:58:29 +02:00
Brian Clozel
ddbfe187cd Fix table row format in documentation 2014-05-24 21:40:40 +02:00
Dave Syer
68448a8c68 Use the ServerProperties to add prefixes to paths
when server.servletPath is set we need to add prefixes to
the security filter paths.

Fixes gh-945
2014-05-24 08:33:14 +01:00
Dave Syer
edb493044a Fix ordering problem in PropertySourcesPropertyValues
This affected @ConfigurationProperties binding whenever there
were multiple PropertySources (from any source) in the
Environment and mor ethan one carried a value for a particular
key. The rules for override are clear in Environment.getProperty()
but they were being violated by the PropertySourcesPropertyValues.

Fixes gh-916
2014-05-24 08:33:14 +01:00
Phillip Webb
28f88562f2 Make AutoConfigurationPackages.set public
Open up AutoConfigurationPackages.set(...) to allow programmatic
configuration of base packages.

Fixes gh-924
2014-05-23 22:13:25 +01:00
Phillip Webb
dbf75749a9 Merge branch '1.0.x' 2014-05-23 21:27:22 +01:00
Phillip Webb
6e82e8ede8 Fix Tomcat 8 warnings and Jasper initialization
Fix MalformedURLException warnings caused by Tomcat 8 adding additional
URLs to the TomcatEmbeddedWebappClassLoader.

Add JasperInitializerLifecycleListener to call Tomcat 8's
JasperInitializer which is now required for JSP rendering.

Fixes gh-919
2014-05-23 21:25:17 +01:00
Andy Wilkinson
e7f7b1c2b0 Add dependency management for remaining Spring Framework modules
spring-instrument-tomcat is deliberately not included as it is only
required with Tomcat 6 and Boot uses Tomcat 7
2014-05-23 19:07:45 +01:00
Phillip Webb
a6b94e7cef Fix typo in warning 2014-05-23 18:31:52 +01:00
Andy Wilkinson
209acd9226 Merge branch '1.0.x' 2014-05-23 14:09:30 +01:00
Andy Wilkinson
7d6438ad9b Upgrade to Aether 0.9.1 2014-05-23 14:09:08 +01:00
Andy Wilkinson
f21151e594 Dont’t auto-configure FreeMarker and Velocity without context-support
Boot’s auto-configuration for FreeMarker and Velocity relies on Spring’s
support for them that’s packaged in spring-context-support. Only
auto-configure them if their respective Spring classes are on the
classpath

Fixes #940
2014-05-23 11:36:25 +01:00
Dave Syer
4999d41145 Add test for servletMapping() 2014-05-23 11:05:29 +01:00
Phillip Webb
96a0d672af Rename SimpleDataSourceHealthIndicator
Rename SimpleDataSourceHealthIndicator to DataSourceHealthIndicator.
2014-05-23 10:58:40 +01:00
Phillip Webb
aa03d9a41c Make Health and Status immutable
Update Health and Status objects to be immutable, update the existing
builder methods to return new instances and add static convenience
methods to Health.
2014-05-23 10:58:40 +01:00
Dave Syer
660d9e24dc Add servlet path to /error if it is customized
In addition I added some convenience methods to ServerProperties
(servletMapping() and servletPrefix()) for manipulating the
servlet path as provided by the user (e.g. normalizing it into
a valid Servlet mapping path for the DispatcherServlet).

Fixes gh-939, see also gh-936
2014-05-23 10:48:34 +01:00