Commit Graph

8455 Commits

Author SHA1 Message Date
Andy Wilkinson 76c4a38e65 Merge branch '1.3.x' 2016-06-30 16:05:16 +01:00
Andy Wilkinson 02e989c863 Check that URL is actually a file URL before getting a File from it
Previously, Log4J2LoggingSystem used ResourceUtils.isFileURL(URL) to
check that the URL of the configuration was suitable for accessing as a
File. Unfortunately, this fails when the URL’s protocol is vfs or
vfsfile as both return true and then fail when the URL is subsequently
passed into ResourceUtils.getFile(URL).

This commit switches to checking that the URL’s protocol is file,
the only protocol that will allow getFile(URL) to succeed.

Closes gh-6246
2016-06-30 15:55:22 +01:00
Stephane Nicoll 0ea2626867 Improve Spring Session documentation
Closes gh-6256
2016-06-30 15:40:45 +02:00
Stephane Nicoll 31a5d7f876 Merge pull request #5879 from vpavic:session-jdbc-initializer
* pr/5879:
  Polish "Add Spring Session JDBC database initializer"
  Add Spring Session JDBC database initializer
  Allow Tomcat context root redirect to be configured via the environment
2016-06-30 15:24:13 +02:00
Stephane Nicoll 2fea5a869d Polish "Add Spring Session JDBC database initializer"
Closes gh-5879
2016-06-30 15:23:54 +02:00
Vedran Pavic a251ea8bc7 Add Spring Session JDBC database initializer
See gh-5879
2016-06-30 15:23:54 +02:00
Andy Wilkinson 2b970f9efc Allow Tomcat context root redirect to be configured via the environment
This commit adds a new property, server.tomcat.redirect-context-root,
that can be used to configure the Tomcat Context’s 
mapperContextRootRedirectEnabled property. The default is to not apply
any configuration and, therefore, to use Tomcat’s default of true.

Closes gh-6248
2016-06-30 12:47:42 +01:00
Stephane Nicoll 05b9dd1cb9 Merge pull request #5854 from vpavic:audit-repository
* pr/5854:
  Polish "Improve AuditEventRepository"
  Improve AuditEventRepository
2016-06-30 11:45:10 +02:00
Stephane Nicoll 3ba2b24301 Polish "Improve AuditEventRepository"
Closes gh-5854
2016-06-30 11:44:01 +02:00
Vedran Pavic 5f19323fbd Improve AuditEventRepository
See gh-5854
2016-06-30 11:20:23 +02:00
Stephane Nicoll 6527aa0e80 Downgrade to maven-failsafe-plugin 2.18.1
This commit downgrades the maven failsafe plugin version. As of 2.19, the
generated jar is used for integration tests rather than the
`target/classes` directory. The fat jar in 1.4 has changed to move
classes to `BOOT-INF/classes` and therefore these are not found anymore.

There isn't a way to configure the jar file to use in the plugin. Users
willing to use the latest version should configure a `classifier` for the
repackaged jar so that the original jar is used by failsafe.

Closes gh-6254
2016-06-30 11:08:59 +02:00
Stephane Nicoll 9b5973c16d Merge pull request #6251 from eddumelendez:session_1.2.1.RELEASE
* pr/6251:
  Upgrade to spring-session 1.2.1.RELEASE
2016-06-30 09:48:24 +02:00
Eddú Meléndez 74d873f8ee Upgrade to spring-session 1.2.1.RELEASE
Closes gh-6251
2016-06-30 09:47:47 +02:00
Phillip Webb d08480320b Stop RequestContextFilter initializing config
Change WebMvcAutoConfigurationAdapter.requestContextFilter() to a static
method so that the configuration class isn't needed when creating it.
This helps to prevent early initialization of beans.

See gh-6178
2016-06-29 20:14:17 -07:00
Phillip Webb 4d50b4d321 Defer javax.servlet.Filter initialization
Update `DelegatingFilterProxyRegistrationBean` so that calls to the
`init()` method no longer trigger early bean initialization.

See gh-6178
2016-06-29 20:13:58 -07:00
Phillip Webb be884d4e33 Polish 2016-06-29 10:57:43 -07:00
Phillip Webb 266445aaf0 Polish 2016-06-29 10:44:33 -07:00
Dave Syer d41127d3da Add javadocs to auth server config props 2016-06-29 09:11:41 -07:00
Andy Wilkinson fc16d9b85c Merge branch '1.3.x' 2016-06-29 17:05:47 +01:00
Andy Wilkinson 05b44a98e0 Simplify generics in CassandraRepositoriesAutoConfigurationTests 2016-06-29 17:05:08 +01:00
Andy Wilkinson 4c8729a3f2 Upgrade to Undertow 1.3.23.Final
Closes gh-6245
2016-06-29 17:02:40 +01:00
Andy Wilkinson 911f728bc3 Start building against Spring Framework 4.2.7 snapshots
See gh-6249
2016-06-29 17:01:55 +01:00
Stephane Nicoll 669da59b4a Polish 2016-06-29 16:28:41 +02:00
Stephane Nicoll 4670226a3c Merge pull request #6244 from izeye:polish-20160629
* pr/6244:
  Polish
2016-06-29 08:09:15 +02:00
Johnny Lim 5bc9d5b380 Polish
Closes gh-6244
2016-06-29 08:08:53 +02:00
Stephane Nicoll f54bec835d Move BasicAuthorizationInterceptor
`BasicAuthorizationInterceptor` is now available in the core framework
and this commit uses that instead of the outdated copy in Boot.

