Commit Graph

234 Commits

Author SHA1 Message Date
Phillip Webb c7677d10ca Polish documentation 2015-06-05 15:58:14 -07:00
ceilfors 5fb67af25f Remove spock caveat that was fixed in 1.0
Closes gh-3072
2015-06-04 14:51:14 +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
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 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 97cf86801b Fix example structure 2015-05-27 11:10:14 +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
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
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
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
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
Phillip Webb ee1cab7f5b Improve LevelRemappingAppender documentation
Fixes gh-2443
2015-02-25 14:07:14 -08:00
izeye 1493da1e03 Improve documentation
Closes gh-2553
2015-02-25 11:32:58 -08:00
Phillip Webb 56e31a8c6b Polish 2015-02-23 19:21:37 -08: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
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
Phillip Webb 636898f9ad Polish 2015-02-09 11:39:48 -08: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 93d533dfa6 Document auto-configuration support for Spring HATEOAS
Closes gh-2426
2015-02-02 16:53:52 +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
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
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
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
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
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 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 400b664098 Update "banner" reference documentation
Fixes gh-2103
2014-12-10 00:48:29 -08:00
Stephane Nicoll 8ee237a9c6 Fix documentation syntax typo 2014-11-26 18:14:28 +01:00
Andy Wilkinson 023d5bea3b Merge branch '1.1.x' 2014-11-25 10:51:44 +00:00
Andy Wilkinson feddb2e8a1 Note that @IntegrationTest and @WebAppConfiguration can be used with Spock
Closes gh-1908
2014-11-25 10:51:27 +00:00
Phillip Webb c34cfb27a3 Polish 2014-11-19 10:52:26 -08:00
Dave Syer 7fa0ea7c3b Add support for spring.jersey.type=filter
Fixes gh-1756
2014-11-19 16:51:55 +00:00
Andy Wilkinson 90af8bf54a Add auto-configuration for Jetty 9's WebSocket support
Closes gh-1269
2014-11-19 14:44:54 +00:00
Andy Wilkinson 1864d79077 Polish Undertow contribution
Closes gh-1779
2014-11-18 21:20:34 +00:00
Phillip Webb 3c6c1d08e0 Polish 2014-11-17 09:37:56 -08:00
Stephane Nicoll 8112aca9e8 Add documentation for email integration
Closes gh-1904
2014-11-17 14:43:46 +01:00
Andy Wilkinson d2c50813fd Merge branch '1.1.x' 2014-11-10 09:42:32 +00:00
Andy Wilkinson 595f387fb2 Correct the references to WebSecurityConfigurerAdapter in the docs
Closes gh-1861
2014-11-10 09:41:18 +00:00
Phillip Webb 68571ee535 Document @SpringBootApplication
Add a section to the reference guide about @SpringBootApplication.

See gh-1842
2014-11-06 22:50:25 -08:00
Phillip Webb edaed415fb Polish 2014-11-04 09:09:26 -08:00
Stephane Nicoll 9dec27e7bf Permit to disable JTA using a single property
Disable JTA auto-configuration altogether with a simple property. This
can be useful if the environment is JTA capable but the application does
not require it.

Fixes gh-1457
2014-11-04 16:53:54 +01:00
Stephane Nicoll cbd3c39640 Override StringHttpMessageConverter with UTF-8
Override the default StringHttpMessageConverter provided by the standard
Spring MVC configuration so that is uses UTF-8 instead of the aging
default of the servlet spec (that is ISO-8859-1)

Fixes gh-1800
2014-11-04 13:12:19 +01:00
Andy Wilkinson bd562c06b6 Merge branch '1.1.x' 2014-10-28 11:06:23 +00:00
Andy Wilkinson f58b8366e1 Correct the syntax that's used for smart single and double quotes
Fixes gh-1753
2014-10-28 11:03:35 +00:00
Phillip Webb 2e7aa4685b Polish 2014-10-21 20:34:00 -07:00
Andy Wilkinson 01fd8cb8f3 Reinstate Bitronix's default server ID, provide property to override it
Previously, Bitronix's server ID was hard-coded to be
spring-boot-jta-bitronix. This created the possibility of multiple
transaction managers performing recovery on each other's behalf as
they would be unable to identify their own XIDs due to the common
server ID.

This commit reinstates the default (which is the IP address of the
machine on which Bitronix is running), and introduces a new
property, spring.jta.transaction-manager-id, that can be used to
configure the id for both Atomikos and Bitronix. A cautionary note
has also been added to the documentation for Atomikos and Bitronix
explaining the need to configure this property.

Closes gh-1548
2014-10-16 09:44:42 +01:00
Andy Wilkinson 2da4dc00f0 Merge branch '1.1.x' 2014-10-13 15:36:14 +01:00
Andy Wilkinson 7060cc1967 Correct the position of JNDI in the ordered list of property sources
Fixes gh-1693
2014-10-13 15:35:06 +01:00
Andy Wilkinson 7211571969 Fix some grammar issues in docs
Closes gh-1695
2014-10-13 13:18:24 +01:00
Eric Dahl 16937746a0 Fix some grammar issues in docs 2014-10-13 12:22:14 +01:00
Phillip Webb 187b4e706c Escape `...*...` outputs using `+...*...+` 2014-10-09 13:04:35 -07:00
Phillip Webb 6281070d0a Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
2014-10-09 13:00:27 -07:00
Phillip Webb 7e842aee77 Escape `...*...` outputs using `+...*...+` 2014-10-09 12:41:39 -07:00
Dave Syer 8ffe7ec4b8 Fix asciidoctor syntax problems and updgrade to asciidoctor 1.5
Points to note for authors:

* Nesting "*" in `literals` does not behave like Markdown - you have to
escape the asterisk (e.g. `foo/\*`)

* Quote ligatures (why we had to use those I don't really know) are
different in asciidoctor 1.5 ('`foo`' instead of ``foo'')

Merge branch '1.1.x'

Conflicts:
	spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
2014-10-09 10:58:06 +01:00
Dave Syer 6a503d5ca9 Fix loads of asciidoc errors 2014-10-09 10:51:25 +01:00
Phillip Webb 62eb01f0b8 Polish 2014-10-06 12:03:51 -07:00
Sebastien Deleuze 315213ea4e Support Jackson based XML serialization and Jackson2ObjectMapperBuilder
This commit introduces support for Jackson based XML serialization, using the
new MappingJackson2XmlHttpMessageConverter provided by Spring Framework
4.1. It is automatically activated when Jackson XML extension is detected on the
classpath.

Jackson2ObjectMapperBuilder is now used to create ObjectMapper and XmlMapper
instances with the following customized properties:
 - MapperFeature.DEFAULT_VIEW_INCLUSION is disabled
 - DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES is disabled

JodaModuleAutoConfiguration and Jsr310ModuleAutoConfiguration have been removed
since their behaviors are now handled directly by the ObjectMapper builder.

In addition to the existing @Bean of type ObjectMapper support, it is now
possible to customize Jackson based serialization properties by declaring
a @Bean of type Jackson2ObjectMapperBuilder.

Fixes gh-1237
Fixes gh-1580
Fixes gh-1644
2014-10-06 10:54:38 +01:00
Eric Dahl bbf3076d9d Fix some grammar issues in docs 2014-10-02 20:45:05 -07:00
Dave Syer 64ef03aafd Fix Jersey1 integration test 2014-10-02 15:28:27 +01:00
Dave Syer 104d625785 Merge branch '1.1.x' 2014-10-01 15:36:22 +01:00
Dave Syer 034362b6e5 Explicit example for spring.jpa.properties.hibernate.*
Fixes gh-1636
2014-10-01 15:35:52 +01:00
Andy Wilkinson 0c63406b49 Merge branch '1.1.x' 2014-09-25 19:06:37 +01:00
Andy Wilkinson 72ef1d6554 Update ErrorPageFilter so it won’t try to forward a committed response
In some scenarios, the ErrorPageFilter will want to forward the request
to an error page but the response has already been committed. One common
cause of this is when the filter’s running on WAS. WAS calls
flushBuffer() (which commits the response), upon a clean exit from a
servlet’s service method.

Previously, the filter would attempt the forward, even if the response
was committed. This would result in an IllegalStateException and a
possibly incomplete response that may also have an incorrect status
code.

This commit updates the ErrorPageFilter to check to see if the response
has already been committed before it attempts to forward the request to
the error page. If the response has already been committed, the filter
logs an error and allows the container’s normal handling to kick in.
This prevents an IllegalStateException from being thrown.

This commit also updates the response wrapper to keep track of when
sendError has been called. Now, when flushBuffer is called, if
sendError has been called, the wrapper calls sendError on the wrapped
response. This prevents the wrapper from suppressing an error when the
response is committed before the request handling returns to the error
page filter.

Closes gh-1575
2014-09-25 19:05:59 +01:00
Phillip Webb 55a84c7bd7 Merge branch '1.1.x' 2014-09-24 14:12:02 -07:00
Phillip Webb 142216400a Polish formatting 2014-09-24 12:04:40 -07:00
Dave Syer 97dcd24668 Merge branch '1.1.x' 2014-09-22 12:16:21 +01:00
Dave Syer a63d0b4e16 Update docs with DispatcherType.ERROR for filters
Some frameworks handle all requests in a Filter, so you have to
explicitly register it as an ERROR dispatcher.

See gh-1272
2014-09-22 12:15:02 +01:00
Phillip Webb 565e449d89 Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/howto.adoc
2014-09-15 11:37:50 -07:00
Phillip Webb 5ba86a103d Polish 2014-09-15 11:35:16 -07:00
Stephane Nicoll 037e3a4221 Fix typo in documentation
Fixes gh-1527
2014-09-12 12:22:23 -05:00
Andy Wilkinson dde7ebf30f Merge branch '1.1.x' 2014-09-07 15:45:53 -05:00
John Tims a4e08beebc Add missing variable to the example in the Loading YAML section
Closes gh-1524
2014-09-07 15:43:22 -05:00
David Liu 8e9e502b6a Add support for auto-configuration of Commons DBCP2
Closes gh-1292
Closes gh-1477
2014-09-07 10:43:48 -05:00
Andy Wilkinson ad8be26efd Merge branch '1.1.x' 2014-09-04 17:04:43 +01:00
Andy Wilkinson 990213b8b8 Correct reference to ConfigurableEmbeddedServletContainerFactory
Closes gh-1500
2014-09-04 17:04:38 +01:00
Phillip Webb f7cffce695 Allow custom JNDI ConnectionFactory lookup
Add a `spring.jms.jndi-name` property to allow a JMS ConnectionFactory
to be obtained from a custom JNDI location.

Fixes gh-1471
2014-09-03 18:35:45 -07:00
Phillip Webb 6f62fc854b Merge branch '1.1.x' 2014-09-03 11:45:54 -07:00
Phillip Webb 449752c9e2 Minor asciidoctor formatting 2014-09-03 08:38:31 -07:00