Commit Graph

644 Commits

Author SHA1 Message Date
Spring Buildmaster
46b7738334 Next development version 2014-11-11 17:12:24 -08:00
Stephane Nicoll
109c3a3439 Auto configure CharacterEncodingFilter
Provide a default UTF-8 encoding for HTTP requests and responses unless
specified otherwise.

Fixes gh-1182
2014-11-11 12:01:15 +01:00
Andy Wilkinson
9259564307 Merge branch '1.1.x' 2014-11-10 13:31:33 +00:00
Andy Wilkinson
a9681ea032 Add note to explain that bootRun ignores output from processResources
Closes gh-1739
2014-11-10 13:29:57 +00:00
Andy Wilkinson
634542d594 Merge branch '1.1.x' 2014-11-10 12:37:14 +00:00
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
2014-11-10 12:33:25 +00:00
Andy Wilkinson
150b85e10d Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-11-10 11:29:21 +00:00
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
2014-11-10 11:27:56 +00: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
Stephane Nicoll
00961611b2 Move health.* properties to management.health.*
Fixes gh-1841
2014-11-07 07:20:34 +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
0c3911162b Polish 2014-11-06 22:48:40 -08:00
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
2014-11-06 21:38:07 -08:00
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
2014-11-06 19:13:50 -08:00
Phillip Webb
ba0dd60de9 Rename charSet to charset
Rename AbstractTemplateViewResolverProperties.setCharSet/getCharSet to
setCharset/getCharset, deprecating the old method.

Fixes gh-1835
2014-11-05 16:57:05 -08:00
Phillip Webb
ab7f73f365 Use dashed case for properties appendix
Additional items added since 1.1.x

Fixes gh-1834
2014-11-05 16:52:59 -08:00
Phillip Webb
df1d035162 Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
2014-11-05 16:51:33 -08:00
Phillip Webb
2f17c38822 Use dashed case for properties appendix
Fixes gh-1834
2014-11-05 16:50:21 -08:00
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
2014-11-05 08:29:17 -08:00
Phillip Webb
10d1d5dfb4 Merge branch '1.1.x' 2014-11-05 08:11:54 -08:00
Phillip Webb
e1894c1c4b Add check-template-location properties to appendix
Some were missing, some were named incorrectly.

See gh-1827
2014-11-05 08:10:59 -08:00
Stephane Nicoll
dba4ad0768 Fix typo 2014-11-05 14:35:50 +01: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
Dave Syer
8be97fa47d Tweak docs on Maven resource filtering some more 2014-11-04 10:41:47 +00:00
Dave Syer
d210810535 Tweak docs on Maven resource filtering
Fixes gh-1816
2014-11-04 10:29:55 +00:00
Phillip Webb
a973fd41f4 Polish 2014-11-03 18:49:20 -08:00
Dave Syer
9b6cb83be5 Add documentation for Servlet 2.5 and GAE
Fixes gh-1104
2014-11-03 17:04:57 +00:00
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
2014-11-03 14:01:51 +01:00
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
2014-11-02 21:49:42 -08:00
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
2014-10-30 14:11:45 +00:00
Phillip Webb
d17b7c8195 Polish 2014-10-29 12:08:37 -07:00
Andy Wilkinson
8a1e010d0a Allow multiple templateLoaderPaths to be configured for FreeMarker
Closes gh-1767
2014-10-29 17:42:48 +00: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
Dave Syer
6c3d490c74 Add note about springloaded configuration 2014-10-27 17:22:35 +00:00
Dave Syer
e8b59b9e55 Add CLI command line arguments examples 2014-10-27 08:11:53 +00:00
Stephane Nicoll
e858cfcced Add missing starters in documentation 2014-10-24 13:58:15 +02: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
4e636f069f Document the CLI’s install and uninstall commands
Closes gh-1506
2014-10-14 10:49:53 +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
c90633aab6 Polish 2014-10-10 17:27:26 -07:00
Spring Buildmaster
3e71a21b30 Next development version 2014-10-10 15:19:47 -07:00
Phillip Webb
b87a591d27 Revert "Add ActiveMQ MQTT connection URL auto-detection"
This reverts commit 0d8bde58c9.

Fixes gh-1679
2014-10-09 19:24:47 -07: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
Phillip Webb
4ecf50a1a9 Add hide-uri-scheme attribute to docs 2014-10-09 12:41:39 -07:00
Phillip Webb
2303c3aea9 Fix asciidoctor 'spaces' conversion issues 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
6a423d7ad1 Add EmbeddedServerPortFileWriter
Add a EmbeddedServerPortFileWriter which can be used to write server
port information to a file.

