Commit Graph

5269 Commits

Author SHA1 Message Date
Stephane Nicoll d9939a5be2 Map FATAL level for Log4j
Make sure that Boot's FATAL level is mapped to log4j and log4j2 properly.

Fixes gh-3518
2015-07-16 17:59:04 +02:00
Stephane Nicoll 538c8d04b1 Polish 2015-07-16 17:45:00 +02:00
Andy Wilkinson a0f10a567c Merge branch 'emdedded-mongo' 2015-07-16 16:34:53 +01:00
Andy Wilkinson 2c81907d58 Flesh out and polish Embedded MongoDB auto-configuration contribution
Embedded MongoDB is now auto-configured when it is on the classpath.
The Mongo instance will listen on the port specified by the
spring.data.mongodb.port property. If this property has a value of
zero and randomly allocated port will be used. In such an event, the
MongoClient created by MongoAutoConfiguration will be automatically
configured to use the port that was allocated.

By default, MongoDB 2.6.10 will be used. This can be configured using
the spring.embedded-mongodb.version property. Mongo's sync delay
feature is enabled by default. This can be configured using the
spring.embedded-mongobd.features property.

Closes gh-2002
2015-07-16 16:34:18 +01:00
Henryk Konsek f2b2c085e9 Add auto-configuration support for Embedded MongoDB
See gh-2002
2015-07-16 16:32:56 +01:00
Stephane Nicoll 4aace564a2 Fix typo
Closes gh-3519
2015-07-16 15:28:24 +02:00
Stephane Nicoll 812f8c8110 Merge pull request #3479 from joshthornhill/gh-3475
* pr/3479:
  Polish 1683d8a8
  Customize default `RabbitListenerFactory`
2015-07-16 15:23:07 +02:00
Stephane Nicoll aa483984c5 Polish 1683d8a8
Closes gh-3475
2015-07-16 15:22:38 +02:00
Josh Thornhill 1683d8a8f3 Customize default `RabbitListenerFactory`
Expose acknowledgment mode, concurrency, prefecth and transaction size
settings in configuration for the default
`RabbitListenerContainerFactory`.

Closes gh-3479
2015-07-16 14:44:06 +02:00
Stephane Nicoll 22a7b0cdee Customize default `JmsListenerFactory`
Expose acknowledgment mode and concurrency settings in configuration for
 the default `JmsListenerContainerFactory`

 Closes gh-3519
2015-07-16 14:39:48 +02:00
Stephane Nicoll c0d0aeac5b Merge pull request #3487 from htynkn/build-system
* pr/3487:
  Remove pre Java8 option 'MaxPermSize'
2015-07-16 10:20:29 +02:00
Huang YunKun e142c063b5 Remove pre Java8 option 'MaxPermSize'
Closes gh-3487
2015-07-16 10:20:04 +02:00
Stephane Nicoll 256ebe09ed Fix broken build 2015-07-16 10:05:20 +02:00
Stephane Nicoll cf8600317c Merge pull request #3512 from izeye/polish-20150716
* pr/3512:
  Polish LoggingSystem
2015-07-16 09:21:24 +02:00
izeye 8d3803b826 Polish LoggingSystem
Closes gh-3512
2015-07-16 09:20:20 +02:00
Stephane Nicoll 6ace7e53ed Clarify doc
Add an explicit note about the need of Spring MVC for actuator HTTP
endpoints. Also explicitly mention Jersey since it can be a source of
confusion.

See gh-2025
2015-07-16 09:04:17 +02:00
Andy Wilkinson bedf2edffa Update auto-configuration @Bean methods to return most specific type
Closes gh-2536
Closes gh-2403
2015-07-15 19:00:56 +01:00
Stephane Nicoll a9737c016c Review doc
Replace server.tomcat.compression example as Boot does no longer define
that property
2015-07-15 17:56:58 +02:00
Stephane Nicoll f75333dce2 Improve doc 2015-07-15 16:00:54 +02:00
Stephane Nicoll 1022f4d9a3 Merge pull request #3504 from izeye/typo-20150715
* pr/3504:
  Fix typos
2015-07-15 15:45:24 +02:00
izeye f4589e7cc3 Fix typos
Closes gh-3504
2015-07-15 15:45:02 +02:00
Stephane Nicoll f2d32d3e98 Add support for property deprecation
Previously, an item could only have a 'deprecated' boolean flag to
indicate that the property is deprecated. It is desirable to provide an
additional description for the deprecation as well as the name of the
property to use instead.

The `deprecated` boolean flag is now supported. Instead, a `deprecated`
object can be specified with two optional attributes: `reason` to provide
an explanation for the deprecation and `replacement` to refer to the
property that should be used instead. If none of them is present, an
empty deprecation object should be set.

For backward compatibility, the `deprecated` field is still set.

Deprecation information can only set via manual meta-data.

Closes gh-3449
2015-07-15 15:41:52 +02:00
Andy Wilkinson b1e9139efe Allow Jackson’s time zone to be configured via the environment
This commit adds a new property, spring.jackson.time-zone, that can be
used to configure the time zone that Jackson uses when configuring
dates. It affects the serialisation of both JDK and Joda date types.

Closes gh-3505
2015-07-15 14:34:58 +01:00
Dave Syer de95012635 Workaround problems with order of endpoint handler mapping
When Spring Data REST is owning the home page it has its own
HandlerMapping with a fix (relatively) low priority. The /links
endpoint wants to own the home page as well, and our handler mapping
has a high priority for good reasons. This change addresses the
issue by checking if Spring Data REST is configured and if
the management context path (or  more specifically, the links
endpoint) is the same as the home page.

