Commit Graph

500 Commits (f8141cbb95146dd150da1424b9590eb5d7df99e9)

Author SHA1 Message Date
Phillip Webb ba2446a340 Merge branch '1.1.x' 10 years ago
Phillip Webb 285563a509 Use embedded docbook XSLT files
Switch from external docbook XSLT to those shipped as part of the
Maven plugin.

Fixes gh-1942
10 years ago
Andy Wilkinson 05cf686713 Allow servlet context parmeters to be configured via declaratively
Previously, configuration of a ServletContext init parameter required
the use of a ServletContextInitializer bean. This commmit adds
support for declarative configuration via the environment using
server.context_parameters.<name>=<value>.

Closes gh-1791
10 years ago
Phillip Webb 3c6c1d08e0 Polish 10 years ago
Stephane Nicoll eb4c1426d3 Document init CLI command
Closes gh-1799
10 years ago
Stephane Nicoll 8112aca9e8 Add documentation for email integration
Closes gh-1904
10 years ago
Spring Buildmaster 46b7738334 Next development version 10 years ago
Stephane Nicoll 109c3a3439 Auto configure CharacterEncodingFilter
Provide a default UTF-8 encoding for HTTP requests and responses unless
specified otherwise.

Fixes gh-1182
10 years ago
Andy Wilkinson 9259564307 Merge branch '1.1.x' 10 years ago
Andy Wilkinson a9681ea032 Add note to explain that bootRun ignores output from processResources
Closes gh-1739
10 years ago
Andy Wilkinson 634542d594 Merge branch '1.1.x' 10 years ago
Andy Wilkinson c3d2fb5e5c Document details of configuring Gradle to produce valid poms
If a Gradle build is using the Spring Boot Gradle plugin's support for
declaring dependencies without versions then they will be unable to
publish Maven artifacts from the build as the Gradle-generated pom
will fail to validate. This is because Gradle doesn't apply the
Boot-provided dependency versions to the dependencies in the generated
pom.

This can be addressed by configuring Gradle to generate a pom that
either imports spring-boot-dependencies into its dependency management
or that uses spring-boot-starter-parent as its parent. This commit
updates the documentation to document the need for this configuration
and to provide examples of how to do so.

Closes gh-1806
10 years ago
Andy Wilkinson 150b85e10d Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
10 years ago
Andy Wilkinson a9b88d6955 Document need for ServerEndpointExporter and show its use in a sample
Traditionally, a @ServerEndpoint-annotated bean is found by a servlet
container initialiser, however Boot does not run servlet container
initialisers when an embedded container is being used. To be able to use
@ServerEndpoint in a Boot app that uses embedded Tomcat a
ServerEndpointExporter bean must be declared.

This commit updates the documentation to describe this requirement and
also updates the WebSockets sample to illustrate the use of
ServerEndpointExporter. The version of Spring Framework has been updated
to 4.0.8.BUILD-SNAPSHOT. This picks up the fix for SPR-12340.

Closes gh-1722
10 years ago
Andy Wilkinson d2c50813fd Merge branch '1.1.x' 10 years ago
Andy Wilkinson 595f387fb2 Correct the references to WebSecurityConfigurerAdapter in the docs
Closes gh-1861
10 years ago
Stephane Nicoll 00961611b2 Move health.* properties to management.health.*
Fixes gh-1841
10 years ago
Phillip Webb 68571ee535 Document @SpringBootApplication
Add a section to the reference guide about @SpringBootApplication.

See gh-1842
10 years ago
Phillip Webb 0c3911162b Polish 10 years ago
Phillip Webb 96a031cf20 Default spring.datasource.jmx-enabled to false
Change the default value of spring.datasource.jmx-enabled to false
to prevent InstanceAlreadyExistsException problems when using the
Spring Test Framework.

Fixes gh-1590
10 years ago
Phillip Webb 58d660d10d Allow DAO ExceptionTranslator to proxy classes
Update the auto-configured PersistenceExceptionTranslationPostProcessor
to proxy target classes as well as interfaces. Also provide a config
property to disable registration all together.

Fixes gh-1844
10 years ago
Phillip Webb ba0dd60de9 Rename charSet to charset
Rename AbstractTemplateViewResolverProperties.setCharSet/getCharSet to
setCharset/getCharset, deprecating the old method.

Fixes gh-1835
10 years ago
Phillip Webb ab7f73f365 Use dashed case for properties appendix
Additional items added since 1.1.x

Fixes gh-1834
10 years ago
Phillip Webb df1d035162 Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
10 years ago
Phillip Webb 2f17c38822 Use dashed case for properties appendix
Fixes gh-1834
10 years ago
Phillip Webb ea6162254d Update pidfile property and add documentation
Change the pidfile property from `spring.application.pidfile` to
`spring.pidfile` (to save confusion with SpringApplication properties).

