Commit Graph

2151 Commits

Author SHA1 Message Date
Phillip Webb
d31988b552 Cleanup eclipse formatter settings
Sync the explicit setting with 'project specific settings' in case
the eclipse plugin is not used.
2014-05-22 18:08:11 +01:00
Christian Dupuis
db74d27ea0 Extract AbstractHealthIndicator
to make it more simple to implement HealthIndicator
2014-05-22 19:06:15 +02:00
Dave Syer
1e6a4f3f65 Remove duplicate JreProxySelector
Since we upgraded Aether we now have the native JreProxySelector
available so we don't need to keep a copy ourselves.
2014-05-22 18:03:52 +01:00
Andy Wilkinson
e1a2968899 Upgrade to Spring Integration 4.0.1.RELEASE and use its bom
Closes #792
2014-05-22 17:51:55 +01:00
apoplexy
dfc1979ea2 Allow the tomcat maxHttpHeaderSize to be changed in external config
Prevents large SPNEGO headers from causing server errors for example.
Added the property to ServerProperties.

Fixes gh-931
2014-05-22 17:43:09 +01:00
Dave Syer
0e2f9e74db Ensure a JreProxySelector is applied as a fallback
The issue was that the JreProxySelector was only applied
if the existing selector was null, but that hasn't been the case
since we added supporty for settings.xml. The strategy now is to
fallback to a JreProxySelector if the existing one is null
or not already a composite. Fixes gh-914.
2014-05-22 17:38:24 +01:00
Andy Wilkinson
bb85a52c38 Merge branch 'solr' 2014-05-22 17:30:07 +01:00
Andy Wilkinson
b76a519f65 Add a HealthIndicator for Solr 2014-05-22 17:29:12 +01:00
Andy Wilkinson
d673002c2e Document Solr integration 2014-05-22 17:29:12 +01:00
Andy Wilkinson
e45ef06b56 Polish Spring Data Solr integration 2014-05-22 17:29:12 +01:00
Christoph Strobl
6ed69709d7 Add auto configuration support for Spring Data Solr
Registers required components in application context if not available to
set up environment for usage with Spring Data Solr. Will listen on
SolrServer and SolrRepositories for configuration.

By default an HttpSolrServer is registered unless a zkHost (zookeeper
host) is defined. In that case an instance of CloudSolrServer will be
created.

By default multicore support is enabled, creating instances of
SolrServer for each core defined via @SolrDocument.
2014-05-22 17:29:12 +01:00
Christian Dupuis
40b55b0ff6 Extract AbstractHealthAggregator
This commit makes it easier for users to implement HealthAggregators
2014-05-22 17:40:38 +02:00
Christian Dupuis
f9aeb6aefe Polish 2014-05-22 17:31:43 +02:00
Dave Syer
344fb4616d Add sources jar to default built 2014-05-22 15:56:24 +01:00
Dave Syer
59c108a4b0 Fix bug in group names (again) 2014-05-22 15:48:29 +01:00
Phil Webb
49280544b0 Update CONTRIBUTING.adoc 2014-05-22 15:38:58 +01:00
Dave Syer
1fabfaa259 Align behaviour of in-memory and redis mult repos
The in-memory version has to force the incoming metric keys to
start with the group name. Redis doesn't have that restriction
but normally we expect both to be used in such a way that
the metric keys already match the prefix. In that case the two
repositories behave the same now in terms of set and get.
2014-05-22 15:35:55 +01:00
Dave Syer
0dca2dd978 Small docs tweaks in metrics 2014-05-22 14:51:19 +01:00
Dave Syer
b12d7c705c Improve redis repository implementations
Storing values in zset makes them less prone to races.

Fixes gh-929
2014-05-22 12:41:24 +01:00
Andy Wilkinson
cf5c1d1b70 Merge branch '1.0.x' 2014-05-22 12:25:20 +01:00
Andy Wilkinson
8fa2286dd3 Upgrade to Spring Security 3.2.4.RELEASE 2014-05-22 12:24:14 +01:00
Christian Dupuis
b77a9c5a8e Remove List.sort usage for Collections.sort 2014-05-22 13:17:20 +02:00
Dave Syer
0cbd0b609a Add increment() to PrefixMetricWriter
In the redis repository we also switch to store the value in the
zset (so it can be atomically incremented) rather than in the
regular key-value.

Fixes gh-929
2014-05-22 12:05:56 +01:00
Christian Dupuis
14899ba3b2 Fix compile problem
Something slipped the recent merge
2014-05-22 12:45:15 +02:00
Christian Dupuis
b6f3866969 Merge branch 'rework-health-support' 2014-05-22 12:37:24 +02:00
Christian Dupuis
0c2bc99af3 Return different http return status codes for different system health states
fixes #880
2014-05-22 12:27:03 +02:00
Christian Dupuis
4bc6a0f49e Rename Status.status to Status.code 2014-05-22 12:27:03 +02:00
Christian Dupuis
4648188782 Rework HealthEndpoint and HealthIndicator
With this commit the state of a component or subsystem becomes a first-class citizen in Boot's application health support. HealthIndicators now return a Health instance with status and some contextual details.

