Commit Graph

10971 Commits

Author SHA1 Message Date
Dave Syer
9dec0971d6 Change restart to fail if not running 2015-08-27 07:30:00 +01:00
Dave Syer
ff681adc5b Fix launch.script to not exit prematurely
Use "return" instead of "exit" where possible, especially in
function definitions.

Also fixed the exit codes to match the LSB spec for some specific
conditions (fixes gh-3521).

Fixes gh-3199, fixes gh-3535
2015-08-26 17:54:20 +01:00
Dave Syer
67483bb73c Only use Converters which are @ConfigurationPropertiesBinder qualified
Users sometimes create beans of type Converter and don't expect that to
automatically trigger a cascade of early initialization. This change adds
a qualifier to the Converters that are used by @ConfigurationProperties,
so they can be isolated (and simple).

Fixes gh-2669
2015-08-26 17:27:35 +01:00
Dave Syer
538afc4ab1 Make some methods in BasicErrorController protected
Spring MVC requires all handlers for the same path to be on the same handler
so if anyone wants to add new handlers for different content types they
have to copy a lot of code from BasicErrorController. This change increases
the visibility of the basic utility methods in BasicErrorController so that
custom handlers can be added easily.

Fixes gh-3828
2015-08-26 17:27:35 +01:00
Andy Wilkinson
a0870c1c4a Ignore binding failures for env vars and system properties
1.3.0.M4 tightened up the configuration property binding such that
ignoreUnknownFields = false now works as intended. Unfortunately, this
has led to some complaints as applications that worked with 1.2.x have
stopped working. For example, a SERVER_HOME environment variable does
not cause a failure in 1.2.x despite there being no home property on
ServerProperties but will now fail in 1.3.0.M4.

This commit updates RelaxedDataBinder to ignore binding failures for
properties that come from a source outside of the application’s control,
namely environment variables and system properties.

Closes gh-3775
2015-08-26 17:23:27 +01:00
Stephane Nicoll
d74d657372 Polish 2015-08-26 17:52:19 +02:00
Andy Wilkinson
2373e0fe66 Polishing
Remove stale test class
2015-08-26 16:08:09 +01:00
Andy Wilkinson
003268fb4e Add support for @WebFilter, @WebListener, @WebServlet
This commit adds a new annotation, @ServletComponentScan, that can be
used to enable scanning for @WebFilter, @WebListener, and @WebServlet
annotated classes. Registration beans will be automatically created for
any classes that are found, with the configuration derived from the
annotation.
2015-08-26 15:58:52 +01:00
Andy Wilkinson
07ec9bb849 Merge branch '1.2.x' 2015-08-26 15:02:45 +01:00
Andy Wilkinson
f143bd2cfb Upgrade to Tomcat 8.0.26
Closes gh-3406
Closes gh-3526
2015-08-26 15:01:29 +01:00
Andy Wilkinson
3b5dcc52ec Upgrade to Spring Integration 4.2.0.RC1
Closes gh-3827
2015-08-26 14:59:11 +01:00
Stephane Nicoll
d5f013a911 Merge pull request #3821 from stephane-deraco/patch-1
* pr/3821:
  Fix typo
2015-08-25 15:23:20 +02:00
Stéphane DERACO
a28c18a70a Fix typo
Closes gh-3821
2015-08-25 15:22:54 +02:00
Stephane Nicoll
efd1f6094a Merge branch '1.2.x' 2015-08-25 15:22:24 +02:00
Stephane Nicoll
6393569d42 Polish Externalized Configuration section
Closes gh-3823
2015-08-25 15:22:02 +02:00
Stephane Nicoll
63d157bb7c Favor JSR-107 provider if present
Previously, native cache libraries were favored over a standard JSR-107
implementation. If a user has a working setup using JCache with one
provider and switch to another provider, his setup may be broken if we
happen to provide a native support for the new provider.

We now consistently favor JSR-107 if it is present. Native support can
still be enabled via the `spring.cache.type` property.

Closes gh-3822
2015-08-25 15:07:24 +02:00
Stephane Nicoll
79b9bdec62 Merge pull request #3794 from htynkn/set-cache-period-to-zero
* pr/3794:
  Disable resource cache when DevTools is enabled
2015-08-24 10:54:26 +02:00
Huang YunKun
4e410681aa Disable resource cache when DevTools is enabled
Closes gh-3794
Closes gh-3739
2015-08-24 10:53:03 +02:00
Stephane Nicoll
5aa222a5dd Merge pull request #3810 from htynkn/patch-1
* pr/3810:
  Fix typo
2015-08-23 14:07:27 +02:00
Huang YunKun
9339136b54 Fix typo
Closes gh-3810
2015-08-23 14:07:13 +02:00
Stephane Nicoll
e7bf415427 Merge pull request #3809 from izeye/typo-20150822
* pr/3809:
  Fix typos
2015-08-23 09:26:23 +02:00
izeye
e2119d3329 Fix typos
Closes gh-3809
2015-08-23 09:24:00 +02:00
Stephane Nicoll
69fcae6b44 Merge pull request #3807 from htynkn/fix-sample-dependency
* pr/3807:
  Polish
  Fix springloaded version
