Commit Graph

4627 Commits

Author SHA1 Message Date
Dave Syer
88c640ee3c Fix logic error in BeanPath relating to lists of beans
There was a counting error affecting bean paths like
nested[0].foo[1].bar (needed to reset a counter to 0).
Tests seem fine and I added a couple of new ones for that
use case.

Fixes gh-3065
2015-05-29 11:53:51 +01:00
Stephane Nicoll
4c54647460 Merge pull request #3064 from izeye/patch-13
* patch-13:
  Fix redudant assertion in test
2015-05-29 09:56:35 +02:00
izeye
8f0fd21f11 Fix redudant assertion in test
Closes gh-3064
2015-05-29 09:51:44 +02:00
Stephane Nicoll
c6ff911257 Merge pull request #3063 from izeye/patch-11
* patch-11:
  Add default value for endpoints.cors.max-age
2015-05-29 09:45:51 +02:00
izeye
da8f3ec9b8 Add default value for endpoints.cors.max-age
Closes gh-3063
2015-05-29 09:45:18 +02:00
Stephane Nicoll
1457a55e41 Remove spring.cache.config property
Remove `spring.cache.config`  as it is too generic and does not express
enough what is configured. This property is replaced by cache library
specific properties, that is `spring.cache.ehcache.config`,
`spring.cache.hazelcast.config`, `spring.cache.infinispan.config` and
`spring.cache.jcache.config`.

See gh-2633
2015-05-28 18:15:35 +02:00
Stephane Nicoll
6575b31fb1 Merge pull request #3059 from izeye/patch-12
* patch-12:
  Fix allowCredentials property handling
2015-05-28 15:46:24 +02:00
izeye
88612393f3 Fix allowCredentials property handling
Closes gh-3059
2015-05-28 15:44:49 +02:00
Stephane Nicoll
fc067d1b75 Merge branch '1.2.x' 2015-05-28 15:30:27 +02:00
Phil Parker
eb92dfbb3b Fix link to Groovy documentation
Closes gh-3054
2015-05-28 15:28:48 +02:00
Stephane Nicoll
845f620c5a Merge branch '1.2.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2015-05-28 13:37:57 +02:00
Stephane Nicoll
4b825163a2 Upgrade to Tomcat 8.0.23
Closes gh-3058
2015-05-28 13:34:10 +02:00
Stephane Nicoll
cd77b15302 Merge pull request #3030 from aheusingfeld/master
* pull3030:
  Allow auto-reload of log4j2 config
2015-05-28 11:25:11 +02:00
Alexander Heusingfeld
04776232f7 Allow auto-reload of log4j2 config
Log4j2 can auto-reload its configuration file as long as the reference
to a `java.io.File` is provided in the `ConfigurationSource`. Previously,
we always created such `ConfigurationSource` with only the URL regardless
of its type.

Detect when the configuration URL points to a File and create the
`ConfigurationSource` accordingly.

The `spring-boot-sample-actuator-log4j2` has been updated to reload the
logging configuration every 30 sec if necessary.

Fixes gh-3024, gh-3030
2015-05-28 11:24:25 +02:00
Stephane Nicoll
f0b203f6da Update doc for schema creation
See gh-446
2015-05-28 09:45:06 +02:00
Stephane Nicoll
9f9feeb00c Merge pull request #3050 from aahlenst/fix-security-config
* fix-security-config:
  Fix spring-security versions
2015-05-27 17:12:41 +02:00
Andreas Ahlenstorf
9805643e41 Fix spring-security versions
Closes gh-3050
2015-05-27 16:57:56 +02:00
Stephane Nicoll
b838513fda Upgrade to Spring Framework 4.2.0.RC1
Closes gh-2947
2015-05-27 15:31:10 +02:00
Stephane Nicoll
c5566e2755 Fix broken build
Update EnableAutoConfigurationImportSelectorTests to match the new
`excludeName` property.

