Commit Graph

5512 Commits

Author SHA1 Message Date
Stephane Nicoll
64d56cf425 Fix doc glitch 2015-08-15 17:31:24 +02:00
Stephane Nicoll
1659f628d0 Upgrade to Spring Framework 4.2.1.BUILD-SNAPSHOT 2015-08-15 09:28:55 +02:00
Andy Wilkinson
48ae39d7e3 Merge branch '1.2.x' 2015-08-14 18:10:35 +01:00
Andy Wilkinson
190f8a7e0a Upgrade Travis configuration to run on new infrastructure
Closes gh-3760
2015-08-14 18:08:48 +01:00
Andy Wilkinson
4e3411ac59 Add dependency management for org.skyscreamer:jsonassert
Closes gh-3751
2015-08-14 17:49:17 +01:00
Andy Wilkinson
a38bdd92c2 Upgrade to Reactor and Reactor Spring 2.0.5.RELEASE
Closes gh-3756
2015-08-14 17:43:40 +01:00
Stephane Nicoll
73ee6652fd Use project location to infer the artifactId
On start.spring.io, if you customize the artifactId it creates a zip file
with the same name. The `spring init` command did not have a similar
shortcut.

This commit updates the request to customize the artifactId if none is
set and a custom location was specified. Just as we check for the
presence of a dot to figure out if we have to extract the archive or not,
we check for it to generate an artifactId without an extension.

In practice, `spring init foo` creates a foo directory with a project
whose artifactId is `foo` and `spring init foo.zip` stores a foo.zip
file with the same project (i.e. the artifactId is `foo`).

