Commit Graph

3711 Commits

Author SHA1 Message Date
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
Phillip Webb c7455040df Merge pull request #1499 from liujiong1982/spring-boot-1499
* spring-boot-1499:
  Add CAMELCASE_TO_HYPHEN in RelaxedNames
2014-10-08 20:56:15 -07:00
David Liu b948e61465 Add CAMELCASE_TO_HYPHEN in RelaxedNames
Fixes gh-1499
2014-10-08 20:55:13 -07:00
Phillip Webb c906524df6 Merge pull request #1597 from liujiong1982/spring-boot-545
* spring-boot-545:
  Support Jetty HandlerCollection types
2014-10-08 20:09:48 -07:00
David Liu 64447d3f5f Support Jetty HandlerCollection types
Update JettyEmbeddedServletContainer to support HandlerCollection types
in addition to HandlerWrappers.

Fixes gh-545
Closes gh-1597
2014-10-08 20:07:35 -07:00
Phillip Webb a401454a2a Merge pull request #1638 from hekonsek/spring-boot-amq-mqtt
* spring-boot-amq-mqtt:
  Add ActiveMQ MQTT connection URL auto-detection
2014-10-08 11:54:10 -07:00
Henryk Konsek 0d8bde58c9 Add ActiveMQ MQTT connection URL auto-detection
Fixes gh-1638
2014-10-08 11:53:06 -07:00
Phillip Webb 4c51aa8e28 Polish 2014-10-08 11:34:11 -07:00
Andy Wilkinson 7287c66d88 Fix Actuator sample's health test 2014-10-08 18:58:34 +01:00
Andy Wilkinson b8eb13d827 Fix tests after addition of disk space health indicator 2014-10-08 18:00:56 +01:00
Andy Wilkinson 20c4795a1e Merge branch 'disk-space-health-indicator' 2014-10-08 17:26:06 +01: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
Mattias Severson 78d7fe9cb5 Add HealthIndicator that checks free disk space
See gh-1297
2014-10-08 17:24:30 +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
Andy Wilkinson 8e000f3da1 Merge branch '1.1.x' 2014-10-08 15:13:52 +01:00
Andy Wilkinson b85926e6f0 Fix the rest of the typo InMemoryRepository's name 2014-10-08 15:13:25 +01:00
Andy Wilkinson b8759ebf69 Merge branch '1.1.x' 2014-10-08 14:48:26 +01:00
matzschmanski 02fef4295d Fix typo: InMemoryMessageRespository -> InMemoryMessageRepository
Closes gh-1671
2014-10-08 14:48:00 +01:00
Andy Wilkinson 63b803b5ef Merge branch '1.1.x' 2014-10-08 14:17:56 +01:00
Andy Wilkinson de11e05507 Exclude log4j:log4j in favor of org.slf4j:log4j-over-slf4j
Closes gh-1660
2014-10-08 14:16:41 +01:00
Phillip Webb 37b4ebb76c Merge pull request #1652 from Stummi/velo-preferfsa-property
* velo-preferfsa-property:
  Add VelocityProperties.preferFilesystemAccess
2014-10-07 09:49:36 -07:00
Michael Stummvoll 5d32ec7463 Add VelocityProperties.preferFilesystemAccess
Update VelocityProperties to include a preferFilesystemAccess attribute.

Fixes gh-1652
2014-10-07 09:47:29 -07:00
John Tims 77bf3ad90e Fix typo in javadoc
(Cherry picked from commit bebbe92)
Fixes gh-1633
2014-10-06 18:05:10 -07:00
Phillip Webb 62eb01f0b8 Polish 2014-10-06 12:03:51 -07:00
Phillip Webb 09d5812c3b Merge branch '1.1.x' 2014-10-06 11:07:28 -07:00
Phillip Webb b616e9fdc4 Rename SampleIntegrationApplicationTests 2014-10-06 10:47:40 -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
Andy Wilkinson 73b80dbeed Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-10-06 13:50:47 +01:00
Andy Wilkinson e130c00e6c Upgrade to Spring Loaded 1.2.1.RELEASE
Closes gh-1474
2014-10-06 13:42:07 +01:00
Andy Wilkinson 06e18c6a46 Merge branch 'gh-1664' 2014-10-06 12:11:25 +01:00
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
2014-10-06 11:21:26 +01: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
Stephane Nicoll 0773b89b75 Merge pull request #1659 from ericdahl/docs-grammar
* docs-grammar:
  Fix some grammar issues in docs
2014-10-03 15:53:41 +02:00
Eric Dahl bbf3076d9d Fix some grammar issues in docs 2014-10-02 20:45:05 -07:00
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).
2014-10-02 17:05:50 +01:00
Dave Syer c18b4248e5 Merge 1.1.x with minor conflict 2014-10-02 16:44:16 +01:00
Dave Syer e913b35227 Merge 1.1.x with minor conflict 2014-10-02 16:43:56 +01:00
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().
2014-10-02 16:36:07 +01:00
Dave Syer 003d9a5799 Merge branch '1.1.x' 2014-10-02 16:06:19 +01:00
Dave Syer a702ff5c36 Make ServerProperties bean conditional on being a webapp 2014-10-02 15:43:47 +01:00
Stephane Nicoll 30351c6277 Provide native JtaTransactionManager when applicable
This commit updates JndiJtaConfiguration to provide the same detection
algorithm as <tx:jta-transaction-manager>. If a native JTA transaction
manager exists for the current platform, it is used instead of the regular
JtaTransactionManager implementation.

Fixes gh-1576
2014-10-02 16:33:31 +02:00
Dave Syer 64ef03aafd Fix Jersey1 integration test 2014-10-02 15:28:27 +01:00
Stephane Nicoll 24da6a504e Upgrade to Spring framework 4.1.1
Closes gh-1654
2014-10-02 16:07:33 +02:00
Dave Syer 339f3b7bf0 Add autoconfig support for Jersey (2)
Jersey 2 has some Spring support built in but it's a bit awkward to
use in a Boot app, so autoconfiguration seems appropriate. The tests
and sample show how to use it, but the short story is that any
@Component can define JAX-RS endpoints via @GET etc.

There's a sample for Jersey 1 as well (pay careful attention to
the plugin configuration if you want to build an executable jar)

Fixes gh-1651
2014-10-02 11:22:00 +01:00
Andy Wilkinson de8a2a71d0 Turn (Jackson|Gson)AutoConfiguration into true auto-configuration
Previously JacksonAutoConfiguration and GsonAutoConfiguration were
not actually auto-configuration classes. They were only processed
due to being imported by HttpMessageConvertersAutoConfiguration.
In addition to being misleadingly named, this meant that they could
not be included or excluded individually and were also tightly coupled
to HTTP message conversion.

This commit updates spring.factories to make both
JacksonAutoConfiguration and GsonAutoConfiguration actual
auto-configuration classes. As a result, they can now be enabled or
disabled individually and are no longer coupled to HTTP message
conversion.

Closes gh-1562
2014-10-02 10:33:02 +01:00
Manuel Doninger 02e33c125c Use reflection to load Hibernate version specific classes
This adds support for Hibernate 4.2 again by loading the specific
classes with reflection.

Fixes gh-1460, fixes gh-1557
2014-10-02 09:49:11 +01:00
joshiste 9af8fdb8a1 Expose RichGauges in MetricsEndpoint via PublicMetrics
Fixes gh-1635
2014-10-02 09:27:16 +01:00