Closes gh-2660
2015-05-27 15:13:44 +02:00
Stephane Nicoll
a6f671be3e Add excludeName to EnableAutoConfiguration
Allow user to exclude an auto-configuration class by specifying the fully
qualified name instead of the class reference.

Closes gh-2660
2015-05-27 14:24:47 +02:00
Stephane Nicoll
fc61f2e837 Improve documentation for JMX related keys
Closes gh-2747
2015-05-27 11:36:34 +02:00
Stephane Nicoll
51e6eda88a Update documentation for spring.main.sources
Closes gh-2851
2015-05-27 11:11:19 +02:00
Stephane Nicoll
97cf86801b Fix example structure 2015-05-27 11:10:14 +02:00
Stephane Nicoll
e3a124d0f9 Expose additional RabbitMQ settings
Allow SSL to be configured via standard configuration as well as the
requestedHeartbeat. Switch to RabbitConnectionFactoryBean.

Closes gh-2655, gh-2676
2015-05-26 21:32:58 +02:00
Stephane Nicoll
ab55331863 Improve configuration keys documentation 2015-05-26 17:26:01 +02:00
Stephane Nicoll
4ec519fd08 Merge branch '1.2.x' 2015-05-26 16:21:23 +02:00
Stephane Nicoll
f25ce8a381 Fix artifact extension retrieval
Do not rely on the packaging type to figure out what the extension of the
main artifact will be. So far, using `jar` and `war` packaging for `.jar`
and `.war` files worked by chance.

We know retrieve the actual extension as provided by Maven's
`ArtifactHandler`.

Fixes gh-2762
2015-05-26 16:21:00 +02:00
Stephane Nicoll
9f010ed8c0 Merge branch '1.2.x' 2015-05-26 15:01:13 +02:00
Stephane Nicoll
160f2d341f Fix Gzip filter properties
Fix `excludeAgentPatterns`, `excludePaths` and `excludePathPatterns`
properties. Introduce `excludedMimeTypes` property.

Fixes gh-3042
2015-05-26 15:00:54 +02:00
Stephane Nicoll
3423972c40 Merge branch '1.2.x' 2015-05-26 11:23:21 +02:00
Stephane Nicoll
676b7d713a Refine log message
Rework c03e14b to avoid an extra empty space in log message

See gh-3033
2015-05-26 11:23:01 +02:00
Stephane Nicoll
e0d34b9402 Fix build 2015-05-26 11:07:24 +02:00
Stephane Nicoll
04d7df92cc Merge pull request #3040 from izeye/patch-10
* patch-10:
  Fix broken link in doc
2015-05-26 09:49:34 +02:00
izeye
9993b63a63 Fix broken link in doc
Closes gh-3040
2015-05-26 09:49:09 +02:00
Dave Syer
c5dc3f564b Add @EnableOAuth2Sso and spring.oauth2.sso.*
User can enable OAuth2 SSO by declaring the intent (@EnableOAuth2Sso)
and also configuring the client properties (spring.oauth2.client.*).
The spring.oauth2.sso.* are only needed to change the path for the
login (defaults to /login) - any other security configuration for the
protected resources can be added in a WebSecurityConfigurerAdapter
which carries the @EnableOAuth2Sso annotation.
2015-05-26 07:23:26 +01:00
Dave Syer
af320b49bf Rationalize some features and merge in customizers from Spring Cloud 2015-05-26 06:34:43 +01:00
Dave Syer
5468949a55 Update to latest 1.3 code 2015-05-26 06:34:43 +01:00
Greg Turnquist
53f67a448f Auto-configure Spring Security OAuth2 when detected on the classpath
* Automatically spin up Authorization Server and Resource Server
* Automatically configures method level security included OAuth2Expression handler
* Wrote extensive unit tests verifying default behavior as well as the auto-configuration backing off when custom Authorization/Resource servers are included
* Created org.springframework.boot.security.oauth2 subpackage to contain it
* Can also disable either resource of authorization server completely with a single property for each
* Print out the auto-generated secrets and other settings
* Added spring-boot-sample-secure-oauth2 to provide a sample that can be run and poked with curl as well as some automated tests.
* Make users ask for which servers to install by adding @Enable*
* User has to @EnableGlobalMethodSecurity instead of using properties files

