Commit Graph

3519 Commits (8f488bd01962990f69ced2d68bfe04b629689f17)
 

Author SHA1 Message Date
Dave Syer 9ba7a1860f Merge branch '1.1.x' 10 years ago
Dave Syer 3b2fb305c8 Add placeholder support to LoggingApplicationListener
When logging.level.* is set in external configuration they can now
contain placeholders.

Fixes gh-1680
10 years ago
Andy Wilkinson 4cf9e0457f Provide auto-configuration of persistence exception translation
Closes gh-1435
10 years ago
Dave Syer fa95a6f6bd Merge branch '1.1.x' 10 years ago
Dave Syer 3135c7f8ae Escape strings in whitelabel error page (HTML) 10 years ago
Andy Wilkinson 07cb8f2836 Ensure that spring.data.rest.* configuration takes effect
Previously, RepositoryRestMvcBootConfiguration was not annotated with
@Configuration. This meant that it was processed in lite mode.
Crucially, in lite mode, there’s no proxying so each call to the
config() @Bean method from within other @Bean methods resulted in the
creation of a new RepositoryRestConfiguration instance. Furthermore, as
each of these instances wasn’t a Spring bean the configuration
properties were not applied.

This commit updates RepositoryRestMvcBootConfiguration to annotate it
with @Configuration so that it’s no longer processed in lite mode. It
also updates the unit tests and the Spring Data REST sample to verify
that the baseUri can be configured using application.properties.

Fixes gh-1675
10 years ago
Andy Wilkinson 6ec0b4ca81 Only consider letters when checking if a name is upper-case
Previously, for a string to be considered upper-case,
EmbeddedServerPortFileWriter required every character in the
string to be upper-case. This meant that strings containing numbers were
considered lower-case even if every letter in the string was upper-case.
OS X’s case-preserving, case-insensitive file system masked this problem
as the tests were still able to find the created file, even though the
case of its name was not as expected.

This commit updates EmbeddedServerPortFileWriter to only require
characters that are letters (as defined by Character.isLetter()) to be
upper-case. It also updates the tests to verify that the case of the
created file’s name is correct in such a way that it will fail, even
on OS X, when it is not.

Fixes gh-1676
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
Phillip Webb c7455040df Merge pull request #1499 from liujiong1982/spring-boot-1499
* spring-boot-1499:
  Add CAMELCASE_TO_HYPHEN in RelaxedNames
10 years ago
David Liu b948e61465 Add CAMELCASE_TO_HYPHEN in RelaxedNames
Fixes gh-1499
10 years ago
Phillip Webb c906524df6 Merge pull request #1597 from liujiong1982/spring-boot-545
* spring-boot-545:
  Support Jetty HandlerCollection types
10 years ago
David Liu 64447d3f5f Support Jetty HandlerCollection types
Update JettyEmbeddedServletContainer to support HandlerCollection types
in addition to HandlerWrappers.

Fixes gh-545
Closes gh-1597
10 years ago
Phillip Webb a401454a2a Merge pull request #1638 from hekonsek/spring-boot-amq-mqtt
* spring-boot-amq-mqtt:
  Add ActiveMQ MQTT connection URL auto-detection
10 years ago
Henryk Konsek 0d8bde58c9 Add ActiveMQ MQTT connection URL auto-detection
Fixes gh-1638
10 years ago
Phillip Webb 4c51aa8e28 Polish 10 years ago
Andy Wilkinson 7287c66d88 Fix Actuator sample's health test 10 years ago
Andy Wilkinson b8eb13d827 Fix tests after addition of disk space health indicator 10 years ago
Andy Wilkinson 20c4795a1e Merge branch 'disk-space-health-indicator' 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
Mattias Severson 78d7fe9cb5 Add HealthIndicator that checks free disk space
See gh-1297
10 years ago
Daniel Fullarton 1dbc94d0f7 Add a logging system, starter and sample for Log4j 2
Closes gh-1565
10 years ago
Andy Wilkinson 8e000f3da1 Merge branch '1.1.x' 10 years ago
Andy Wilkinson b85926e6f0 Fix the rest of the typo InMemoryRepository's name 10 years ago
Andy Wilkinson b8759ebf69 Merge branch '1.1.x' 10 years ago
matzschmanski 02fef4295d Fix typo: InMemoryMessageRespository -> InMemoryMessageRepository
Closes gh-1671
10 years ago
Andy Wilkinson 63b803b5ef Merge branch '1.1.x' 10 years ago
Andy Wilkinson de11e05507 Exclude log4j:log4j in favor of org.slf4j:log4j-over-slf4j
Closes gh-1660
10 years ago
Phillip Webb 37b4ebb76c Merge pull request #1652 from Stummi/velo-preferfsa-property
* velo-preferfsa-property:
  Add VelocityProperties.preferFilesystemAccess
10 years ago
Michael Stummvoll 5d32ec7463 Add VelocityProperties.preferFilesystemAccess
Update VelocityProperties to include a preferFilesystemAccess attribute.

Fixes gh-1652
10 years ago
John Tims 77bf3ad90e Fix typo in javadoc
(Cherry picked from commit bebbe92)
Fixes gh-1633
10 years ago
Phillip Webb 62eb01f0b8 Polish 10 years ago
Phillip Webb 09d5812c3b Merge branch '1.1.x' 10 years ago
Phillip Webb b616e9fdc4 Rename SampleIntegrationApplicationTests 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
Andy Wilkinson 73b80dbeed Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
10 years ago
Andy Wilkinson e130c00e6c Upgrade to Spring Loaded 1.2.1.RELEASE
Closes gh-1474
10 years ago
Andy Wilkinson 06e18c6a46 Merge branch 'gh-1664' 10 years ago
Andy Wilkinson e90c8548a2 Make MetricFilter auto-configuration conditional on OncePerRequestFilter
In addition to requiring the Servlet API to be on the classpath,
MetricFilter requires spring-web to also be on the classpath as it
extends OncePerRequestFilter. This commit updates the auto-configuration
for MetricFilter so that it will be disabled in the absence of a 
dependency on spring-web.

Fixes gh-1664
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
Stephane Nicoll 0773b89b75 Merge pull request #1659 from ericdahl/docs-grammar
* docs-grammar:
  Fix some grammar issues in docs
10 years ago
Eric Dahl bbf3076d9d Fix some grammar issues in docs 10 years ago
Dave Syer d63bbdfe44 Change constructor signature for RedisMetricRepository
Otherwise we had to rely on afterPropertiesSet() being called to
validate and compute the prefix and key (which depend on each
other).
10 years ago
Dave Syer c18b4248e5 Merge 1.1.x with minor conflict 10 years ago
Dave Syer e913b35227 Merge 1.1.x with minor conflict 10 years ago
Dave Syer d724c9062b Change key value if prefix changes
Some weird looking test failures led me to track this down.
If the user changes the prefix for metric names, he probably wanted
to change the keys as welll (otherwise 2 repositories can use the
same key, which is why the test was failing for me). We can do that
in an afterPropertiesSet().
10 years ago
Dave Syer 003d9a5799 Merge branch '1.1.x' 10 years ago