Commit Graph

411 Commits

Author SHA1 Message Date
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