Add Spring Security OAuth2 support to Spring Boot CLI

* Triggered from either @EnableAuthorizationServer or @EnableResourceServer
* Needs to have @EnableGlobalMethodSecurity to allow picking the annotation model.
* By default, comes with import support for @PreAuthorize, @PreFilter, @PostAuthorize, and @PostFilter via a single start import
* Also need import support for the enable annotations mentioned above.
* Added extra test case and sample (oauth2.groovy)
2015-05-26 06:34:43 +01:00
Stephane Nicoll
dbc538d054 Merge branch '1.2.x' 2015-05-25 18:25:55 +02:00
Stephane Nicoll
c03e14bee4 Fix missing space in log message
Fixes gh-3033
2015-05-25 18:25:11 +02:00
Stephane Nicoll
b8106ae773 Improve transaction manager detection
Switch the condition used to trigger the creation of a transaction
manager from the default name to the actual type.

Fixes gh-3012
2015-05-22 16:10:43 +02:00
Stephane Nicoll
bd6f7a589c Expose enableFallback property
Add an extra property to control the support of fallback resolution for
mobile views.

Fixes gh-3009, gh-3019
2015-05-21 19:20:06 +02:00
Andy Wilkinson
597e1c3cde Allow custom builder to be used in SpringBootServletInitializer
Previously, to use a custom SpringApplicationBuilder subclass in
SpringBootServletInitializer, it was necessary to either override
createRootApplicationContext or configure and duplicate the logic
that configures the builder with initializers, the context class, etc.

This commit introduces a new method, createSpringApplicationBuilder,
that can be overridden to use a custom builder without having to
duplicate any configuration logic.

Closes gh-2694
2015-05-20 13:47:52 +01:00
Andy Wilkinson
4ca2f78f8f Update JarCommand to use Repackager to add nested jars
Closes gh-2099
2015-05-20 13:31:01 +01:00
Andy Wilkinson
593dff46a0 Merge branch 'gh-3014' 2015-05-20 11:23:53 +01:00
Andy Wilkinson
95f31b0d30 Polish Undertow access logs contribution
- Apply project’s code formatting and conventions
 - Don’t use the IO and worker thread configuration when creating the
   worker for the AccessLogReceiver. The IO and worker thread
   configuration is for HTTP request processing and a worker in its
   default configuration should be sufficient for the access log
   receiver.
 - Don’t use a temporary directory as the default for the access log
   directory. A temporary directory makes (some) sense for Tomcat as it
   requires a directory for its basedir. Undertow has no such
   requirement and using a temporary directory makes it hard to locate
   the logs. The default has been updated to a directory named logs,
   created in the current working directory.
 - Document the new properties in the application properties appendix

Closes gh-3014
2015-05-20 11:02:49 +01:00
Marcos Barbero
90e43737bb Add support for configuring Undertow's access log via the environment
This commit adds support for configuring Undertow's access log via the
environment using the following properties:

server.undertow.access-log-enabled
server.undertow.access-log-pattern
server.undertow.access-log-dir

See gh-3014
2015-05-20 10:50:15 +01:00
Andy Wilkinson
3eb5c348fb Align test with Spring MVC's internals once again
The internals have been updated so that the field that was originally
used, interceptors, can be used again.

This reverts commit 2a1bca6806.
2015-05-20 10:49:16 +01:00
Stephane Nicoll
b26a650f5b Merge branch '1.2.x' 2015-05-20 10:59:07 +02:00
Joe Kutner
dbe310b806 Update Heroku deployment documentation
Closes gh-3000
2015-05-20 10:58:42 +02:00