Fixes gh-1275
Closes gh-1491
2014-10-08 23:03:35 -07:00
Phillip Webb
77ccd9a80b Rename ApplicationPidListener
Rename ApplicationPidListener to ApplicationPidFileWriter (keeping the
old class in a deprecated form)

Fixes gh-1673
2014-10-08 21:30:35 -07:00
Henryk Konsek
0d8bde58c9 Add ActiveMQ MQTT connection URL auto-detection
Fixes gh-1638
2014-10-08 11:53:06 -07:00
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
2014-10-08 17:24:38 +01:00
Daniel Fullarton
1dbc94d0f7 Add a logging system, starter and sample for Log4j 2
Closes gh-1565
2014-10-08 15:30:00 +01:00
Phillip Webb
62eb01f0b8 Polish 2014-10-06 12:03:51 -07:00
Phillip Webb
872f30e5d0 Merge branch '1.1.x'
Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
2014-10-06 10:29:04 -07:00
Phillip Webb
9dfbc25eaa Polish 2014-10-06 10:26:12 -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
Andy Wilkinson
da90e5bc6b Merge branch '1.1.x' 2014-10-01 16:24:16 +01:00
Andy Wilkinson
8349148bbf Remove details of how to switch off RemoteIpValve: it's off by default
See gh-1631
2014-10-01 16:23:00 +01:00
Dave Syer
06fa2a9f78 Merge branch '1.1.x' 2014-10-01 15:44:16 +01:00
Dave Syer
1b8f579da2 Clarify activation of RemoteIpValve
Fixes gh-1631
2014-10-01 15:43:41 +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
7434d53369 Merge branch '1.1.x' 2014-10-01 14:29:19 +01:00
Andy Wilkinson
45a168a47b Use correct version when linking to Spring and Spring Security docs
Closes gh-1621
2014-10-01 14:29:08 +01:00
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
2014-09-30 11:07:29 +01:00
Spring Buildmaster
edb4b7ed7d Next development version 2014-09-25 21:02:37 -07:00
Phillip Webb
1ed90df630 Merge branch '1.1.x' 2014-09-25 13:06:54 -07:00
Phillip Webb
bff39e954e Add server.tomcat.port-header support
Update Tomcat ServerProperties to support the RemoteIpValve portHeader
property.

Fixes gh-1616
2014-09-25 13:04:12 -07: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
Andy Wilkinson
c2e588a37c Merge branch '1.1.x' 2014-09-22 09:13:21 +01:00
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
2014-09-22 09:12:59 +01:00
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
2014-09-17 11:20:56 -07:00
Phillip Webb
62a5ce52d0 Backport Jetty/Tomcat SSL support
Fixes gh-1570
Cherry-picked from 0960908 and 258c6f1
2014-09-17 10:08:05 -07:00
Andy Wilkinson
284e7b2091 Merge branch '1.1.x' 2014-09-16 15:40:23 +01:00
Andy Wilkinson
468b6cb1f7 Add support for configuring RemoteIpValve’s internalProxies
Closes gh-1522
2014-09-16 15:40:18 +01:00
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
2014-09-16 09:59:59 +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
Andy Wilkinson
8deb88b3c0 Merge branch '1.1.x' 2014-09-15 16:40:42 +01:00
Andy Wilkinson
2ba2cfe23d Document build-time property expansion using Gradle
Closes gh-1540
2014-09-15 16:25:00 +01:00
Dave Syer
bfab6b45f5 Merge branch '1.1.x' 2014-09-13 11:01:10 -05:00
Dave Syer
7828f2a5d3 Update docs on metrics names 2014-09-13 11:00:55 -05:00
Vladimir Tsanev
258c6f116a Add store type and store provider properties to SSL configuration
Closes gh-1545
2014-09-12 14:50:06 -05:00
Stephane Nicoll
037e3a4221 Fix typo in documentation
Fixes gh-1527
2014-09-12 12:22:23 -05:00
Christoph Strobl
c8a4891441 Add support for Redis Sentinel configuration
Spring Data Redis 1.4.0 introduced Redis Sentinel support. When
specified, RedisConnectionFactory uses the Sentinel configuration to
determine the current master.

Sentinel configuration can be specified using two new properties:
spring.redis.sentinel.master and spring.redis.sentinel.nodes.

For example:

spring.redis.sentinel.master=mymaster # name of redis server
spring.redis.sentinel.nodes=127.0.0.1:26379,127.0.0.1:26380

Alternatively, a bean of type RedisSentinelConfiguration can be declared
and it will be used to configure the connection factory.

Note: At this time, Sentinel support is only available for Jedis