Fixes gh-3486
2015-07-15 11:45:25 +01:00
Stephane Nicoll e22ae39b35 Merge pull request #3497 from izeye/patch-34
* pr/3497:
  Remove redundant check
2015-07-15 10:01:52 +02:00
izeye 019140c901 Remove redundant check
Closes gh-3497
2015-07-15 09:58:15 +02:00
Phillip Webb 86f938374a Upgrade to Spring Framework 4.2.0.BUILD-SNAPSHOT 2015-07-14 22:48:33 -07:00
Phillip Webb f0f5f78e25 Polish 2015-07-14 22:17:52 -07:00
Stephane Nicoll 68d875bdc6 Fix windows build 2015-07-14 21:39:54 +02:00
Stephane Nicoll e52c190b05 Narrow String properties to a more precise type
We envision that IDE will support auto-completion for known types in the
future, for instance Charset, MimeType, Resource and Locale. Some of our
own configuration keys use a raw String type whereas they actually
represent a higher-level concept.

We now make sure to expose these with a better type, if applicable.

Closes gh-2898
2015-07-14 15:19:15 +02:00
Stephane Nicoll c4c24b1f44 Detect default value from factory method
If a field is initialized via a factory method taking a single argument,
we can relatively safely consider that said argument is a good
representation of its default value. This is typically the case for
Charset or MimeType instances.

We now make sure to detect such use case (i.e. method argument with a
single argument).

Closes gh-3482
2015-07-14 15:08:43 +02:00
Andy Wilkinson 5e4a450030 Gracefully handle profiles in settings.xml with no <activation>
See gh-3483
2015-07-14 14:05:04 +01:00
Stephane Nicoll 73b24455dd Merge pull request #3484 from htynkn/master
* pr/3484:
  Fix jdk version requirement
2015-07-14 15:02:33 +02:00
Huang YunKun fac2d41295 Fix jdk version requirement
Closes gh-3484
2015-07-14 15:02:08 +02:00
Andy Wilkinson eb5c195c23 Add settings.xml that was missed in 84937551 2015-07-14 13:07:07 +01:00
Dave Syer de02eaa26b Add missing jar (.gitignored) 2015-07-14 12:44:23 +01:00
Andy Wilkinson 8493755178 Configure CLI with repositories from active profiles in settings.xml
This commit enhances the CLI to use the repositories configured in the
profiles declared in a user's Maven settings.xml file during
dependency resolution. A profile must be active for its repositories
to be used.

Closes gh-2703
Closes gh-3483
2015-07-14 12:30:18 +01:00
Stephane Nicoll eafee1ecb6 Fix ordering of mail auto-configuration
It is not possible to put `@Order` on nested `@Configuration` classes and
there is no ordering guarantee of them anyway. Previously, we relied on
the declaration order to check if the `test-connection` flag should apply
to an existing `JavaMailSenderImpl`. It turns out at the
`JavaMailSenderImpl` bean was not created at that time and so the
evaluation was wrongly failing.

To make that more explicit, that code is now in its own
auto-configuration with an explicit `@AutoConfigureAfter` declaration.

Since the JNDI support could be affected by the exact same issue, it has
been restored to its own package private configuration class that is
processed before the  `MailSenderAutoConfiguration` content is evaluated.

Closes gh-3478
2015-07-14 11:24:02 +02:00
Dave Syer bfa816f2a3 Maintain classpath order in PropertiesLauncher
I think this is safe, judging by the integration tests, but I'm not
putting it in 1.2.x until we've had some feedback on it. The
integration tests actually had a bug that was masking this problem
because they were merging Properties from the whole classpath instead
of picking the first available resource (which is generally what
we do in Spring Boot applications for application.properties for
instance).

Fixes gh-3048
2015-07-14 10:22:36 +01:00
Phillip Webb a158baf50f Back-off auto-conf on EntityManagerFactory bean
Don't auto-configure a LocalContainerEntityManagerFactoryBean if the
user directly defines an EntityManagerFactory bean.

Fixes gh-2803
2015-07-13 14:57:58 -07:00
Phillip Webb 3b6a37d44b Remove accidentally committed .gitignore files 2015-07-13 13:25:00 -07:00
Phillip Webb 73be2c056f Clear logback status list on reset
Update LogbackLoggingSystem to clear logback status messages on reset.
This prevents shutdown errors from preventing subsequent startup.

Fixes gh-3472
2015-07-13 13:22:51 -07:00
Andy Wilkinson db50fb8704 Remove redundant metadata for JOOQ’s SQL dialect
Also add a test that I’d written before Phil fixed the problem in
5dbe623.

See gh-3468
2015-07-13 20:40:24 +01:00
Phillip Webb 5dbe6232b8 Use jOOQ enum for sqlDialect
Switch JooqProperties.sqlDialect from a String to the actual enum to
allow IDE hints and case insensitive binding.

Fixes gh-3468
2015-07-13 12:30:17 -07:00
Phillip Webb fd6024ebf1 Move and refactor Redis test server @Rule
Move the Redis JUnit @Rule so that it can be used with
SessionAutoConfigurationTests. Also refactored the internals a little.
2015-07-13 11:52:42 -07:00
Phillip Webb 9ebe15232e Polish 2015-07-13 11:05:46 -07:00
Phillip Webb 6fdcdd888b Merge branch '1.2.x' 2015-07-13 10:18:40 -07:00
Phillip Webb dc18d8d1bb Formatting 2015-07-13 10:17:53 -07:00
Dave Syer a7da48e2a7 Add redis to travis build 2015-07-13 17:59:35 +01:00
Dave Syer 28edc95f18 Ensure Spring Session autoconfig creates ServerProperties carefully
Without this change there can be more than one ServerProperties in a
context with different names.

Fixes gh-3476
2015-07-13 17:28:15 +01:00