568 Commits

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