Closes gh-1337
2014-09-07 17:00:38 -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
Christoph Frick
3b07e4e633 Fix typos in the documentation: though -> through
Closes gh-1510
2014-09-07 11:03:49 -05:00
Christoph Frick
5455b42d32 Fix typos in the documentation: though -> through
Closes gh-1510
2014-09-07 11:00:09 -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
Stephane Nicoll
8ed461947f Improve RabbitMQ support in CLI
This commit deprecates the proprietary EnableRabbitMessaging annotation
in favour of the standard @EnableRabbit introduced as of Spring Rabbit
1.4.

Fixes gh-1494
2014-09-05 17:52:20 +02:00
Dave Syer
9a2f9825d1 Fix asciidoc syntax 2014-09-05 16:33:32 +01:00
Dave Syer
993c7691ec Fix recommended authentication configuration to match samples 2014-09-05 16:30:54 +01:00
Spring Buildmaster
d63e4b4329 Next development version 2014-09-04 12:15:18 -07: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
35a840a396 Replace mavenCentral() with jcenter() in docs
Fixes gh-1373
2014-09-03 18:46:56 -07: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
Stephane Nicoll
383288f1c2 Merge branch '1.1.x' 2014-09-03 16:32:24 +02:00
Stephane Nicoll
811f5ab80c Clarify the use of spring.profiles
Fixes gh-1470
2014-09-03 16:30:55 +02:00
Phillip Webb
236026a43a Support mixed XA/non-XA ConnectionFactory beans
Update ActiveMQ and HornetQ XA configurations to also expose non-xa
ConnectionFactory variants.

Fixes gh-1461
2014-09-02 13:00:59 -07:00
Phillip Webb
5001b038cb Expose additional pool metrics
Expose `max` and `min`, alongside the existing `active` and `usage`
metrics.
2014-09-01 12:38:31 -07:00
Stephane Nicoll
53c4859a6a Reuse data source validation query in health endpoint
This commit improves DataSourceMetadata to expose the validation
query. This can be used by DataSourceHealthIndicator as the query
to use instead of "guessing" which query could be applied according
to the database type.

Fixes gh-1282
2014-08-29 14:58:01 +02:00
Stephane Nicoll
3dc932db88 DataSource metrics
This commit adds an abstraction that provides a standard manner to
retrieve various metadata that are shared by most data sources.

DataSourceMetadata is implemented by the three data source
implementations that boot supports out-of-the-box: Tomcat, Hikari and
Commons dbcp.

This abstraction is used to provide two additional metrics per data
source defined in the application: the number of allocated
connection(s) (.active) and the current usage of the connection pool
(.usage).

All such metrics share the 'datasource.' prefix. The prefix is further
qualified for each data source:

* If the data source is the primary data source (that is either the
  only available data source or the one flagged @Primary amongst the
  existing ones), the prefix is "datasource.primary"
* If the data source bean name ends with "dataSource", the prefix is
  the name of the bean without it (i.e. batchDataSource becomes batch)
* In all other cases, the name of the bean is used

It is possible to override part or all of those defaults by
registering a bean with a customized version of
DataSourcePublicMetrics.

Additional DataSourceMetadata implementations for other data source
types can be added very easily, check
DataourceMetadataProvidersConfiguration for more details.

Fixes gh-1013
2014-08-29 11:22:11 +02:00
Phillip Webb
f8a4df0838 Polish 2014-08-28 12:07:44 -07:00
Stephane Nicoll
dd6bf5730d Add support for EnableCaching in the cli
Fixes gh-1431
2014-08-28 17:13:16 +02:00
Stephane Nicoll
a0c316d392 Improve RepositoryRestConfiguration customization
This commit binds RepositoryRestConfiguration to the spring.data.rest
prefix so that any of its property can be customized through the
environment.

If a RepositoryRestMvcConfiguration is defined in the context, those
customization do not apply, as it was the case before.

Fixes gh-1171
2014-08-28 16:45:32 +02:00
Stephane Nicoll
aa0f90ec2e Document JMS auto configuration
Fixes gh-1445
2014-08-28 09:52:46 +02:00
Phillip Webb
ff870de0f0 Fix a few JTA issues
- Search for ConnectionFactories in java:/JmsXA and
  java:/XAConnectionFactory
- Remove javax.transaction:jta managed dependency
- Removed unused JtaProperties argument

Fixes gh-947
2014-08-27 10:09:34 -07:00
Andy Wilkinson
954da9cd72 Merge branch '1.1.x' 2014-08-27 10:07:01 +01:00
Andy Wilkinson
d0a85dd477 Add Elasticsearch starter to table of starters in the documentation
Fixes #1446
2014-08-27 10:06:45 +01:00
Phillip Webb
40d8dde202 Document distributed transaction support
See gh-947
2014-08-26 22:34:16 -07:00
Phillip Webb
bacdd5a408 Polish 2014-08-26 17:28:57 -07:00
Phillip Webb
a4925dabf7 Add property for JNDI DataSource lookup
Add `spring.datasource.jndi-name` property to allow a DataSource to be
looked up from JNDI as an alternative to defining a URL connection.