Also added documentation and meta-data information.

See gh-1579
10 years ago
Phillip Webb 10d1d5dfb4 Merge branch '1.1.x' 10 years ago
Phillip Webb e1894c1c4b Add check-template-location properties to appendix
Some were missing, some were named incorrectly.

See gh-1827
10 years ago
Stephane Nicoll dba4ad0768 Fix typo 10 years ago
Phillip Webb edaed415fb Polish 10 years ago
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
10 years ago
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
10 years ago
Dave Syer 8be97fa47d Tweak docs on Maven resource filtering some more 10 years ago
Dave Syer d210810535 Tweak docs on Maven resource filtering
Fixes gh-1816
10 years ago
Phillip Webb a973fd41f4 Polish 10 years ago
Dave Syer 9b6cb83be5 Add documentation for Servlet 2.5 and GAE
Fixes gh-1104
10 years ago
Stephane Nicoll fb0d9d2a2e Fix build failure
This commit reworks a7e1ec8 to fix the build failure and update the
documentation regarding default maven filtering option with
spring-boot-starter-parent

Fixes gh-1199
10 years ago
Phillip Webb 9d01d4fa84 Document configuration meta-data
Add an appendix to the reference documentation describing the format
of configuration meta-data and how the annotation processor can be used.

Closes gh-1001
10 years ago
Andy Wilkinson 0cdb1d3f22 Make Spring Security's filter's order configurable and default to zero
Previously, Spring Security's filter had no configured order. Due to
the use of AnnotationAwareOrderComparater this meant that its order
defaulted to LOWEST_PRECEDENCE. This meant that a user had to declare
a FilterRegistrationBean for the filter and explicitly set its order
if they want another filter to run after Spring Security's.

This commit updates the security auto-configuration to assign a
default order of zero to Spring Security's filter, allowing filters
to be easily configured to run before it or after it. This default
value can overridden using the server.filter-order property. The
default order is also exposed as a constant on SecurityProperties,
allowing it to be referenced from other filter declarations.

Closes gh-1640
10 years ago
Phillip Webb d17b7c8195 Polish 10 years ago
Andy Wilkinson 8a1e010d0a Allow multiple templateLoaderPaths to be configured for FreeMarker
Closes gh-1767
10 years ago
Andy Wilkinson bd562c06b6 Merge branch '1.1.x' 10 years ago
Andy Wilkinson f58b8366e1 Correct the syntax that's used for smart single and double quotes
Fixes gh-1753
10 years ago
Dave Syer 6c3d490c74 Add note about springloaded configuration 10 years ago
Dave Syer e8b59b9e55 Add CLI command line arguments examples 10 years ago
Stephane Nicoll e858cfcced Add missing starters in documentation 10 years ago
Phillip Webb 2e7aa4685b Polish 10 years ago
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
10 years ago
Andy Wilkinson 4e636f069f Document the CLI’s install and uninstall commands
Closes gh-1506
10 years ago
Andy Wilkinson 2da4dc00f0 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 7060cc1967 Correct the position of JNDI in the ordered list of property sources
Fixes gh-1693
10 years ago
Andy Wilkinson 7211571969 Fix some grammar issues in docs
Closes gh-1695
10 years ago
Eric Dahl 16937746a0 Fix some grammar issues in docs 10 years ago
Phillip Webb c90633aab6 Polish 10 years ago
Spring Buildmaster 3e71a21b30 Next development version 10 years ago
Phillip Webb b87a591d27 Revert "Add ActiveMQ MQTT connection URL auto-detection"
This reverts commit 0d8bde58c9.

Fixes gh-1679
10 years ago
Phillip Webb 187b4e706c Escape `...*...` outputs using `+...*...+` 10 years ago
Phillip Webb 6281070d0a Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
10 years ago
Phillip Webb 7e842aee77 Escape `...*...` outputs using `+...*...+` 10 years ago
Phillip Webb 4ecf50a1a9 Add `hide-uri-scheme` attribute to docs 10 years ago
Phillip Webb 2303c3aea9 Fix asciidoctor 'spaces' conversion issues 10 years ago
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
10 years ago
Dave Syer 6a503d5ca9 Fix loads of asciidoc errors 10 years ago
Phillip Webb 6a423d7ad1 Add EmbeddedServerPortFileWriter
Add a EmbeddedServerPortFileWriter which can be used to write server
port information to a file.

Fixes gh-1275
Closes gh-1491
10 years ago
Phillip Webb 77ccd9a80b Rename ApplicationPidListener
Rename ApplicationPidListener to ApplicationPidFileWriter (keeping the
old class in a deprecated form)