Closes gh-6237
2016-06-29 08:07:30 +02:00
Stephane Nicoll fc4d8b99d6 Allow to configure Tomcat's renameOnRotate property
Closes gh-5981
2016-06-28 16:38:01 +02:00
Stephane Nicoll c024dc836a Support Spring Mobile for all template engines
Previously, Spring Mobile was only supported for Thymeleaf and JSPs. This
commit improves the auto-configuration to also provide device delegating
support for Freemarker, Groovy Templates and Mustache.

Closes gh-5140
2016-06-28 16:16:34 +02:00
Stephane Nicoll 6dd8e71d06 Merge pull request #5855 from mp911de:issue/cassandra-schema-action
* pr/5855:
  Polish "Add schemaAction property"
  Add schemaAction property to CassandraProperties
2016-06-28 10:22:13 +02:00
Stephane Nicoll 397c64d256 Polish "Add schemaAction property"
Closes gh-5855
2016-06-28 10:21:48 +02:00
Mark Paluch e85cb2c4c5 Add schemaAction property to CassandraProperties
Set schemaAction property in CassandraSessionFactoryBean. Use relaxed
property resolver for enum lookup of the configured schemaAction.

See gh-5855
2016-06-28 10:21:24 +02:00
Andy Wilkinson 4386732376 Merge pull request #6072 from Misagh Moayyed
* gh-6072:
  Polish “Allow connection timeout to be configured via the environment”
  Allow connection timeout to be configured via the environment
2016-06-27 16:57:37 +01:00
Andy Wilkinson 94ba6bdae2 Polish “Allow connection timeout to be configured via the environment”
- Preserve default connection timeout when server.connection-timeout
   has not been set
 - Apply standard coding conventions and formatting

See gh-6072
2016-06-27 16:56:16 +01:00
Misagh Moayyed 6007d7efc1 Allow connection timeout to be configured via the environment
Closes gh-6072
2016-06-27 16:56:16 +01:00
Stephane Nicoll 9891eb5432 Merge pull request #6018 from venilnoronha:issue-5982-fix
* pr/6018:
  Polish "Add ability to filter cookies in trace data"
  Add ability to filter cookies in trace data
2016-06-27 16:41:47 +02:00
Stephane Nicoll 84b2ff5c38 Polish "Add ability to filter cookies in trace data"
Closes gh-6018
2016-06-27 16:41:10 +02:00
Venil Noronha fde5e1b6a5 Add ability to filter cookies in trace data
See gh-6018
2016-06-27 15:43:47 +02:00
Stephane Nicoll 0de5988c0e Use Mongo 3.0 specific API
See gh-6176
2016-06-27 15:28:08 +02:00
Stephane Nicoll 958a0a45f1 Merge branch '1.3.x' 2016-06-27 15:21:03 +02:00
Stephane Nicoll 779537551e Merge pull request #6176 from magiccrafter:master
* pr/6176:
  Polish "Use missing MongoClientOptions in MongoProperties"
  Use missing MongoClientOptions in MongoProperties
2016-06-27 15:17:44 +02:00
Stephane Nicoll 4e07003e1d Polish "Use missing MongoClientOptions in MongoProperties"
Closes gh-6176
2016-06-27 15:14:24 +02:00
Nasko Vasilev 59f9cfb8a6 Use missing MongoClientOptions in MongoProperties
See gh-6176
2016-06-27 15:14:08 +02:00
Stephane Nicoll 33b1f52fa5 Merge branch '1.3.x' 2016-06-27 14:56:26 +02:00
Stephane Nicoll 13403a0f72 Merge pull request #6203 from julien-may:1.3.x
* pr/6203:
  Polish "Add condition on MongoClientFactoryBean"
  Add condition on MongoClientFactoryBean
2016-06-27 14:56:03 +02:00
Stephane Nicoll 7a5fabf59d Polish "Add condition on MongoClientFactoryBean"
Closes gh-6203
2016-06-27 14:55:47 +02:00
Julien May 2003c5e1ae Add condition on MongoClientFactoryBean
This commit makes sure that the condition that links a `MongoClient` to
the embedded mongo server kicks in only if `MongoClientFactoryBean` is
also on the classpath.

Previously, only a condition on the mongo driver existed, leading to
`ClassNotFoundException` if Spring Data MongoDB wasn't available.

See gh-6203
2016-06-27 14:39:20 +02:00
Stephane Nicoll 5656e83ba9 Enable logging of resolved exceptions
Previously, if an exception was resolved by a `HandlerExceptionResolver`
nothing the log indicated a failure to process the query.

This commit adds a new property `spring.mvc.log-resolved-exception` that
enables warning logs for supported `HandlerExceptionResolver` instances.

When Devtools is enabled, this flag is enabled by default.

Closes gh-2176
2016-06-27 14:37:44 +02:00
Andy Wilkinson 1175879fcc Merge pull request #6057 from Alex Antonov
* gh-6057:
  Polish “Allow management server SSL to be configured independently”
  Allow management server SSL to be configured independently
2016-06-27 13:25:02 +01:00
Andy Wilkinson 618535f576 Polish “Allow management server SSL to be configured independently”
This commit polishes b0fbc7e, throwing an exception when an attempt is
made to configure management-specific SSL without also configuring a
custom management port. The testing of management-specific SSL
configuration has also been improved.

See gh-6057
Closes gh-4810
2016-06-27 13:24:42 +01:00
Alex Antonov 3546ae399e Allow management server SSL to be configured independently
Closes gh-6057
2016-06-27 13:24:42 +01:00