Fixes gh-989
2014-08-26 11:44:38 -07:00
Phillip Webb
8656402ca6 Polish database docs section 2014-08-26 11:44:37 -07:00
Dave Syer
9da556d5e9 Merge branch '1.1.x' 2014-08-25 16:59:46 +01:00
Dave Syer
00ef26599e Add clarification of logging.file (fixes gh-1416) 2014-08-25 16:59:12 +01:00
Raphael von der Grün
a35a79e1a3 Allow ANSI output to be configured by properties
Add AnsiOutputApplicationListener which configures AnsiOutput.enabled
based on a `spring.output.ansi.enabled` property.

Fixes gh-1243
2014-08-14 23:01:38 -07:00
Dave Syer
330be01984 Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
2014-08-13 08:23:43 -07:00
Dave Syer
481cf775d8 Refer explicitly to double asterix in metrics docs
Fixes gh-1358
2014-08-13 08:21:22 -07:00
Dave Syer
e63bad3c4e Merge branch '1.1.x' 2014-08-13 08:19:33 -07:00
Dave Syer
0a3a00e9e5 Fix property keys in shell docs (consistent with appendix)
Fixes gh-1371
2014-08-13 08:18:42 -07:00
Spring Buildmaster
74d0c5185a Next development version 2014-08-07 11:59:17 -07:00
Phillip Webb
7641f23f71 Merge branch '1.1.x' 2014-08-06 12:26:29 -07:00
Phillip Webb
d854c09d5a Add option to disable X-Application-Context
Add `management.add-application-context-header` option to disable
the automatic adding of the `X-Application-Context` HTTP header.

Fixes gh-1308
2014-08-06 12:25:38 -07:00
Phillip Webb
642224feff Support regex in keys-to-sanitize
Update EnvironmentEndpoint and ConfigurationPropertiesReportEndpoint
to allow regex patterns in `keys-to-sanitize`.

Fixes gh-1245
2014-07-29 15:13:45 -07:00
Phillip Webb
da5c36c3a9 Polish 2014-07-29 13:06:47 -07:00
Phillip Webb
14c6243637 Refactor PublicMetrics registration
Rework flexible PublicMetrics registration introduced in 2be6b3e4 to
restore compatibility with v1.1 VanillaPublicMetrics. The new
MetricReaderPublicMetrics class now exposes metrics from a MetricReader
and VanillaPublicMetrics is deprecated. The MetricsEndpoint can now
exposes a collection of PublicMetric interface directly.

See gh-1094
2014-07-29 12:31:40 -07:00
Phillip Webb
53d24301d1 Merge branch '1.1.x' 2014-07-28 15:41:42 -07:00
Phillip Webb
f8bf0e2031 Polish 2014-07-28 15:40:40 -07:00
Andy Wilkinson
0960908bd7 Add support for configuring SSL declaratively
Both Tomcat and Jetty can now be configured to use SSL via the
environment (typically application.properties or application.yml)

Closes #1084
2014-07-24 15:10:09 +01:00
ddebree
5e02ee6974 Add java options for Heroku Procfile
Added $JAVA_OPTS variable to the sample Heroku Procfile.
If this is left out it can cause memory issues when the app starts.

Fixes gh-1266
2014-07-21 15:32:41 +01:00
Stephane Nicoll
16c2477da2 Documentation update
This commit fixes some inconsistent or outdated keys in the
documentation. More specifically:

* allowSessionOverride is no longer a template parameter
* templateEncoding has been renamed to charSet
* Groovy templates do not have the same configuration hierarchy, hence
  they don't share all settings
* spring.data.elasticsearch.local does not seem to exist
* flyway prefix and suffix should be sqlMigrationPrefix and suffix
* spring.rabbitmq.virtualHost had a typo
* endpoints.error.path is not a valid property
* shell.command-path-patterns had a typo
* spring.datasource.max-wait had a typo

Fixes gh-1226
2014-07-21 15:31:30 +01:00
Dave Syer
a9b8563bb6 Fix typo (fixes gh-1273) 2014-07-21 14:07:29 +01:00
Andy Wilkinson
2ca5e8e5d6 Merge branch '1.1.x' 2014-07-21 11:40:26 +01:00
Andy Wilkinson
0a70bd44ed Correct the default Logback config location in the documentation
Fixes #1247
2014-07-21 11:39:43 +01:00
Stephane Nicoll
2be6b3e419 Flexible registration of additional PublicMetrics
This commit permits the use of several PublicMetrics instances by
default. Previously, only one PublicMetrics service could be specified
and a user configuration would remove all the defaulting.