Closes gh-3714
2015-08-14 17:10:21 +02:00
Stephane Nicoll
58d0776abe Polish 2015-08-14 14:08:27 +02:00
Stephane Nicoll
d1a4d6958a Document spring.datasource.name
The `spring.datasource.name` property was hidden behind the 'name'
attribute of the Tomcat connection pool (since we are mapping all
datasource implementations on the `spring.datasource` namespace.

This commit replace the injected value by hand with the use of the
regular `DataSourceProperties`. That way, we generate proper meta-data
for it as well.

Closes gh-3755
2015-08-14 14:07:38 +02:00
Stephane Nicoll
2d62e1fc89 Add a property to configure the connection pool
A new `spring.datasource.type` property can now be used to configure the
connection pool implementation to use (rather than only relying on Boot's
preferences).

Closes gh-3705
2015-08-14 13:30:14 +02:00
Stephane Nicoll
e4b81b173c Polish 2015-08-14 13:21:15 +02:00
Stephane Nicoll
960d6eadba Spring Boot starter section
Improve the documentation to explain the necessary steps to create a
custom Spring Boot starter. In particular, provide more details regarding
naming conventions.

Closes gh-2537
See gh-2927
2015-08-14 10:51:38 +02:00
Stephane Nicoll
78769444d2 Merge pull request #3750 from eddumelendez/gh-3749
* pr/3750:
  Polish
  Add fallbackToSystemLocale configuration key
2015-08-14 09:24:35 +02:00
Stephane Nicoll
4e0f99ed8b Polish
Closes gh-3750
2015-08-14 09:24:24 +02:00
Eddú Meléndez
74e1a1c940 Add fallbackToSystemLocale configuration key
Allow to configure the `fallbackToSystemLocale` attribute of
`MessageSource` via configuration.

Closes gh-3749
2015-08-14 09:09:40 +02:00
Andy Wilkinson
c15a670c6d Workaround bizarre compiler problem 2015-08-13 15:46:38 +01:00
Andy Wilkinson
51dd806a98 Detect ConfigurableWebBindingInitializer bean and register with MVC
Previously, to use a custom ConfigurableWebBindingInitializer, it was
necessary to extend WebMvcConfigurationSupport and override
getConfigurableWebBindingInitializer. This had the unwanted
side-effect of switching off the auto-configuration of Spring MVC.

This commit updates the auto-configuration to look for a
ConfigurableWebBindingInitializer bean and register it with Spring
MVC.

Closes gh-2526
2015-08-13 15:20:59 +01:00
Martin Lippert
511c6d39fa Replace ignore with lifecycle mapping to smooth import into Eclipse
Closes gh-3516
2015-08-13 13:24:15 +01:00
Craig Andrews
2e0e2a3d60 Add more Jackson dependencies to spring-boot-dependencies
Add:

 - jackson-datatype-hibernate4
 - jackson-datatype-hibernate5
 - jackson-datatype-jdk7
 - jackson-module-parameter-names

Closes gh-3727
2015-08-13 13:06:44 +01:00
izeye
eab7eff047 Polish documentation
Closes gh-3738
2015-08-13 12:58:53 +01:00
Andy Wilkinson
fbe2e470f0 Ignore case when filtering out properties based on target name
Previously, PropertiesConfigurationFactory would only create a
DefaultPropertyNamePatternsMatcher that ignored case if it was
ignoring unknown fields. If the binding had a target name and
unknown fields were not being ignored the matcher would consider the
case when finding matches. This meant that SERVER_PORT would not being
to ServerProperties.port as SERVER did not match the target name,
server.

This commit updates PropertiesConfigurationFactory to use a
case-ignoring DefaultPropertyNamePatternsMatcher when binding with
a target name. The tests have also been updated to test binding both
with and without ignoring case and using either Properties or
PropertySources. The above-described matching is only performed
against PropertySources and the bug only occurred when using a target
name, making it important to test all combinations.

Closes gh-3745
2015-08-13 12:51:52 +01:00
Stephane Nicoll
398d06e326 Remove useless code
The target attribute is effectively checked for null beforehand so this
additional defensive check can be removed.

Closes gh-3725
2015-08-12 11:13:03 +02:00
Dave Syer
56115b9baa Fix broken test (use web app context) 2015-08-12 08:43:13 +01:00
Dave Syer
84a3e3827b Ensure tomcat on the classpath does not imply web application 2015-08-11 09:34:20 +01:00
Stephane Nicoll
9d2d34216b Remove references to endpoints.hal
See gh-3696
2015-08-11 09:14:40 +02:00
Andy Wilkinson
a4bfcb9b94 Merge branch '1.2.x' 2015-08-10 20:32:09 +01:00
Andy Wilkinson
4f0f51b5ed Upgrade to Spring Web Services 2.2.2.RELEASE
Closes gh-3423
2015-08-10 20:30:54 +01:00
Andy Wilkinson
2ae8a021f9 Merge branch '1.2.x' 2015-08-10 16:59:04 +01:00
Andy Wilkinson
a2f4c1cc4a Add support for configuring allowSessionOverride via the environment
This commit adds support for using the environment to configure the
Freemarker and Velocity view resolvers to allow session overrides.

Closes gh-3410
2015-08-10 16:58:17 +01:00
Andy Wilkinson
c164065a38 Merge branch '1.2.x' 2015-08-10 16:36:43 +01:00
Andy Wilkinson
f9a775518f Upgrade to Spring Batch 3.0.5.RELEASE
Closes gh-3421
2015-08-10 16:35:22 +01:00
Andy Wilkinson
dad0574fd5 In absence of HAL browser, serve browsers JSON from actuator entry point
Following the changes made to combines the /links and /hal endpoints
into a single /actuator endpoint, a web browser accessing /actuator
would receive a 406 response if HAL browser was not on the classpath.

This commit updates the /actuator main entry point so that it will
serve JSON to a web browser when HAL browser is not on the classpath.

The actuator's embedded documentation has also been updated to reflect
the recent changes.

Closes gh-3696
2015-08-10 16:02:33 +01:00
Stephane Nicoll
3763eda64e Merge branch '1.2.x' 2015-08-10 16:36:11 +02:00
Stephane Nicoll
1ee31e73d3 Avoid NPE if @ConfigurationProperties is not present
The annotation processor detects `@ConfigurationProperties` bean or
method definition and merges manual meta-data. The former step will fail
with a NPE if the annotation is not present on the classpath. This could
happen if the annotation processor is added to a module that is not
actually using Spring Boot.

We now have a defensive check that skips that steps but still attempts to
merge manual meta-data if present.

Closes gh-3720
2015-08-10 16:34:30 +02:00
Andy Wilkinson
25709385e6 Update Hypermedia samples following /hal and /links being combined
See gh-3696
2015-08-10 14:21:22 +01:00
Stephane Nicoll
04b1de2d1d Add package-name option for spring init
For some reason, we forgot to add an attribute to customize the package
name when using spring init. This is now the case.

Closes gh-3716
2015-08-10 14:32:50 +02:00
Dave Syer
25ac258d22 Clarify plugin documentation for requiresUnpack 2015-08-10 12:52:00 +01:00
Andy Wilkinson
1e4c972c3d Fix customJodaDateTimeFormat to specify time zone when creating Date
See gh-3569
2015-08-10 12:36:54 +01:00
Dave Syer
68af0a73ec Clarify documentation in a few areas
Fixes gh-3527
2015-08-10 11:50:48 +01:00
Andy Wilkinson
a62ec1028c Upgrade to Jackson 2.6.1
Closes gh-3569
2015-08-10 11:44:13 +01:00
Andy Wilkinson
58db5a3889 Combine /links and /hal into a single /actuator endpoint
This commit provides a single endpoint, /actuator, that serves HTML
(the HAL browser) or JSON depending on the request’s accept header
that enables discovery of all of the actuator’s other endpoints.

When the management context path is configured, the /actuator endpoint
moves to the configured path, e.g. if the management context path is
set to /management, the actuator endpoint will be available from
/management.

Closes gh-3696
2015-08-10 11:40:35 +01:00
Dave Syer
ce512a18f3 Add test to support binding nested properties
See gh-3539
2015-08-10 11:22:47 +01:00
Dave Syer
2985b0e9d8 Clarify init params in Jersey autoconfig (only servlet and filter)
See gh-3557
2015-08-10 10:50:49 +01:00
Stephane Nicoll
7bc5322034 Merge branch '1.2.x' 2015-08-09 09:04:17 +02:00
Thomas Traude
2b6d7a3f15 Update URL to Groovy Docs
Closes gh-3715
2015-08-09 09:03:54 +02:00
Stephane Nicoll
3507451c9a Merge branch '1.2.x' 2015-08-07 16:03:47 +02:00
Stephane Nicoll
f88d548de0 Fix typo
Closes gh-3700
2015-08-07 16:03:25 +02:00
Stephane Nicoll
95dac0bbec Polish documentation
Improve the documentation on using two entity managers if Spring Data is
used.

Closes gh-3433
2015-08-07 10:13:34 +02:00
Stephane Nicoll
bae3dcba33 Polish error pages documentation
Make it more clear that the `ErrorPage` path requires an URL mapping to
be registered.

Closes gh-3698
2015-08-07 10:05:02 +02:00
Stephane Nicoll
20c1c617ef Polish
See gh-3684
2015-08-06 13:30:35 +02:00