2015-08-22 08:41:55 +02:00
Stephane Nicoll
1dfa1fc3a5 Polish
Closes gh-3800
2015-08-22 08:41:40 +02:00
Huang YunKun
3b81152ddc Fix springloaded version
Closes gh-3807
2015-08-22 08:41:30 +02:00
Dave Syer
ff8a4d0f9d Merge branch '1.0.x'
Conflicts: MessageSourceAutoConfiguration.java
2015-08-21 17:13:19 +01:00
Dave Syer
68b55adac0 Add search=CURRENT to MessageSourceAutoConfiguration
Fixes gh-3803
2015-08-21 15:44:01 +01:00
Dave Syer
089cda7af4 Add generated file to .gitignore 2015-08-21 15:31:20 +01:00
Dave Syer
2583f8050a Enable Tomcat RemoteIpValve by default
Fixes gh-3782
2015-08-21 09:26:05 +01:00
Stephane Nicoll
8543a3ca91 Improve use of SSL config in RabbitConnectionFactory
Previously we had to create a fake Properties object as the factory did
not provide individual setters for the SSL configuration. This has been
added as part of Spring AMQP 1.5.0.RC1 so we're using those instead.

Closes gh-3754
2015-08-21 09:49:59 +02:00
Dave Syer
9303efd435 Allow counter names like counter-foo
Checking for a prefix "counter." is more correct than "counter" because
the readers (repositories) assume the former prefix is there.

Fixes gh-3801
2015-08-21 08:37:47 +01:00
Stephane Nicoll
a01a5db947 Upgrade to Spring AMQP 1.5.0.RC1
Closes gh-2899
2015-08-21 09:30:28 +02:00
Andy Wilkinson
6bd6bc9e10 Include information about a property’s origin in binding failures
This commit enhances RelaxedDataBinder to include information about the
origin of a property (its original name before any prefix was removed
and its source) when it encounters an unwritable property. For example,
launching an application with a SERVER_HOME environment variable
configured will produce the following failure message:

Failed to bind 'SERVER_HOME' from 'systemEnvironment' to 'HOME' property
on 'org.springframework.boot.autoconfigure.web.ServerProperties'

Closes gh-3778
2015-08-20 21:15:00 +01:00
Stephane Nicoll
48f16c4386 Avoid Tomcat specific dependency in ServerProperties
Closes gh-3781
2015-08-20 17:17:43 +02:00
Stephane Nicoll
35875c7f08 Merge manual item meta-data
Previously, manual meta-data were added to the existing set of entries
which could lead to duplicates if a manual entry is meant to complement
a property that is detected via the processor.

We now match the name and type of the item against the auto-detected
entries. If no match is found, we add the extra entry as we did before.
If a match is found we override the description, default value and
deprecation information.

Closes gh-3562
2015-08-20 17:08:54 +02:00
Stephane Nicoll
4235df180e Polish
See gh-3792
2015-08-20 14:54:40 +02:00
Stephane Nicoll
6f3cc712bf Merge branch '1.2.x' 2015-08-20 14:48:31 +02:00
Stephane Nicoll
6869b0d987 Fix wrong imports on StringUtils
Closes gh-3792
2015-08-20 14:46:20 +02:00
Stephane Nicoll
d6f3b4b887 Merge pull request #3793 from mmacaulay/patch-1
* pr/3793:
  Fix link to exec maven plugin
2015-08-20 14:25:00 +02:00
Matt MacAulay
0d2f644c50 Fix link to exec maven plugin
Closes gh-3793
2015-08-20 14:24:24 +02:00
Stephane Nicoll
53251a9f9c Add suffix dot on prefix only if necessary
Closes gh-3787
2015-08-20 10:43:12 +02:00
Stephane Nicoll
1466169dc0 Register ResourceUrlEncodingFilter only if necessary
Previously, `ResourceUrlEncodingFilter` was registered even if the
resource chain handling was disabled (which is the default).

We now take care of registering it only if the resource chain handling is
enabled.

Closes gh-3353
2015-08-20 10:33:04 +02:00
Martin Lippert
678f36cfef configure JRE that is different from compiler target level 2015-08-19 17:00:38 +01:00
Stephane Nicoll
7c0c953f81 Add value alias for SpringApplicationConfiguration
Given that Spring Boot uses java config accross the board, a new `value`
attribute is now aliased to the existing `classes` attribute such that
one could write the following:

@SpringApplicationConfiguration(MyConfig.class)
public class MyTest {}

Closes gh-3635
2015-08-19 17:09:34 +02:00
Stephane Nicoll
87d214e61d Upgrade to Spring Framework 4.2.1.BUILD-SNAPSHOT 2015-08-19 14:53:49 +02:00
Stephane Nicoll
35c92348ae Document Velocity view resolver customization
Changing the velocity view resolver to a VelocityLayoutViewResolver seems
a common use case so it has now a dedicated section in the relevant how
to.

Closes gh-3732
2015-08-19 14:32:31 +02:00
Stephane Nicoll
3c91781bee Add additional exclude property
The default value of `spring.devtools.restart.exclude` is quite long and
any override requires to copy/paste it to add additional exclusions. To
avoid that, a new `spring.devtools.restart.additional-exclude` property
has been added.

Both properties are now used to compute the full list of exclusions that
is used by PatternClassPathRestartStrategy.

Closes gh-3774
2015-08-19 14:08:05 +02:00
Andy Wilkinson
23693c3f6a Update contribution guidelines to describe how we use GitHub issues 2015-08-19 12:15:08 +01:00
Stephane Nicoll
0d7ee8a2df Fix default value of restarter meta-data
Closes gh-3773
2015-08-19 11:59:05 +02:00
Andy Wilkinson
8067a53682 Prevent run failures in tests from polluting LoggerContext 2015-08-17 20:37:00 +01:00