VanillaPublicMetrics now takes a collection of PublicMetrics and
invokes them in sequence to build the final collection of metrics.
The system-related metrics have been moved to SystemPublicMetrics and
are registered by default.

Also updated the documentation to mention this feature and how it
could be fully overridden.

Fixes gh-1094
2014-07-17 16:19:05 +02:00
Andy Wilkinson
db2b20879d Merge branch '1.1.x' 2014-07-15 14:38:02 +01:00
Andy Wilkinson
672d713f99 Add dependency management for spock-spring and document its use
Closes #1234
2014-07-15 14:36:56 +01:00
Stephane Nicoll
249e09d9bc Switch master to 1.2.0.BUILD-SNAPSHOT 2014-07-11 10:44:05 +02:00
Stephane Nicoll
f7a5ee3bcc Remove duplicate key 2014-07-09 10:03:50 +02:00
Spring Buildmaster
40327e1ae6 Next development version 2014-07-08 02:33:36 -07:00
Phillip Webb
fd3e5eceeb Polish 2014-07-08 01:05:56 -07:00
Phillip Webb
31014d86a4 Clarify resource filtering documentation
Fixes gh-1208
2014-07-08 00:17:00 -07:00
Andy Wilkinson
148e32d09a Document need to use @ContextConfiguration with Spock
Closes #1167
2014-07-07 13:41:13 +01:00
Phillip Webb
60e60227ad Polish doc formatting 2014-07-02 15:52:46 -07:00
Radesh Rao
ef89ad019d Correct typo in section on using Maven without Boot as the parent
Closes #1188
2014-07-01 09:34:32 +01:00
Dave Syer
93c0f6fbc7 Fix typo in beans{} example 2014-06-27 16:24:47 +01:00
Dave Syer
fd757cb371 Add logging.level to application.properties
E.g.

logging.level.org.springframework: DEBUG
logging.level.org.hibernate: WARN

Fixed gh-788
2014-06-27 15:49:17 +01:00
Toshiaki Maki
9febd4a4cb Support sqlScriptEncoding in schema.sql
Fixes gh-1165, fixes gh-1164
2014-06-27 12:55:12 +01:00
Iván López
009ae8822b Fix typo in documentation 2014-06-27 12:57:39 +02:00
Spring Buildmaster
981669b7c0 Next development version 2014-06-26 14:09:54 -07:00
Phillip Webb
200cd535c2 Revert "Next development version"
This reverts commit 67189477fe.
2014-06-26 11:03:09 -07:00
Spring Buildmaster
67189477fe Next development version 2014-06-26 10:51:35 -07:00
Spring Buildmaster
542f3cbda8 Next development version 2014-06-24 13:53:56 -07:00
Phillip Webb
f30b962ff9 Add support for unpacking nested JARs
Update the executable JAR code to automatically unpack any entries
which include an entry comment starting `UNPACK:` to the temp folder.
The existing Maven and Gradle plugins have been updated with new
configuration options and the `spring-boot-tools` project has been
updated to write the appropriate entry comment based on a flag passed
in via the `Library` class.

This support has been added to allow libraries such a JRuby (which
assumes that `jruby-complete.jar` is always accessible as file) to work
with Spring Boot executable jars.

Fixes gh-1070
2014-06-24 00:46:56 -07:00
Phillip Webb
5f8fbfd73a Add Library abstraction
Add a Library class update the LibraryCallback interface and
implementations to use it. This change is in preparation for
an addition `unpack` flag that will be required to allow the
automatic unpacking of certain nested jars.

See gh-1070
2014-06-24 00:34:19 -07:00
Phillip Webb
c713c8091d Polish 2014-06-23 19:41:22 -07:00
Dave Syer
0e5201abe2 Fix typos (see gh-1135) 2014-06-23 16:51:25 +01:00
Dave Syer
542896b28f Support for non-executable JAR in addition to the repackaged one
Stretches the Gradle boot plugin a bit, so there's a sample build
in the "profile" sample. Howto docs give examples.

Fixes gh-1135
2014-06-23 11:08:58 +01:00
Tadaya Tsuyukubo
5fbe5d4120 Add how-to remote debug from Gradle
Add a section to the reference documentation "how-to" about remote
debugging a Gradle started app.

Fixes gh-1129
2014-06-20 11:58:08 -07:00
Phillip Webb
378d38e2e5 Polish doc formatting 2014-06-20 10:29:04 -07:00
Dave Syer
9d5c371cf1 Clarify Maven plugin usage 2014-06-20 12:48:55 +01:00
Dave Syer
c04deec6ee Move JMS docs under 'Messaging' 2014-06-19 17:42:04 +01:00
Dave Syer
af825fa439 Clarify docs on Gradle configuration 2014-06-19 12:21:02 +01:00
Stephane Nicoll
2bff12a7b5 Better support for HornetQ embedded broker
Prior to this commit it was not safe to start several contexts
using the HornetQAutoConfiguration in the same VM. Each context
was trying to start their own HornetQ embedded broker by default but
only the first was really starting. Worse, the various InVM connection
factories were all silently connecting to the first broker.

