Commit Graph

975 Commits

Author SHA1 Message Date
Phillip Webb 0cf6efca4f Polish 2015-07-06 13:05:09 -07:00
Stephane Nicoll afd357f45a Reduce ConfigFileApplicationListener logs
Previously, all attempts to log a configuration file were logged at DEBUG
level which lead to a lot of noise as Spring Boot looks in many places by
default.

We now only log the files that are effectively found at DEBUG level and
all failed attempts at TRACE level.

Closes gh-3129
2015-07-06 18:05:36 +02:00
Stephane Nicoll eb10275f5a Polish
Polish 383e94c to validate any `JavaMailSenderImpl` and not only the
one that has been created by auto-configuration.

Closes gh-3409
2015-07-06 14:43:37 +02:00
Eddú Meléndez 6f31080f78 Add mail server connection check
If a `JavaMailSenderImpl` is available, check that the underlying mail
server is available on startup. Add a `spring.mail.test-connection`
property to control this behaviour.

Closes gh-3408
2015-07-06 14:43:37 +02:00
Stephane Nicoll 0eada5df86 Merge branch '1.2.x' 2015-07-06 14:01:56 +02:00
Stephane Nicoll 2da1d37e97 Add profile name provider 2015-07-06 11:55:35 +02:00
Stephane Nicoll 2126c7774a Add a note about transactional listeners
Clarify how the default JMS listener container factory is created if none
exists with regards to transactions.

Issue: SPR-3407
2015-07-06 11:03:44 +02:00
Phillip Webb 35379f627a Polish 2015-07-05 22:34:36 -07:00
Phillip Webb e8085016ba Polish Actuator hypermedia support 2015-07-05 22:28:04 -07:00
Dave Syer eb49f4bfec Documentation for default profiles 2015-07-03 15:52:37 +01:00
izeye 631a02b8bc Fix typo
Closes gh-3403
2015-07-02 07:02:54 -07:00
Dave Syer 74e9e0749b Add support for Spring HATEOAS hypermedia in Actuator endpoints
If spring-hateoas is on the classpath and an MvcEndpoint returns a
@ResponseBody it will be extended and wrapped into a Resource with links.
All the existing endpoints that return sensible JSON data can be extended
this way (i.e. not /logfile). The HAL browser will also be added as an
endpoint if available on the classpath. Finally, asciidocs for the
Actuator endpoints are available as a separate jar file, which if
included in an app will also generate a new (HTTP) endpoint.

Fixes gh-1390
2015-07-02 13:26:02 +01:00
Phillip Webb b5c435f8c4 Polish Actuator MVC customization support
See gh-3345
2015-06-30 22:09:38 -07:00
Dave Syer 1e464da248 Refactor the Actuator MVC configuration to allow more customization
There is a new spring.factories entry for
org.springframework.boot.actuate.autoconfigure.EndpointWebMvcConfiguration
which loads extra beans into the MVC config for the Actuator.
If the management context is a child context all the beans go in the
child (except the Spring Security filter still). A big bonus is that
you can add WebConfigurerAdapters to configure static resources etc.
A new component called ManagementContextResolver can be used to
locate the ApplicationContext for the MVC endpoints.

Fixes gh-3345
2015-06-30 09:42:58 +01:00
Matt Benson ae4559eb4f Create spring-boot-antlib module
Create a new spring-boot-antlib module which allows Apache Ant users
to easily create executable jars.

Fixes gh-3339
2015-06-30 00:30:28 -07:00
Phillip Webb 268b7911dd Rename ResourceProperties.Chain.html5AppCache
Rename the `html5AppCache` property from `ResourceProperties.Chain` to
`html-application-cache`.

Fixes gh-3354
2015-06-29 17:14:44 -07:00
Phillip Webb d213cc05d5 Polish 2015-06-29 16:48:59 -07:00
Andy Wilkinson 00d594dcda Replace GzipFilter and Tomcat compression with general purpose approach
Closes gh-3296
2015-06-29 15:58:57 +01:00
Dave Syer 46fbca66a6 Fix typo 'a' -> 'an' 2015-06-29 06:43:25 +01:00
Dave Syer c39b9f7635 Tweak docs on /health endpoint to reflect secure/sensitive
Fixes gh-2816
2015-06-28 22:13:17 +01:00
izeye 4bc7919e04 Polish doc
Closes gh-3344
2015-06-28 06:33:52 -07:00
Stephane Nicoll a6ccb4a6e0 Polish
Polish resource handling chain support. Make sure that the chain is
enabled automatically if at least one strategy is enabled.