Fixes gh-1673
10 years ago
Henryk Konsek 0d8bde58c9 Add ActiveMQ MQTT connection URL auto-detection
Fixes gh-1638
10 years ago
Andy Wilkinson 97178915a4 Polish disk space health indicator
- Supply auto-configuration for the new indicator
 - As suggested in the pull request, include the free disk space and
   configured threshold in the health details
 - Update the documentation to describe the indicator and its
   two configuration settings
 - Use @ConfigurationProperties to bind the indicator's configuration.
   This should make the changes sympathetic to the work being done
   to automate the configuration properties documentation

Closes gh-1297
10 years ago
Daniel Fullarton 1dbc94d0f7 Add a logging system, starter and sample for Log4j 2
Closes gh-1565
10 years ago
Phillip Webb 62eb01f0b8 Polish 10 years ago
Phillip Webb 872f30e5d0 Merge branch '1.1.x'
Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
10 years ago
Phillip Webb 9dfbc25eaa Polish 10 years ago
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
10 years ago
Eric Dahl bbf3076d9d Fix some grammar issues in docs 10 years ago
Dave Syer 64ef03aafd Fix Jersey1 integration test 10 years ago
Andy Wilkinson da90e5bc6b Merge branch '1.1.x' 10 years ago
Andy Wilkinson 8349148bbf Remove details of how to switch off RemoteIpValve: it's off by default
See gh-1631
10 years ago
Dave Syer 06fa2a9f78 Merge branch '1.1.x' 10 years ago
Dave Syer 1b8f579da2 Clarify activation of RemoteIpValve
Fixes gh-1631
10 years ago
Dave Syer 104d625785 Merge branch '1.1.x' 10 years ago
Dave Syer 034362b6e5 Explicit example for spring.jpa.properties.hibernate.*
Fixes gh-1636
10 years ago
Andy Wilkinson 7434d53369 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 45a168a47b Use correct version when linking to Spring and Spring Security docs
Closes gh-1621
10 years ago
Marcel Overdijk e070d55491 Make Jackson date format and property naming strategy configurable
Allow the environment to be used to configure Jackson's date format
and property naming strategy

Closes gh-1628
10 years ago
Spring Buildmaster edb4b7ed7d Next development version 10 years ago
Phillip Webb 1ed90df630 Merge branch '1.1.x' 10 years ago
Phillip Webb bff39e954e Add `server.tomcat.port-header` support
Update Tomcat ServerProperties to support the RemoteIpValve portHeader
property.

Fixes gh-1616
10 years ago
Andy Wilkinson 0c63406b49 Merge branch '1.1.x' 10 years ago
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
10 years ago
Phillip Webb 55a84c7bd7 Merge branch '1.1.x' 10 years ago
Phillip Webb 142216400a Polish formatting 10 years ago
Dave Syer 97dcd24668 Merge branch '1.1.x' 10 years ago
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
10 years ago
Andy Wilkinson c2e588a37c Merge branch '1.1.x' 10 years ago
N Jain a8af254765 Fix description of test file to be tests.groovy
Corrected the documentation to refer to file as tests.groovy, rather
than test.groovy. Updated cope snippet as tests.groovy should expect
"Hello World!" rather than "Hello World".

Closes gh-1593
10 years ago
Stephane Nicoll aeeade2ed5 Merge missed documentation update
Cherry pick documentation updates which appear to have been
lost during a previous merge.

Fixes gh-1523
Cheery-picked from 16c2477d
10 years ago
Phillip Webb 62a5ce52d0 Backport Jetty/Tomcat SSL support
Fixes gh-1570
Cherry-picked from 0960908 and 258c6f1
10 years ago
Andy Wilkinson 284e7b2091 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 468b6cb1f7 Add support for configuring RemoteIpValve’s internalProxies
Closes gh-1522
10 years ago
Andy Wilkinson 4b25b0e7a2 Allow Jackson features to be configured via the environment
Enhance JacksonAutoConfiguration to configure features on the
ObjectMapper it creates based on the following configuration
properties:

spring.jackson.deserialization.* = true|false
spring.jackson.generator.* = true|false
spring.jackson.mapper.* = true|false
spring.jackson.parser.* = true|false
spring.jackson.serialization.* = true|false

The final part of each property name maps onto an enum. The enums are:

deserialization: com.fasterxml.jackson.databind.DeserializationFeature
generator: com.fasterxml.jackson.core.JsonGenerator.Feature
mapper: com.fasterxml.jackson.databind.MapperFeature
parser: com.fasterxml.jackson.core.JsonParser.Feature
serialization: com.fasterxml.jackson.databind.SerializationFeature

Closes gh-1227
10 years ago
Phillip Webb 565e449d89 Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/howto.adoc
10 years ago