This commit introduces a new "serverId" property that is an auto-
incremented integer by default. This identifies the server to connect
to and allows each context to start its own embedded broker in total
isolation of other contexts.

This commits makes it possible for a context to disable its own
embedded broker and connect to an existing one, potentially started
by another context.

Fixes gh-1063
2014-06-17 15:02:46 +02:00
Dave Syer
82cacf4ea9 Clarify main class finder functionality in Gradle plugin
See gh-1072
2014-06-17 12:15:01 +01:00
Dave Syer
0a3612da59 Enhance @GrabMetadata documentation a bit
Fixes gh-320, since this is the officially supported mechanism
for changing the version of Spring (and other dependencies).
2014-06-17 11:57:54 +01:00
Dave Syer
f83395b40c Correct docs on BeanNameViewResolver (Fixes gh-1078) 2014-06-17 10:39:27 +01:00
Phillip Webb
3a8a127285 Implement simpler exclusion logic for Gradle
Simplify the exclusion logic used in Gradle by implementing implicit
exclusions rather than trying to detect transitive excludes.

This commit reverts much of the code originally included to fix gh-1047
which adds far too much complexity to the build and still doesn't solve
the underlying issue.

Fixes gh-1103
2014-06-16 16:54:48 -07:00
Phillip Webb
a374929c90 Polish 2014-06-15 09:09:06 -07:00
Dave Syer
2c691e5ae5 Enhance JarCommand to support lists of includes and excludes
The lists are comma separated. In addition, user can add prefixes
"+" or "-", to signal that those values should be removed from the
default list, not added to a fresh one. E.g.

$ spring jar app.jar --include lib/*.jar,-static/** --exclude -**/*.jar