See gh-1604
2015-06-28 06:32:07 -07:00
Brian Clozel dd561d15cf Improve Spring Resource Handling support
This commit improves support of the Resource Handling features
introduced in Spring Framework 4.1. Those features add new ways to
resolve and transform static resources in applications.
See [this blog
post](https://spring.io/blog/2014/07/24/spring-framework-4-1-handling-static-web-resources)
for more details.

The `ResourceUrlEncodinFilter` is added for compatible template engines:
Velocity and Thymeleaf. It assists them with rewriting the URLs of
static resources when rendering templates.

New keys are added in the `ResourceProperties` in order to configure
the Resource Handling chain. `ResourceResolvers` and
`ResourceTransformers` are registered accordingly in
`WebMvcAutoConfiguration`.

Here is an example of enabling a `ContentVersionStrategy` on all
static resources, meaning their names will be changed for cache
busting purposes by adding a content hash at the end of the file name.
Like "/js/jquery.js -> /js/jquery-872ca6a9fdda9e2c1516a84cff5c3bc6.js".

```
spring.resources.chain.enabled:true
spring.resources.chain.strategy.content.enabled:true
spring.resources.chain.strategy.content.paths:/**
```

Closes gh-1604
Closes gh-3123
2015-06-28 06:32:07 -07:00
Phillip Webb 4f072f4046 Update logging documentation
Update logging documentation to show the new `-spring` convention and
the Logback extensions.

See gh-1788
See gh-2558
See gh-3338
2015-06-26 15:59:08 -07:00
Phillip Webb 7879743b9f Polish 2015-06-25 12:00:48 -07:00
Stephane Nicoll 0ec9de9137 Add support for value provider
Improve the "hints" section of the metadata so that each hint can provide
the reference to a value provider.

A value provider defines how a tool can discover the potential values of
a property based on the context. The provider is identifed by a name and
may have an arbitrary number of parameters.

Closes gh-3303
2015-06-25 14:58:10 +02:00
Phillip Webb 855e5a8e5f Minor doc polish 2015-06-24 20:42:16 -07:00
Ralph Schaer f5830bf46e Fix type in deployment documentation
Replace use of `link -s` with `ln -s`.

Fixes gh-3320
2015-06-24 20:39:43 -07:00
Matt Benson f2dfb040ab Update documentation to remove 'shaded jar' term
Update documentation section that discusses uber jars since it conflates
the concepts of the uber jar and the shading of dependencies into jars
(which may or may not be true uber jars).

Fixes gh-3321
2015-06-24 20:37:27 -07:00
Phillip Webb 778e3eb091 Polish 2015-06-24 16:15:12 -07:00
Stephane Nicoll bc9321734f Add support for property hint
Create a new section in the meta-data called "hints" where users can
provide hints about a given property. The most basic use case for now
is to provide a list of values that a property can have. Each value may
have a description.

This sample JSON provides a basic example for a property called `foo.mode`
that exposes 3 values: "auto", "basic" and "advanced".

```
 "hints": [
    {
      "id": "foo.mode",
      "values": [
        {
          "value": "auto",
          "description": "Some smart description."
        },
        {
          "name": "basic"
        },
        {
          "name": "advanced"
        }
      ]
    }
]
```

This information can be read by tools (such as IDE) and offer an
auto-completion with the list of values.

Closes gh-2054
2015-06-24 18:53:11 +02:00
Stephane Nicoll af1afeaf48 Merge branch '1.2.x' 2015-06-24 17:20:49 +02:00
Stephane Nicoll 982b81c675 Fix datasource metrics doc
The maximum and minimum number of connections are no metrics so these
are not exposed. Fix the doc that stated the contrary.

Fixes gh-3319
2015-06-24 17:20:31 +02:00
Stephane Nicoll 117d6b0da3 Fix typo 2015-06-24 11:12:42 +02:00
Johannes Stelzer 308a5eaff5 Add /logfile MVC actuator endpoint
Add a `/logfile` endpoint which can be used to fetch the contents of
the log file (if one is being used).

Fixes gh-2137
Closes gh-2294
2015-06-23 17:14:40 -07:00
Geoffrey Chandler d6200389eb Add support for ANSI colored resource banners
Add AnsiPropertySource which allows named ANSI codes to be resolved
and update ResourceBanner to include it.

This commit also deprecates constants defined in AnsiElement and
replaces them with AnsiStyle, AnsiColor and AnsiBackground enums.

Closes gh-2704
2015-06-23 14:31:49 -07:00
cohee016 d948ec5810 Add Freemarker `prefer-file-system-access` support
Add a `spring.freemarker.prefer-file-system-access` property and update
FreeMarkerAutoConfiguration to support it.

Fixes gh-2901
2015-06-23 11:34:02 -07:00
Andrew Landsverk 487ab1a60a Prevent restart when META-INF/maven/** changes
These files are modified by Eclipse for some reason when you change files
like Thymeleaf HTML files. `META-INF/maven/**` has been added to the
default exclusion.

Closes gh-3295
Closes gh-3297
2015-06-23 14:05:25 +02:00
Dave Syer 92a6e3188b Correct Spring Data REST docs 2015-06-23 09:41:28 +01:00
Phillip Webb 0f977ce864 Polish 2015-06-23 00:47:32 -07:00
Tomasz Przybyła becced5f0b Add `spring.pid.fail-on-write-error` support
Update `ApplicationPidFileWriter` to support a 'fail on write error'
properties which allows the user to exit the application if the PID
file cannot be written.

This commit also deprecates `spring.pidfile` in favor of
`spring.pid.file` so that the new property can be added without overlap.

Fixes gh-2764
2015-06-22 23:43:58 -07:00
Phillip Webb 7fd07b6588 Document jOOQ support
Closes gh-2804
2015-06-22 21:20:12 -07:00
Andy Wilkinson d30dd1fa98 Merge branch '1.2.x' 2015-06-22 13:44:42 +01:00
Andy Wilkinson 01ba0f7571 Make RemoteIpValve's protocolHeaderHttpsValue configurable via the env
Closes gh-3289
2015-06-22 13:44:09 +01:00
Stephane Nicoll 347cbb1ca4 Merge branch '1.2.x' 2015-06-22 10:44:37 +02:00
Stephane Nicoll 5f2ffdb9e2 Update SnakeYAML link
Closes gh-3302
2015-06-22 10:44:23 +02:00
Phillip Webb c417e90215 Update executable jar documentation
See gh-3243
2015-06-18 23:11:12 -07:00
Phillip Webb 3e4bbf05cd Document Apache Artemis support
See gh-3154
2015-06-18 21:00:34 -07:00
izeye 436054053c Fix default MBeanServer bean name in doc
Closes gh-3283
2015-06-18 17:46:05 +02:00
Stephane Nicoll b2960a7221 Fix typo 2015-06-18 16:55:59 +02:00
Stephane Nicoll df4e08834b Fix inconsistency in doc
See gh-3280
2015-06-18 16:55:28 +02:00
Andy Wilkinson fd6d61e8b4 Add auto-configuration support for Spring Session
This commit adds support for automatically configuring Spring Session.
In a web application when both Spring Session and Spring Data Redis
are on the classpath, Spring Session's Redis Http Session support
will be auto-configured. The max inactive interval for Redis-backed
sessions can be configured via the environment using the existing
server.session-timeout property.

Closes gh-2318
2015-06-18 14:52:59 +01:00
Eddú Meléndez 58ca6cdc76 Add support for FieldNamingStrategy
Closes gh-3031
Closes gh-3069
2015-06-18 15:44:32 +02:00
Stephane Nicoll be5e30b409 Migrate spring.view properties
Migrate `spring.view.prefix` and `spring.view.suffix` to
`spring.mvc.view.prefix` and `spring.mvc.view.suffix` respectively. The
former properties are still handled in a backward compatible way and are
defined as deprecated in the meta-data.

Closes gh-3250
2015-06-18 13:55:44 +02:00
Stephane Nicoll fd5d6ef303 Polish 2015-06-18 08:52:47 +02:00
Stephane Nicoll b5d49b3099 Expose additional admin features
Improve SpringApplicationAdminMXBean to expose additional information:

* Whether the application uses an embedded container
* The properties exposed by the `Environment`

This allows to know if the application is web-based and the HTTP port
on which it is running.

Closes gh-3067
2015-06-17 11:52:18 +02:00
Stephane Nicoll c177a774a5 Provide seamless support for local.server.port
Previously, the actual HTTP port on which a web application is running on
was only exposed in tests. This commit makes sure to provide that feature
regardless of the environment so that applications can know on which port
they are actually running on.

If there are several containers, each is exposed via the namespace of
their respective application context.

Closes gh-3259
2015-06-17 11:47:05 +02:00
Stephane Nicoll cb98ee25ff Polish
See gh-2900
2015-06-17 09:27:44 +02:00
Sebastien Deleuze 78a7b6ed66 Add async request timeout property
Add a new `spring.mvc.async.request-timeout` property which can be used
to configure AsyncSupportConfigurer.setDefaultTimeout(..).

Fixes gh-2900
Closes gh-3236
2015-06-16 21:00:43 -07:00
Phillip Webb d87f2713af Merge branch '1.2.x' 2015-06-15 11:38:24 -07:00
Artur Mkrtchyan d6e24a15de Update `logging.path` documentation sample
Update appendix example to use the more common `/var/log` folder rather
than `/var/logs`.

Fixes gh-3225
2015-06-15 11:36:03 -07:00
Andy Wilkinson eab599bd38 Merge branch '1.2.x' 2015-06-15 14:25:41 +01:00
Andy Wilkinson 0253f21f2f Update the link to Bitronix's documentation
Closes gh-3207
2015-06-15 14:25:24 +01:00
Stephane Nicoll ac14072dba Fix typo in documentation
See gh-3232
2015-06-15 11:29:38 +02:00
Eddú Meléndez 0682660387 Add documentation for serialization-inclusion
Document `spring.jackson.serialization-inclusion`.

Closes gh-3224
2015-06-15 08:53:26 +02:00
Stephane Nicoll bb4c89592d Merge branch '1.2.x' 2015-06-14 09:36:25 +02:00
Stephane Nicoll 01ba732a73 Consistent use of "=" for property key
Closes gh-3218
2015-06-14 09:36:10 +02:00
izeye 952f34b828 Fix mbean server property
`spring.jmx.server` was incorrectlyt documented as
`spring.jmx.mbean-server` in the documentation.

Closes gh-3211
2015-06-13 18:20:13 +02:00
Stephane Nicoll b384f0360c Use proper product name for Intellij IDEA 2015-06-12 17:08:50 +02:00
Phillip Webb 24fc94461b Polish 2015-06-11 10:44:52 -07:00
Stephane Nicoll 34e4163ebc Improve configuration keys documentation 2015-06-11 11:17:36 +02:00
Stephane Nicoll 982b74a9b0 Fix property duplication 2015-06-11 10:32:06 +02:00
Stephane Nicoll fcb45a4bb7 Polish devtools documentation
See gh-3088
2015-06-11 09:33:09 +02:00
Phillip Webb e687c9456f Fix documentation bookmarks 2015-06-10 23:32:30 -07:00
Phillip Webb 992a56957f Document spring-boot-devtools module
Fixes gh-3088
2015-06-10 22:06:19 -07:00
Phillip Webb ad7ed1dbae Formatting 2015-06-10 11:26:39 -07:00
Stephane Nicoll c1dea3797a Add documentation for SpringApplicationAdminMXBean
Closes gh-3179
2015-06-10 13:46:37 +02:00
Stephane Nicoll 8c8fce5b0f Merge branch '1.2.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
2015-06-08 15:18:45 +02:00
Stephane Nicoll 7fc9c2afdf Fix indent 2015-06-08 15:17:05 +02:00
Stephane Nicoll e16f5d03ab Add reference to Mustache to documentation
Closes gh-3121
2015-06-08 15:16:01 +02:00
Stephane Nicoll 20cd6c4b6a Merge branch '1.2.x' 2015-06-07 10:29:27 +02:00
izeye c7103bf2a4 Add missing slash
`endpoints.jolokia.path` requires the path to start with a slash.

Closes gh-2864
2015-06-07 10:29:03 +02:00
John Tims 07a688968d Fix typo
Closes gh-3140
2015-06-06 13:36:15 +02:00
Stephane Nicoll 432c00e857 Polish redis connection timeout support
Closes gh-3142
2015-06-06 13:35:31 +02:00
Phillip Webb 98b6fafe92 Fix broken docbook 2015-06-05 16:31:41 -07:00
Phillip Webb c7677d10ca Polish documentation 2015-06-05 15:58:14 -07:00
izeye 9bac5b6455 Remove invalid parts of docs after refactoring 2015-06-05 17:02:12 +02:00
Dave Syer cc169c5009 Change the way the AggregateMetricReader works to make it easier
for users to get started. It also makes it more flexible if different
aggregation keys are needed depending on the environment. The most
important new feature is the
spring.metrics.export.redis.aggregateKeyPattern configuration, which
fits the *.redis.key and prefix defaults. The aggregate reader uses
a prefix based on the key by default, with a naming convention that
the key starts with "keys.".
2015-06-05 11:54:06 +01:00
Phillip Webb 316b07d3b9 Change the embedded script default to disabled
Update the Maven and Gradle repackage tasks so that the embedded
startup script is no longer included by default. This change is
primarily due to the `cf` command line not currently accepting
the unusual jar format.

Fixes gh-3045
2015-06-04 21:59:27 -07:00
Phillip Webb 683c19ee8b Polish 2015-06-04 12:21:35 -07:00
ceilfors 5fb67af25f Remove spock caveat that was fixed in 1.0
Closes gh-3072
2015-06-04 14:51:14 +02:00
Stephane Nicoll f6115a0713 polish
Closes gh-3110
2015-06-04 14:49:49 +02:00
izeye ee252a3285 Document `spring.metrics.export.*` properties
See gh-3110
2015-06-04 14:49:32 +02:00
Phillip Webb 312471f996 Polish documentation 2015-06-04 01:09:59 -07:00
Stephane Nicoll fca192fa41 Add spring-boot-starter-cache
Closes gh-3098
2015-06-03 17:29:57 +02:00
Stephane Nicoll 328e07ebf3 polish mail jndi support
Closes gh-2419
2015-06-02 15:04:35 +02:00
Eddú Meléndez 28cb13c31d Add mail jndi support
See gh-2419
2015-06-02 15:04:06 +02:00
Josh Thornhill 10f7031e46 Fix typo in documentation
Closes gh-3077
2015-06-02 11:50:49 +02:00
Stephane Nicoll fbfdbce266 Add cache documentation
See gh-2633
2015-06-02 11:25:24 +02:00
Josh Thornhill f721862d6f Fix typo in documentation
Closes gh-3077
2015-06-02 09:34:54 +02:00
Stephane Nicoll fc0eed97cf Fix build 2015-06-01 13:25:53 +02:00
Dave Syer 8a83bd12bd Refactor annotations for metric export
Users can add @ExportMetric[Reader,Writer] to readers and writers that
they want to participate in the default exporter. There is also still an
@ActuatorMetricWriter that is used for the legacy (non-Java8) Gauge and
CounterServices.
2015-05-31 12:51:07 +01:00
Dave Syer 80ff92919c Add redis properties as convenience in spring.metrics.export
The redis export and aggregate use case is a lot nicer with this
shared data between the two component types.

Also made MetricExportProperties itself a Trigger (so the default
delay etc. can be configured via spring.metrics.export.*).
2015-05-31 12:18:43 +01: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 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 f0b203f6da Update doc for schema creation
See gh-446
2015-05-28 09:45:06 +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 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 e0d34b9402 Fix build 2015-05-26 11:07:24 +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
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 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
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
Andy Wilkinson 1fe1aa8939 Update RemoteIpValve’s default internal proxies to include 172.16/12
Closes gh-2699
2015-05-19 17:34:53 +01:00
Stephane Nicoll e0f59d8a74 polish batch table prefix customization
See gh-2132
2015-05-19 10:06:09 +02:00
Stephane Nicoll 62a2dd659b Add display-name option
Allow the display-name of the application to be customized when deployed
in an embedded container via the `server.display-name` property.

Closes gh-2600
2015-05-15 16:27:43 +02:00
Stephane Nicoll d63d2dded8 polish
Improve documentation of cors settings.

See gh-2936
2015-05-15 08:45:15 +02:00
Andy Wilkinson 84d3a34c49 Add CORS support to the actuator’s endpoints
This commit adds CORS support to the Actuator’s MVC endpoints. CORS
support is disabled by default and is only enabled once the
endpoints.cors.allowed-origins property has been set.

The new properties to control the endpoints’ CORS configuration are:

endpoints.cors.allow-credentials
endpoints.cors.allowed-origins
endpoints.cors.allowed-methods
endpoints.cors.allowed-headers
endpoints.cors.exposed-headers

The changes to enable Jolokia-specific CORS support (57a51ed) have been
reverted as part of this commit. This provides a consistent approach
to CORS configuration across all endpoints, rather than Jolokia using
its own configuration.

See gh-1987
Closes gh-2936
2015-05-14 11:39:53 +01:00
Dave Syer 3fda744522 Add samples and tweak metrics reader/writers till they work 2015-05-13 13:56:02 +01:00
Dave Syer 60a4943520 Add support for metric export to OpenTSDB 2015-05-13 13:56:02 +01:00
Dave Syer 0bd845d183 Add support for Statsd metric export 2015-05-13 13:56:02 +01:00
Dave Syer 0fde04d325 Add AggregateMetricReader able to aggregate counters and gauges
Different physical sources for the same logical metric just need to
publish them with a period-separated prefix, and this reader will
aggregate (by truncating the metric names, dropping the prefix).

Very useful (for instance) if multiple application instances are
feeding to a central (e.g. redis) repository and you want to
display the results. Useful in conjunction with a
MetricReaderPublicMetrics for hooking up to the /metrics endpoint.
2015-05-13 13:56:01 +01:00
Dave Syer 53a61474aa Add counter and gauge services based on in-memory buffers
This seems pretty efficient (approx 12M write/s as opposed to 2M with
the DefaultCounterService). N.B. there is no need to change most of
the rest of the metrics stuff because metrics are write-often, read-
seldom, so we don't need high performance reads as much.

The Spring Integration configuration and Dropwizard support has changed
a bit. Functionally very similar and probably opaque to users, but now
the messaging operates as an Exporter on a @Scheduled method, and
Dropwizard is a replacement [Gauge,Counter]Service.

Metrics are all
collected live in-memory (and can be very fast with Java 8), buffered
there and shipped out to a MessageChannel (if one exists with id
"metricsChannel") in a background thread.

We can still use Java 8 library APIs (like LongAdder) but to compile
to java 7 compatible byte code we have to forgo the use of lambdas :-(
and shorthand generics (<>).

Fixes gh-2682, fixes gh-2513 (for Java 8 and Dropwizard users).
2015-05-13 13:56:01 +01:00
Andy Wilkinson d4dfa8d979 Polish 18453c0e
Document new configuration properties and remove redundant code
2015-05-13 08:51:01 +01:00
Dave Syer b24e736cfe Add env var parameters to launch.script
Some of the features of the launch.script were not exposed for users
to be able to control at runtime. It now accepts things like
PID_FOLDER and LOG_FOLDER as environment variables, and also adopts
a clear naming convention where only the inputs are UPPER_CASE.
2015-05-12 10:23:44 +01:00
Andy Wilkinson 51c49b69c5 Support bom-based dependency management in the CLI
Previously, the CLI’s dependency management used proprietary Properties
file-based metadata to configure its dependency management. Since
spring-boot-gradle-plugin’s move to using the separate dependency
management plugin the CLI was the only user of this format.

This commit updates the CLI to use Maven boms to configure its
dependency management. By default it uses the spring-boot-dependencies
bom. This configuration can be augmented and overridden using the new
@DependencyManagementBom annotation which replaces @GrabMetadata.

Closes gh-2688
Closes gh-2439
2015-05-07 14:58:23 +01:00
Andy Wilkinson 7e8bad09db Merge branch '1.2.x' 2015-04-30 15:17:18 +01:00
yinheli ef49ced12a Polish Gradle example for using Undertow
Closes gh-2896
2015-04-30 15:17:01 +01:00
Andy Wilkinson 615af0834f Merge branch '1.2.x' 2015-04-22 17:29:36 +01:00
Andy Wilkinson bc27a8aa6e Show different Gradle repository config for snapshots vs releases
Closes gh-2838
2015-04-22 17:29:22 +01:00
Andy Wilkinson 01b45d0c3a Merge branch '1.2.x' 2015-04-21 15:28:37 +01:00
izeye 68ed4dec9b Polish production ready features documentation
Closes gh-2832
2015-04-21 15:28:07 +01:00
Andy Wilkinson 8d52893b04 Merge branch '1.2.x' 2015-04-21 15:20:08 +01:00
izeye b8a45d9117 Fix typo in deployment documentation
Closes gh-2836
2015-04-21 15:19:40 +01:00
Andy Wilkinson 34b986745c Merge branch '1.2.x' 2015-04-21 15:18:14 +01:00
Kamil Szymanski 88d03b76e9 Fix Groovy templates ViewResolver class name and id in How-to docs
Closes gh-2846
2015-04-21 15:17:57 +01:00
Andy Wilkinson 4452bb1873 Revert "Upgrade Gradle plugin’s ID so it’s suitable for the Plugin Portal"
This reverts commit b1c0a7cda4.

The plugin publishing process has moved to a new plugin-based approach
that brings with it some significant limitations:

 - There's no staging to allow the promotion of good release builds
 - There's no easy way to upload an existing artifact
 - There's no control over the published pom.

The risk brought by these limitations, particularly the first, are
too great so we will no be publishing the Boot plugin to the Portal
until they're resolved.

Changing the plugin's ID was a breaking change that would require
users to do some work when they upgrade to Boot 1.3. The ID of the
plugin was changed purely so that it met the Portal's requirements.
Given that the plugin will not be published to the Portal for the
foreseaable future there's no need for us to inflict a breaking change
on people when there will be no benefit.

See gh-1567
2015-04-21 12:37:12 +01:00
Stephane Nicoll 5ccf495c52 Add explicit reference to Flyway
Add an entry for `flyway.*` to make it more explicit that any public
property of the auto-configured `Flyway` object can be set via the
`flyway` prefix.

Closes gh-2667
2015-04-21 10:26:07 +02:00
Eddú Meléndez bd93c75216 Add spring.cache keys documentation
See gh-2633
2015-04-14 14:35:09 +02:00
Stephane Nicoll f480c0de2f Merge branch '1.2.x' 2015-04-14 09:51:58 +02:00
Stephane Nicoll 0f14210937 Polish documentation 2015-04-14 09:51:14 +02:00
Phillip Webb e1152b4db8 Merge branch '1.2.x' 2015-04-13 11:41:03 -07:00
Phillip Webb dd19dd70c5 Update relaxed binding documentation sample
Include getters and setters with the sample class.

Fixes gh-2813
2015-04-13 11:38:42 -07:00
Stephane Nicoll 476f232d49 Fix "spring.mandatory-file-encoding" property doc 2015-04-13 12:23:06 +02:00
Stephane Nicoll 7a4e246f08 Fix typo 2015-04-12 10:55:00 +02:00
Phillip Webb ed57adb5fe Update deployment documentation
Change the "cloud deployment" section to cover general "deployment" and
add documentation for init.d and systemd support.

Closes gh-1117
2015-04-09 10:57:40 -07:00
Andy Wilkinson 03b109a2c8 Polish Elasticsearch health indicator
- Nest the configuration class in HealthIndicatorAutoConfiguration,
   bringing it into line with the other health indicator configuration
   classes
 - Include the statistics from the response in the health’s details
 - Map YELLOW to UP rather than UNKNOWN as it indicates that the cluster
   is running but that “the primary shard is allocated but replicas are
   not” [1]. The details can be used to determine the precise state of
   the cluster.
 - Add a property to configure the time that the health indicator will
   wait to receive a response from the cluster
 - Document the configuration properties
 - Update the tests to cover the updated functionality

See gh-2399

[1] http://www.elastic.co/guide/en/elasticsearch/reference/1.x/cluster-health.html
2015-04-09 10:16:32 +01:00
Andy Wilkinson 1dcf18b16e Allow Jackson's serialization inclusion to be configured via the env
This commit adds support for configuring an ObjectMapper's
serialization inclusion using the environment via the
spring.jackson.serialization-inclusion property. The property's value
should be one of the values on the JsonInclude.Include enumeration.
Relaxed binding of the property value to the enum is supported. For
example:

spring.jackson.serialization-inclusion: non_null

Closes gh-2532
2015-04-08 16:47:49 +01:00
Andy Wilkinson c51277f6eb Merge branch '1.2.x' 2015-04-07 17:49:42 +01:00
izeye d8f45ab6ca Document MultipartProperties
Closes gh-2779
2015-04-07 17:49:15 +01:00
Andy Wilkinson fa4562f408 Polishing: spaces -> tabs 2015-04-07 17:48:40 +01:00
Andy Wilkinson 3df6cb1325 Merge branch '1.2.x' 2015-04-07 11:37:43 +01:00
Andy Wilkinson 212520fa15 Add a property to disable auto-configuration of GzipFilter
Closes gh-2776
2015-04-07 11:24:24 +01:00
Stephane Nicoll 22b1ffd9af Merge branch '1.2.x' 2015-04-03 10:31:37 +02:00
Stephane Nicoll adaf175273 Clarified the naming scheme for starters
Initial update to the documentation to mention how a 3rd party starter
should be named. The current doc sends a completely inconsistent message
to what we actually intend.

See gh-2537
2015-04-03 10:24:11 +02:00
Phillip Webb 5d9efe40d0 Merge branch '1.2.x' 2015-03-30 17:01:08 -07:00
Phillip Webb 495a79c324 Document logging properties with @PropertySource
Add a note to the logging documentation to point out a potential gotcha.

Fixes gh-2709
2015-03-30 16:59:33 -07:00
Phillip Webb 441beee2fa Merge branch '1.1.x' into 1.2.x 2015-03-30 10:07:26 -07:00
Marcin Zajączkowski cbf82c4793 Fix typo in gradle plugin documentation
(cherry-picked from commit 99f1c7b)
2015-03-30 10:06:39 -07:00
Andy Wilkinson 96f390a5a5 Merge branch '1.2.x' 2015-03-30 13:32:08 +01:00
Andy Wilkinson 0b61457d40 Merge branch '1.1.x' into 1.2.x 2015-03-30 13:31:51 +01:00
Andy Wilkinson 617b859842 Reinstate chapter titles in the PDF version of the reference guide
Closes gh-2723
2015-03-30 13:31:09 +01:00
Marcin Zajączkowski 99f1c7bf55 Fix typo in gradle plugin documentation 2015-03-28 10:23:13 +01:00
Phillip Webb 83ee25e543 Merge branch '1.2.x' 2015-03-24 20:17:52 -07:00
Phillip Webb 90bff0b603 Fix outdated RandomAccessJarFile documentation
Fixes gh-2598
2015-03-24 18:24:27 -07:00
Phillip Webb 41a6fa9335 Merge branch '1.2.x' 2015-03-23 09:31:50 -07:00
Phillip Webb 7c9ab5ced2 Minor documentation polish 2015-03-23 09:31:08 -07:00
Stephane Nicoll c57077f174 Merge branch '1.2.x' 2015-03-22 10:09:09 +01:00
Marcel Overdijk c0c67f2593 Update doc
Add note about escaping Spring property placeholders when using Gradle
automatic expansion.

Closes gh-2695
2015-03-22 10:07:44 +01:00
Andy Wilkinson b1c0a7cda4 Upgrade Gradle plugin’s ID so it’s suitable for the Plugin Portal
Gradle’s plugin portal requires each plugin’s ID to be in a namespace.
Our existing ID, spring-boot, does not meet this requirement. This
commit changes the plugin’s ID to org.springframework.boot.spring-boot.
Note that, as is recommended [1], the plugin’s ID does not include
“gradle”.

See gh-1567

[1] http://plugins.gradle.org/submit
2015-03-19 14:25:07 +00:00
Andy Wilkinson 2c3c62d71c Replace basic Gradle dependency management with use of separate plugin
This commit replaces Spring Boot's basic dependency management support
with separate dependency management plugin. This has a number of
benefits including:

1. A Maven bom can be used rather than a custom properties file
2. Dependency management is applied transitively rather than only to
   direct dependencies
3. Exclusions are applied as they would be in Maven
4. Gradle-generated poms are automatically configured with the
   appropriate dependency management

Closes gh-2133
2015-03-19 13:23:40 +00:00
Andy Wilkinson 9444a25de3 Merge branch '1.2.x' 2015-03-18 14:06:36 +00:00
Andy Wilkinson 0a38b9b3ab Enable the configuration of arbitrary Elasticsearch client properties
Previously, only a handful of properties could be set when
auto-configuring an Elasticsearch client. This commit introduces support
for configuring arbitrary properties using the
spring.data.elasticsearch.properties prefix. For example,
client.transport.sniff can be configured using
spring.data.elasticsearch.properties.client.transport.sniff.

Closes gh-1838
2015-03-18 14:06:11 +00:00
Andy Wilkinson b2a68d700f Merge branch '1.2.x' 2015-03-17 11:49:03 +00:00
Andy Wilkinson 89b4cac8b0 Allow Elasticsearch client-transport-sniff to be configured via the env
Previously, a TransportClient sniff property could not be configured
while using Spring Boot’s Elasticsearch auto-configuration. This commit
adds a new property, spring.data.elasticsearch.client-transport-sniff,
that can be used to configure the TransportClient while continuing to
use the auto-configuration support.

Closes gh-1838
2015-03-17 11:48:55 +00:00
Andy Wilkinson dd35718608 Merge branch '1.2.x' 2015-03-17 11:28:03 +00:00
Andy Wilkinson b82e220008 Polish spring-boot-features
Wrap at 90 chars more consistently
2015-03-17 11:26:44 +00:00
izeye a4be4670c3 Polish the documentation
Closes gh-2570
2015-03-17 11:00:31 +00:00
Phillip Webb d266639c0a Merge branch '1.2.x' 2015-03-16 23:21:23 -07:00
Phillip Webb a717813c83 Update required Spring Framework version in docs
The actual required Spring Framework version is 4.1.5.

See gh-2575
2015-03-16 23:20:41 -07:00
Stephane Nicoll 3ecf512ab3 Fix documentation
Add `create` as a valid values for `spring.jpa.hibernate.ddl-auto`

Fixes gh-2641
2015-03-13 17:30:05 +01:00
Stephane Nicoll 7b2b11903a Add ApplicationReadyEvent
Add an event that indicates the Spring Application has fully started and
is now ready to service requests. While ContextRefreshEvent provides
such hook for a regular spring application, this dedicated event is
triggered once all callbacks have been processed and right before the
context is returned to the caller. Besides, such event is triggered once
per application, regardless of the number of (child) contexts that could
have been created.

Closes gh-2638
2015-03-12 09:23:29 +01:00
Eric Dahl 018310e478 Fix broken link in docs 2015-03-10 08:21:21 +01:00
Eric Dahl 47b6d9588c Fix broken link in docs 2015-03-08 14:40:27 -07:00
Maciej Walkowiak f05769dcc5 Add auto-configuration for SendGrid's client
Closes gh-2160
Closes gh-2280
2015-03-05 16:09:56 +00:00
Phillip Webb 8ecbef08a5 Update copyright year in docs 2015-02-26 14:05:45 -08:00
Phillip Webb ee1cab7f5b Improve LevelRemappingAppender documentation
Fixes gh-2443
2015-02-25 14:07:14 -08:00
Phillip Webb 1231da1c2f Add security.basic.authorize-mode property
Add a `security.basic.authorize-mode` property that can be used to
affect how basic security authorization is applied.

Fixes gh-2462
2015-02-25 12:36:55 -08:00
Phillip Webb f7221be7c9 Rename spring.favicon.enabled property
Rename `spring.favicon.enabled` to `spring.mvc.favicon.enabled`.

See gh-2377
2015-02-25 11:36:28 -08:00
izeye 1493da1e03 Improve documentation
Closes gh-2553
2015-02-25 11:32:58 -08:00
Phillip Webb 4895b15bec Add mustache to the documented starters
Closes gh-2242
2015-02-24 21:46:20 -08:00
Phillip Webb d5a82aaed8 Document "annotation processing with Gradle"
Provide details of how to configure Gradle, including the work-around
require to parse any additional metadata files.

Fixes gh-2316
2015-02-24 20:26:54 -08:00
Phillip Webb 7943195d51 Rename RepositoryRestMvcBootConfiguration
Rename RepositoryRestMvcBootConfiguration to
SpringBootRepositoryRestMvcConfiguration so that it follows the same
naming pattern as other custom Spring Boot configurations.

See gh-2392
2015-02-23 21:16:35 -08:00
Phillip Webb 56e31a8c6b Polish 2015-02-23 19:21:37 -08:00
Stephane Nicoll a1b20c3745 Fix typo 2015-02-22 09:48:29 +01:00
StevenGeens dc97d56cb7 Update documentation on resources filtering
Add an explicit note about the spring-boot:run goal that prevents the use
of resources filtering by default.
2015-02-20 13:28:13 +01:00
Dave Syer 1f316a846d AutoConfigurationReport -> ConditionEvaluationReport
Fixes gh-2493
2015-02-18 13:47:20 +00:00
Dave Syer c3c156515f Add extra detail on servlet listeners
Fixes gh-2518
2015-02-18 10:40:47 +00:00
Andy Wilkinson b8babd4eb4 Polish documentation on @ConfigurationProperties getters and setters
- Correct typo (coercable -> coercible)
 - Update description to reflect that Spring 4.1.5 supports the
   expansion of array properties and and a test that verifies the
   behaviour
2015-02-17 11:25:50 +00:00
Andy Wilkinson d87bf707a7 Merge branch '1.1.x' 2015-02-17 10:01:39 +00:00
Dave Syer 5efdb85876 Enhance note about Java Bean getters and setters 2015-02-13 13:11:12 +00:00
Dave Syer e541e139a2 Add note about Java Bean getters and setters
Apparently some users are unclear that setters and getters are
mandatory for @ConfigurationProperties. This should clear it up.
2015-02-13 09:17:28 +00:00
Andy Wilkinson 0ef3de4d82 Document how to disable auto registration of a Servlet or Filter bean
Closes gh-2173
2015-02-11 13:21:49 +00:00
Stephane Nicoll 1035e5b029 Expose RepositoryRestMvcBootConfiguration
If an application defines a custom RepositoryRestMvcConfiguration, all
Spring Boot defaults are lots. While this sounds sensible, it can be
confusing as Spring Boot exposes properties (`spring.data.rest.*`) that
are no longer honored.

RepositoryRestMvcBootConfiguration is now public and can be used as an
extension point for those who need to customize the Spring Data REST
configuration and keep boot's specific defaults.

Fixes gh-2392
2015-02-10 16:00:11 +01:00
Phillip Webb 636898f9ad Polish 2015-02-09 11:39:48 -08:00
izeye 319663a628 Improve doc for application.properties. 2015-02-08 09:58:40 +01:00
Andy Wilkinson b4cb7a35c9 Document spring.http.converters.preferred-json-mapper
See gh-2247
2015-02-05 12:06:19 +00:00
Andy Wilkinson 17f05467bc Document IDEA’s quirky classpath ordering and its effect on templates
Closes gh-2319
2015-02-04 11:35:21 +00:00
Andy Wilkinson e489ab9b29 Update docs to clarify ordering for profile-specific properties
Closes gh-2404
2015-02-03 14:12:04 +00:00
Andy Wilkinson a88f27168a Add support to the Gradle plugin for disabling direct use of resources
The Maven plugin allows spring-boot:run to be configured so that
resources are loaded from their output location rather than from
src/main/resources. This commit adds an equivalent configuration
option to the Gradle plugin. To disable source resources from being
added to the classpath in place of those in the output location
the configure the bootRun tasks like this:

bootRun {
	addResources = false
}

Closes gh-2431
2015-02-03 10:52:10 +00:00
Phillip Webb e1a80fa496 Fix broken reference documentation link 2015-02-02 21:30:49 -08:00
Andy Wilkinson 93d533dfa6 Document auto-configuration support for Spring HATEOAS
Closes gh-2426
2015-02-02 16:53:52 +00:00
Phillip Webb 072f873f34 Polish 2015-02-01 21:37:17 -08:00
Phillip Webb 3328c1369f Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
2015-02-01 20:28:11 -08:00
Phillip Webb 555827cad7 Polish 2015-02-01 20:00:11 -08:00
Andy Wilkinson c37633d867 Merge branch '1.1.x' 2015-01-29 12:43:39 +00:00
Andy Wilkinson c3020e9eff Add a single how to for creating a deployable war file
This commit updates the documentation to describe the three steps
involved in producing a deployable war file in a single place.

Closes gh-2185
2015-01-29 12:42:41 +00:00
Stephane Nicoll 5e36473939 Fix documentation typo 2015-01-27 17:36:22 +01:00
Andy Wilkinson 528a632fd1 Allow XA DataSource and ConnFactory pools to be configured via the env
This commit adds support for configuring the XA DataSource and
ConnectionFactory pools created by Atomikos and Bitronix via the
environment. The property prefixes vary depending on the transaction
manager that’s in use. They are:

Bitronix:
 - spring.jta.bitronix.datasource
 - spring.jta.bitronix.connectionfactory

Atomikos:
 - spring.jta.atomikos.datasource
 - spring.jta.atomikos.connectionfactory

The configuration processor has been updated to ignore
javax.jms.XAConnectionFactory and javax.sql.XADataSource as neither of
these types can be created via property binding.

Closes gh-2027
2015-01-27 10:55:56 +00:00
Andy Wilkinson 4802640399 Reference latest version of Tomcat 7 in the documentation 2015-01-26 14:42:55 +00:00
Andy Wilkinson f96adaf3ac Add some documentation about Java 6 compatibility
Document the need to use a different JTA 1.2 API jar and Tomcat 7 or
Jetty 8 if you’re running on Java 6.

Closes gh-2347
2015-01-22 16:45:46 +00:00
Andy Wilkinson 01344c8617 Add a starter for building a RESTful service with Spring HATEOAS
Closes gh-2396
2015-01-22 15:22:50 +00:00
Andy Wilkinson ea7b5c6e3c Improve support for alternative Log4j 2 configuration file formats
This commit adds support for configuring Log4j 2 with YAML. It also
improves the existing support for configuring Log4j 2 with JSON.

Previously, Log4J2LoggingSystem returned a hard-coded list of standard
config locations that includes both JSON and XML file suffixes. Log4j 
2’s support for JSON configuration files requires Jackson’s ObjectMapper
to be on the classpath so, in its absence, the standard config locations
were incorrect.

This commit updates Log4J2LoggingSystem to return an array of standard
config locations based on what’s on the classpath. It also updates the
documentation to describe the additional dependencies that are required
to enable YAML or JSON-based configuration.

Closes gh-2239
2015-01-22 15:06:20 +00:00
Dave Syer 1be12ee945 Merge branch '1.1.x' 2015-01-20 17:38:31 +00:00
Dave Syer 4e907f19ce Carefully add nested archives from JAR in PropertiesLauncher
If user runs an executable archive then it and its lib directory will be
on the classpath. Entries from loader.path take precedence in a way that
should make sense to users (earlier wins like in CLASSPATH env var).

Also added new integration tests to verify the behaviour (big improvement
on the old ones, which probably aought to be beefed up to the same
standard).

Fixes gh-2314
2015-01-20 17:37:49 +00:00
Andy Wilkinson e19bfd9251 Document how to use Tomcat 7 or Jetty 8 with Gradle
Previously, the documentation only provided examples of the required
configuration for Maven users. This commit adds equivalent configuration
snippets for those using Gradle. It also removes the recommendation to
override the version of the Servlet API as this is unnecessary. The pom
files for the Jetty 8 and Tomcat 7 samples have also been updated
accordingly.

Closes gh-2346
2015-01-19 14:20:30 +00:00
Andy Wilkinson e2f2839d32 Document Tomcat compression and GzipFilter auto-configuration
Closes gh-2031
2015-01-16 12:07:29 +00:00
Phillip Webb 88f824845d Clarify documentation of relaxed binding
Update the "Relaxed binding" with a small table of common relaxed
property names and when they might be used.

Fixes gh-2234
2015-01-07 22:26:01 -08:00
Phillip Webb b6cb629974 Document the logger category used to show password
Fixes gh-2146
2015-01-07 14:48:34 -08:00
Andy Wilkinson 735b96dd0f Document how to configure multiple listeners when using Undertow
Closes gh-2191
2015-01-07 18:04:50 +00:00
Phillip Webb 4ad5c52dd7 Add support for `server.ssl.enabled` property
Fixes gh-2241
2015-01-06 21:51:50 -08:00
Phillip Webb be30385e15 Add @WebIntegrationTest annotation
Add `@WebIntegrationTest` which is similar to `@IntegrationTest` and
`@WebAppConfiguration`. The annotation using Spring's `@BootstrapWith`
annotation rather than `@TestExecutionListeners` which allows it to
work when `@TestExecutionListeners` (even ServletTestExecutionListener)
are declared on the test class.

This annotation is particularly useful for TestNG users that extend
Spring's `AbstractTestNGSpringContextTests` class.

Fixes gh-2299
See gh-1956
See gh-2135
2015-01-06 21:03:48 -08:00
Phillip Webb 6ddabb871a Merge branch '1.1.x' 2015-01-05 11:57:38 -08:00
Phillip Webb 0622b3e987 Fix documentation code example error
The "Customizing ConfigurableEmbeddedServletContainer directly"
section should use `HttpStatus.NOT_FOUND` and not `HttpStatus.404` in
the sample code.

Fixes gh-2258
2015-01-05 11:57:02 -08:00
Eric Dahl aa43f5e037 Update custom HealthIndicator documentation
Update the custom HealthIndicator documentation to use the build()
method rather than the old mechanism.

Fixes gh-2270
2014-12-31 18:53:58 -08:00
Phillip Webb c08f912abd Merge branch '1.1.x' 2014-12-30 14:25:34 -08:00
Russell Allen fe83aed6b2 Grammar correction
Closes gh-2262
2014-12-30 14:24:13 -08:00
Nils Breunese 6248d8c86e Add docs for Spring Boot CLI via MacPorts
Add MacPorts section to reference docs since the Spring Boot CLI
is now also maintained in MacPorts.

Closes gh-2250
2014-12-28 12:26:06 -08:00
Phillip Webb c7cfdbe250 Polish appendix 2014-12-28 12:22:16 -08:00
Phillip Webb 6ece075aec Merge branch '1.1.x' 2014-12-28 12:19:30 -08:00
Phillip Webb a0667ba4bb Polish docs 2014-12-28 12:10:44 -08:00
Stephane Nicoll 2bf01ebeca Merge branch '1.1.x' 2014-12-27 18:28:50 +01:00
Stephane Nicoll 05e402295d Mention environment variables mapping in the guide
Closes gh-2234
2014-12-27 18:28:13 +01:00
Stephane Nicoll 05d47c65db Fix wrong link
Closes gh-2223
2014-12-23 17:38:55 +01:00
Phillip Webb fd97c7553c Apply HATEOAS module to primary ObjectMapper
Update HypermediaAutoConfiguration to apply the Jackson2HalModule to
the primary ObjectMapper. This restores the behavior of Spring Boot
1.1 where HATEOAS types could be serialized for both `application/json`
and `application/json+hal` content types.

A `spring.hateoas.apply-to-primary-object-mapper` property has also been
provided to opt-out if necessary.

Fixes gh-2147
2014-12-22 20:35:50 -08:00
Stephane Nicoll 20c8e54c5f Revert dea1ca9855
Actually collection types are not harmonized to their interface
counterpart; this was implemented in the first proposal but wasn't
applied in the final review.

See gh-2206
2014-12-20 10:31:11 +01:00
pauldub b865539adc Fix typo in howto.adoc 2014-12-19 15:22:28 +01:00
Hendy Irawan ba97090375 Clarify SSL "How-to" documentation
Update the SSL "How-to" documentation to make it clearer that SSL
configuration replaces the usual connector.

Closes gh-2172
See gh-2167
2014-12-17 16:13:28 -08:00
Phillip Webb f35135e43d Polish documentation 2014-12-17 11:33:28 -08:00
Stephane Nicoll 1b039e78e6 Documentation improvement of DataSource configuration
Closes gh-2126
2014-12-17 14:25:33 +01:00
Stephane Nicoll fe5800f8be Fix typo 2014-12-16 14:55:15 +01:00
Stephane Nicoll 77427f53cc Support of Lombok annotated ConfigurationProperties
Previously, no configuration properties were discovered on a class using
lombok instead of regular getters/setters.

This commit adds a support for some of the lombok annotations,
specifically that is @Data, @Getter and @Setter. Provides the same
semantic as what lombok is generating.

Closes gh-2114
2014-12-16 10:41:07 +01:00
Phillip Webb 6b4bb4d654 Unify console and file logback patterns
Update the file log pattern to write the thread name after the `---`
separator. The allows both file and console logs to be parsed in the
same way.

Fixes gh-2136
2014-12-12 19:05:37 -08:00
Phillip Webb fc2e616cc2 Restore Spring Boot 1.1 logging behavior
Refactor LoggingApplicationListener and LoggingSystem to restore
Spring Boot 1.1 logging behavior. The LOG_FILE and LOG_PATH system
properties are now set before configuring the logger.

The `logging.path` property is now once again optional and will not be
used when `logging.file` is specified. The documentation has also been
updated to reflect the changes.

Fixes gh-2121
Fixes gh-2117
2014-12-12 18:40:37 -08:00
Stephane Nicoll f1c893e523 Polish indent 2014-12-12 17:14:10 +01:00
Stephane Nicoll b8612d99c6 Add explicit reference to health.*
Health indicator configuration keys have moved from the health.* to the
management.health.* namespace. This commit adds an explicit reference
to the previous location.

See gh-2128
2014-12-12 17:11:13 +01:00
Stephane Nicoll 2416a935e6 Properly document health indicator config
Health indicator configuration keys have moved from the health.* to the
management.health.* namespace. This commit makes sure that these are
documented properly in 1.1.x as well.

See gh-2118
2014-12-12 17:05:16 +01:00
John 62d3f73e24 Fix "heath" misspellings 2014-12-10 15:25:07 -08:00
Phillip Webb a27217ae43 Provide a way to opt-in to endpoint enablement
Update AbstractEndpoint so that the `enable` property is optional and
when it not specified the `endpoints.enabled` property will be used.

This allows users to switch the way that endpoints are enabled. Rather
than opting-out specific endpoint enablement the `endpoints.enabled`
property can be set to `false` and specific endpoints can be opted-in.

Fixes gh-2102
2014-12-10 12:39:34 -08:00
Phillip Webb 3e2433c842 Update health endpoint sensitive flag in docs 2014-12-10 12:39:34 -08:00
John 3343cd4c90 Fix typo in documentation 2014-12-10 07:49:13 -05:00
Phillip Webb e772174019 Update reference documentation for Spring Boot 1.2
Various updates and polish to prepare the reference documentation for
Spring Boot 1.2.

Fixes gh-1903
2014-12-10 00:56:41 -08:00
Phillip Webb a0ce04ac4b Drop Cloudbees PaaS documentation
Remove the Cloudbees section since they are shutting down their PaaS.

Fixes gh-2105
2014-12-10 00:56:37 -08:00
Phillip Webb e5295c0142 Update HealthInformation reference documentation
Clean and align with changes in Spring Boot 1.2

Fixes gh-2104
2014-12-10 00:51:30 -08:00
Phillip Webb 71fd3b36b4 Update "logging" reference documentation
Update the logging section to reflect changes in Spring Boot 1.2

Fixes gh-1790
2014-12-10 00:50:37 -08:00
Phillip Webb 119a5656e2 Update SpringBootServletInitializer ref docs
Add a hint to show that the `configure` method is now optional.

Fixes gh-2074
2014-12-10 00:49:31 -08:00
Phillip Webb 400b664098 Update "banner" reference documentation
Fixes gh-2103
2014-12-10 00:48:29 -08:00
Stephane Nicoll 1da0deeef6 Add missing keys in appendix 2014-12-09 18:04:47 +01:00
Phillip Webb 083f9757cd Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
2014-12-08 11:16:09 -08:00
Phillip Webb 22e8478aa3 Cross-reference "Create a deployable war" how-to
Add a tip for both the Maven and Gradle "Packaging executable jar and
war files" section referring to the how-to.

Fixes gh-2086
2014-12-08 10:52:54 -08:00
Phillip Webb b651090fcd Document how-to for Weblogic deployment
Fixes gh-2078
2014-12-07 20:11:48 -08:00
Phillip Webb af643e2f54 Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
2014-12-05 10:25:30 -08:00
kakawait f65c7dbeb3 Update 'flyway.locations' appendix documentation
Replace `classpath:db/migrations` with `classpath:db/migrations`.

Fixes gh-2063
2014-12-05 10:23:54 -08:00
Phillip Webb 211f20b9c6 Add setIgnoreDefaultModelOnRedirect support
Add a `spring.mvc.set-ignore-default-model-on-redirect` property to
allow RequestMappingHandlerAdapter.setIgnoreDefaultModelOnRedirect to
be easily customized and change the default value to 'true'.

Fixes gh-2018
2014-12-03 11:31:09 -08:00
Stephane Nicoll 509201907c Polish default value for arrays
See gh-1996
2014-12-03 17:32:00 +01:00
Stephane Nicoll f821fdfffa Fix typo 2014-12-03 17:21:56 +01:00
Stephane Nicoll d9ca0869b5 Fix required Spring Framework version 2014-12-03 09:57:22 +01:00
Stephane Nicoll 4e1c259645 Add requirements documentation section
Fixes gh-1439
2014-12-02 19:48:18 -08:00
Phillip Webb 48db5457f1 Polish 2014-12-01 19:32:05 -08:00
Stephane Nicoll 8ee237a9c6 Fix documentation syntax typo 2014-11-26 18:14:28 +01:00
Andy Wilkinson a83f9c6311 Correct markup in documentation of how to configure Undertow 2014-11-26 10:55:33 +00:00
Dave Syer 3bb598a421 Only hide /health details if the app is actually secure
Also gives the user the option to override (by setting
endpoints.health.sensitive=false).

Fixes gh-1977 in a slightly different way
2014-11-25 16:40:18 +00:00
Andy Wilkinson 55fadf1231 Merge branch '1.1.x' 2014-11-25 13:54:06 +00:00
Andy Wilkinson 2b4eee5e53 Add a note explaining that double backslashes are unnecessary in YAML
Closes gh-1989
2014-11-25 13:52:26 +00:00
Sjoerd Mulder cc557833a4 Escape backslashes in .properties examples of setting internal-proxies
In a properties file, a backslash is used as an escape character for
the line terminator sequence to allow values to be split across
multiple lines. When a backslash is used elsewhere they're stripped
out of the property's value.

This commit updates .properties-based examples for configuring
server.tomcat.internal-proxies to escape the backslahes so that they
are retained in the property's value at runtime.

See gh-1989
2014-11-25 13:39:25 +00:00
Andy Wilkinson 092b861ee3 Merge branch '1.1.x' 2014-11-25 12:32:21 +00:00
Andrea Vacondio 9ef8335881 Fix broken link to the MVC section of the Spring reference docs
Closes gh-1998
2014-11-25 12:31:57 +00:00
Andy Wilkinson a708b28d9d Document restrictions when /health is accessed anonymously
Closes gh-1978
2014-11-25 12:22:23 +00:00
Andy Wilkinson 26a511495e Allow the user to opt-out of anonymous access restrictions for /health
By default, when /health is accessed anonymously, the details are
stripped, i.e. the response will only indicate UP or DOWN. Furthermore
the response is cached for a configurable period to prevent a denial
of service attack.

This commit adds a configuration property,
endpoints.health.restrict-anonymous-access, that can be set to false
to allow full anonymous access to /health. When full access is
allowed, the details will be included in the response and the response
will not be cached.

Closes gh-1977
2014-11-25 12:04:45 +00:00
Andy Wilkinson 023d5bea3b Merge branch '1.1.x' 2014-11-25 10:51:44 +00:00