An aggregation strategy has been introduced to aggregate several Health instances into one final application Health instance. Out of the box OrderedHealthAggregator can be configured to allow different ordering or a custom HealthAggregator bean can be registered.
2014-05-22 12:27:03 +02:00
Dave Syer
d59cbc830a Group resolution for RedisMultiMetricRepository with prefix
The prefix needs to be added before looking for keys. In addition
I rationalized the constructor and final fields (it didn't make
any sense for the prefix to be mutable).

Fixes gh-927
2014-05-22 09:35:08 +01:00
Dave Syer
ed2876e931 Add a PrefixMetricWriter interface to cleanly separate write/read
The PrefixMetricGroupExporter only really makes sesne if the writer
is aware of the groups, so it seemed better to use a new interface
than mix read/write.
2014-05-22 09:10:49 +01:00
Dave Syer
94e891e924 Rename method count() -> countGroups()
Fixes gh-923
2014-05-22 09:10:49 +01:00
Andy Wilkinson
733e12e215 Merge branch '1.0.x' 2014-05-21 16:38:24 +01:00
Andy Wilkinson
426c5680d4 Use Boot’s base Logback configuration in the Integration sample
Fixes #922
2014-05-21 16:38:02 +01:00
Andy Wilkinson
9b1ed5f24e Include GemFire starter in table of first-party starter modules
Closes #911
2014-05-21 14:52:05 +01:00
Andy Wilkinson
1deeccda30 Revert "Work around Groovy compiler bug that can name classes incorrectly"
This reverts commit 46fc5c05e3.

Closes #598
2014-05-21 13:58:44 +01:00
Andy Wilkinson
58b768b204 Merge branch '1.0.x' 2014-05-21 13:55:44 +01:00
Andy Wilkinson
6dafa15eef Remove mouldy start.groovy from the actuator sample
Fixes #900
2014-05-21 13:55:07 +01:00
Andy Wilkinson
ee08667e81 Exclude Java agent jars from class path of launching class loader
ExecutableArchiveLauncher creates a ClassLoader that is used by the
Launcher to load an application’s classes. During the creation of this
ClassLoader URLs from another ClassLoader are copied over. This was
resulting in Java agents that are added to the system class loader
via the -javaagent launch option being available on both the system
class loader and the created class loader. Java agents are intended to
always be loaded by the system class loader. Making them available on
another class loader breaks this model.

This commit updates ExecutableArchiveLauncher so that it skips the URLs
of any Java agents (found by examining the JVM’s input arguments) when
copying URLs over to the new classloader, thereby ensuring that Java
agents are only ever loaded by the system class loader.

Fixes #863
2014-05-21 13:37:05 +01:00
Dave Syer
146a337b53 Ensure Mongo autoconfig is easy to exclude 2014-05-21 12:53:35 +01:00
Dave Syer
e9d594c693 Add conditional processing option for unhelpful FactoryBeans
OnBeanCondition has some issues with FactoryBean object types where
the FactoryBean is not generic (i.e. you have to instantiate it to
get its object type). This is a known issue (see tests in
ConditionalOnMissingBeanTests), but we can provide some help for
library authors who know the type in advance. The approach we have
taken here is to check the BeanDefinition for an attribute called
"factoryBeanObjectType" (OnBeanCondition.FACTORY_BEAN_OBJECT_TYPE)
which, if it exists, can be used as a tie-breaker. Its value should
be a Class<?> instance.

Fixes gh-921
2014-05-21 12:47:53 +01:00
Dave Syer
86ff5315b4 Update to Jedis 2.4.1 means commons-pool2
Fixes gh-918
2014-05-21 11:30:43 +01:00
Andy Wilkinson
75792264c0 Correct the path used to import the dependency versions .adoc file 2014-05-21 10:08:20 +01:00
Andy Wilkinson
8d2da79020 Combine maven-dependency-plugin declarations
Fixes #917
2014-05-21 10:07:31 +01:00
Andy Wilkinson
d7b100d94c Upgrade to RELEASE version of Spring Data Dijkstra release train
Closes #815
2014-05-21 09:45:33 +01:00
Andy Wilkinson
d9eeb782b8 Upgrade to Spring HATEOAS 0.12.0.RELEASE
Closes #801
2014-05-21 09:41:37 +01:00
Andy Wilkinson
00b18b114a Merge branch '1.0.x' 2014-05-21 09:14:07 +01:00
Andy Wilkinson
b9c80433bc Upgrade to Spring 4.0.5
Closes #891
2014-05-21 09:11:34 +01:00
Phillip Webb
94b8b387e8 Fix broken dependencies appendix 2014-05-21 08:52:16 +01:00
Dave Syer
7279e97e5a Add @IntegrationTest properties to Environment after system props
Fixes gh-910
2014-05-21 08:29:35 +01:00
Dave Syer
f123fd5a4a Remove reference to resolved issues in Groovy 2014-05-21 08:29:35 +01:00