to include a jar file specifically, and make sure it is not excluded,
and additionally not include the static/** resources that would otherwise
be included in the defaults. As soon as "+" or "-" prefixes are detected
the default entries are all added (except the ones exlcuded with "-").

Fixes gh-1090
2014-06-12 18:31:43 +01:00
Dave Syer
c0efd3a22e Add clarification of ddl-auto and schema.sql 2014-06-12 06:48:44 +01:00
Shinobu Aoki
6ba1304907 Fix typo in reference docs appendix
Fixes gh-1082
2014-06-11 21:07:18 -07:00
Spring Buildmaster
4ca26a21dc Next development version 2014-06-11 10:46:27 -07:00
Spring Buildmaster
05ed7b3bcd Next development version 2014-06-10 12:40:35 -07:00
Phillip Webb
3007a777d0 Roll back to 1.1.0.BUILD-SNAPSHOT 2014-06-10 09:00:08 -07:00
Spring Buildmaster
c650f2391e Next development version 2014-06-09 21:55:19 -07:00
Phillip Webb
25a2b8e388 Improve formatting of generated doc tables 2014-06-09 20:03:17 -07:00
Phillip Webb
ef395638fc Document gradle plugin exclude rules
Fixes gh-1053
2014-06-09 18:07:47 -07:00
Phillip Webb
75a202e389 Add Spring Loaded, Gradle, IntelliJ "How-To"
Fixes gh-823
2014-06-09 17:27:33 -07:00
Phillip Webb
c2c31cdb3c Add upgrade instructions to the reference docs
Add a section with a link to the project wiki.

See gh-731
2014-06-09 16:53:17 -07:00
Phillip Webb
9a5d828f52 Polish docbook formatting 2014-06-09 16:34:54 -07:00
Phillip Webb
f619102cd9 Fix broken links in reference docs 2014-06-09 16:20:12 -07:00
Phillip Webb
30f57bab23 Fix broken links in reference docs 2014-06-09 15:35:53 -07:00
Andy Wilkinson
3975f8c931 Remove extra close table markup 2014-06-09 21:49:56 +01:00
Andy Wilkinson
b585afe537 Polishing 2014-06-09 21:17:19 +01:00
Phillip Webb
21029d2323 Polish disable repository documentation 2014-06-09 11:31:38 -07:00
Andy Wilkinson
f47b40f683 Use spring-boot-version for dependency versions in Gradle Jetty example 2014-06-09 16:45:40 +01:00
Andy Wilkinson
db8a9ec597 Polish documentation of @GrabMetadata 2014-06-09 16:42:57 +01:00
Roy Clarkson
1a32a6a06b Fix issues with DeviceDelegatingViewResolverAutoConfiguration
- Log to the correct class
- Set Auto-configure after Thymeleaf hint on main class instead of
  internal static class
- Use 'thymeleafViewResolver' bean name instead of class for
  conditional bean checks
- Fix class name in properties documentation

Fixes gh-1052
2014-06-09 14:05:46 +01:00
Dave Syer
39a94428d3 Add @Conditionals to permit JPA/Mongo mixed usage
I decided to go with both approaches (make the autoconfig for
repositories @ConditionalOnMissingBean(RepositoryFactoryBeanSupport),
so the first one wins; and also make them conditional on
spring.data.*.repositories.enabled=true. The ordering problem
is still there really (it's not defined which repositories will
be created by the autoconfig), so if a user is going to have
2 repository implementations on the classpath, he is going to
have to either choose one to disable, or manualy @Enable* the
other one.

Fixes gh-1042
2014-06-09 09:48:40 +01:00
Phillip Webb
f1d216a33b Polish social appendix settings examples 2014-06-08 23:58:02 -07:00
Phillip Webb
2852f7422e Polish Spring Mobile Auto-configuration
Update Spring Mobile support with the following changes:
- Apply source formatting
- User lowercase property prefixes
- Use dashed notation when accessing properties
- Inline some constants

See gh-1049
2014-06-08 23:57:55 -07:00
Dave Syer
b75578d99c Adjust order of property sources
@PropertySources *can* and should be added in the slot
after the application.properties (code that is part of the
application should have lower precedence than external
configuration).

Fixes gh-1044
2014-06-07 11:10:51 +01:00
Roy Clarkson
8f32b87c81 Improve Spring Mobile Auto-configuration
- Upgrade Spring Mobile dependency to 1.1.2
- Rename SitePreferenceAutoConfiguration "enabled" property
- Add Auto-configuration for LiteDeviceDelegatingViewResolver
- Update docs

Fixes gh-1049
2014-06-07 07:01:36 +01:00
Phillip Webb
77d5453af2 Add gmavenplus-plugin to parent POM 2014-06-06 22:56:44 -07:00
Phillip Webb
62d2b4136a Polish documentation
Apply consistent styling and edit a few section for clarity.
2014-06-06 22:56:44 -07:00
Phillip Webb
e032b673a2 Polish DataSourceInitialization code
Rename a few classes and methods relating to DataSourceInitialization
and update the DataSourceInitializedPublisher to check for Hibernate
settings.
2014-06-06 22:56:44 -07:00
Andy Wilkinson
f1b7544672 Fix duplicate id in the docs 2014-06-06 19:55:39 +01:00
Dave Syer
09200361de Align expectations of various JMX configurations
They all want to create an MBeanServer and when that happens
user sees no MBeans, or sometimes just one set (Spring Core,
Spring Integration or Spring Boot). To harmonise them we
create a @Bean of type MBeanServer and link to it in the
other autoconfigs

Fixes gh-1046
2014-06-06 17:52:14 +01:00
Andy Wilkinson
fbc1d3eec0 Fix section title depth in JMS docs 2014-06-05 16:10:35 +01:00
Andy Wilkinson
65008606ab Auto-generate auto configuration classes tables 2014-06-05 15:54:00 +01:00
Andy Wilkinson
dbd0e778c6 Merge branch '1.0.x' 2014-06-05 15:51:00 +01:00
Andy Wilkinson
fe3d2c39a0 Fix broken links in the documentation 2014-06-05 15:49:29 +01:00
Stephane Nicoll
593d180cf3 Add a note regarding dependency overriding
Fixes gh-958
2014-06-05 16:37:35 +02:00
Stephane Nicoll
726991c144 Use an embed HornetQ broker by default
This commit changes the default behavior of the HornetQ auto
configuration. Prior to this commit, an embedded broker was only
started when it was requested explicitly by a configuration option.

This is inconsistent with the ActiveMQ support and boot favors the
easiest route. If the necessary classes are available, HornetQ is
embedded in the application by default.

Fixes gh-1029
2014-06-04 20:15:55 +02:00
Andy Wilkinson
06fe15541a Fix numbering of items in list of steps for Openshift deployment
The list continuation character '+' can be used to prevent a blank
line from ending a list, thereby allowing code blocks to be included
in a list. See "Complex content in outline lists" [1] for more
details.

[1] http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#lists

Fixes #1025
2014-06-04 17:55:32 +01:00
Stephane Nicoll
9ad7a22ebe Add documentation for JMS support
This commit documents Boot's JMS support, in particular how Boot
can auto-configure the ConnectionFactory for ActiveMQ and
HornetQ.

Fixes gh-1026
2014-06-04 16:26:35 +02:00
Dave Syer
c41fa08a80 Cross link Actuator and User Guide docs
Not having READMEs in github is a mistake IMO, so here's one
restored and with a link to the docs. Docs also updated to
more accurately reflect the location of the actuator features
in implementation.

See https://github.com/spring-guides/gs-actuator-service/pull/7
for the Getting started guide change

Fixes gh-1014
2014-06-04 14:27:29 +01:00
Andy Wilkinson
c0c3c78f8d Add missing entries to the tables of auto-configuration classes
Closes #998
2014-06-04 12:53:33 +01:00
Dave Syer
74166e770a Revert deferred DDL changes and re-oreder database migrations
Schema initialization now happens in @PostConstruct (effectively)
whether it is via the Hibernate EntityManagerFactory or the
Boot DataSourceInitialization (in addition or instead). The data.sql
script if it exists is still executed on an event fired from the
other places, so those tests are passing.

Flyway and liquibase have bean factory post processors (like
the one they use to order the audit aspect in Spring Data) that
enforce a dependency on those components from the EntityManagerFactory.
So Hibernate validation is still happy (and there are 2 tests to
prove it now as well).

Fixes gh-1022
2014-06-04 10:41:38 +01:00
Dave Syer
1567964e14 Add example for openshift deployment
Fixes gh-668 (if the asciicdoc compiles)
2014-06-03 14:57:34 +01:00
Christian Dupuis
e104b34106 Fix HealthIndicator documentation
fixes #1018
2014-06-03 15:22:52 +02:00
Stephane Nicoll
a6702f5b87 Remove reference of mvnDebug
The maven plugin now forks a process to start the application so
mvnDebug cannot be used anymore. This commit replaces the reference
of mvnDebug to a link to an example of the maven plugin.

Fixes gh-992
2014-06-03 13:52:49 +02:00
Dave Syer
acf1ccaf44 Add notes for JNDI property values
Fixes gh-999
2014-06-03 10:52:23 +01:00
Dave Syer
bd95cc3eab Add short docs for new Spring Data projects
Fixes gh-1011
2014-06-03 10:33:48 +01:00
Dave Syer
49a09c807c Defer SQL initialization to fit with JPA better
Added 2 new spring.datasource.* properties ("data" like
"schema", and "deferDdl" like the "spring.jpa.hibernate.*"
flag). The SQL scripts are then run separately and the "data"
ones are triggered by a new DataSourceInitializedEvent,
which is also published by the Hibernate DDL schema export.

Fixes gh-1006
2014-06-02 13:10:50 +01:00
Phillip Webb
738d195587 Create JMS sub-packages
Reorganize the `jms` package into `hornetq` and `activemq` sub-pacakges.

Fixes gh-1005
2014-06-01 13:49:41 +01:00
Phillip Webb
8aaaaa48a6 Fix broken documentation links 2014-06-01 13:02:04 +01:00
Phillip Webb
0e4b1a4ad0 Add Elasticsearch appendix links
See gh-408
2014-06-01 12:54:42 +01:00
Stephane Nicoll
5a69bb9267 Add HornetQ JMS support
Provide auto-configuration support for HornetQ JMS broker, along with
an additional starter POM.

The connection factory connects to a broker available on the local
machine by default. A configuration switch allows to enable an embedded
mode that starts HornetQ as part of the application.

In such a mode, the spring.hornetq.embedded.* properties provide
additional options to configure the embedded broker. In particular,
message persistence and data directory locations can be specified. It is
also possible to define the queue(s) and topic(s) to create on startup.

Fixes: gh-765
2014-05-30 23:26:07 +01:00
Phillip Webb
11a093bdc0 Polish 2014-05-30 00:31:11 +01:00
Phillip Webb
5df52d3e94 Polish 2014-05-28 17:36:07 +01:00
Dave Syer
5d797ce00f Add spring-boot-groovy-templates to list in docs 2014-05-28 16:48:18 +01:00
Craig Walls
5e1913576e Document Spring Social support 2014-05-28 13:30:41 +01:00
Dave Syer
84633dae00 Clarify in docs that @PropertySource is parsed late
Fixes gh-970
2014-05-28 12:20:28 +01:00
Dave Syer
d8eeba98e8 Add JAVA_OPTS advice to some docs 2014-05-28 12:11:07 +01:00
Phillip Webb
3d76d9d73b Merge branch '1.0.x' 2014-05-28 10:23:33 +01:00
Phillip Webb
819b3b9761 Fix JasperInitializerLifecycleListener
Update JasperInitializerLifecycleListener to call JasperInitializer as
a ServletContainerInitializer (not a ServletContextInitializer).

Fixes gh-962
See gh-919
2014-05-28 10:21:10 +01:00
bjornerik
769ffe2834 Missing space destroys formatting in doc 2014-05-28 09:11:19 +01:00