Commit Graph

2181 Commits

Author SHA1 Message Date
Dave Syer f1f36cd002 Extract closure grabber into AstUtils 2014-05-25 18:58:25 +01:00
Dave Syer b71f07932e Support for explicit module path in dependency
Instead of *always* needing to pull auto-import dependencies
from the master parent pom, we now allow normal @Grab-style
module specifications, e.g. "io.ratpack:ratpack-groovy:0.9.2"
2014-05-25 18:58:07 +01:00
Stephane Nicoll 6bdc229c84 Merge pull request #949 from bclozel/fixdoc
* fixdoc:
  Fix table row format in documentation
2014-05-25 08:58:29 +02:00
Brian Clozel ddbfe187cd Fix table row format in documentation 2014-05-24 21:40:40 +02:00
Dave Syer 68448a8c68 Use the ServerProperties to add prefixes to paths
when server.servletPath is set we need to add prefixes to
the security filter paths.

Fixes gh-945
2014-05-24 08:33:14 +01:00
Dave Syer edb493044a Fix ordering problem in PropertySourcesPropertyValues
This affected @ConfigurationProperties binding whenever there
were multiple PropertySources (from any source) in the
Environment and mor ethan one carried a value for a particular
key. The rules for override are clear in Environment.getProperty()
but they were being violated by the PropertySourcesPropertyValues.

Fixes gh-916
2014-05-24 08:33:14 +01:00
Phillip Webb 28f88562f2 Make AutoConfigurationPackages.set public
Open up AutoConfigurationPackages.set(...) to allow programmatic
configuration of base packages.

Fixes gh-924
2014-05-23 22:13:25 +01:00
Phillip Webb dbf75749a9 Merge branch '1.0.x' 2014-05-23 21:27:22 +01:00
Phillip Webb 6e82e8ede8 Fix Tomcat 8 warnings and Jasper initialization
Fix MalformedURLException warnings caused by Tomcat 8 adding additional
URLs to the TomcatEmbeddedWebappClassLoader.

Add JasperInitializerLifecycleListener to call Tomcat 8's
JasperInitializer which is now required for JSP rendering.

Fixes gh-919
2014-05-23 21:25:17 +01:00
Andy Wilkinson e7f7b1c2b0 Add dependency management for remaining Spring Framework modules
spring-instrument-tomcat is deliberately not included as it is only
required with Tomcat 6 and Boot uses Tomcat 7
2014-05-23 19:07:45 +01:00
Phillip Webb a6b94e7cef Fix typo in warning 2014-05-23 18:31:52 +01:00
Andy Wilkinson 209acd9226 Merge branch '1.0.x' 2014-05-23 14:09:30 +01:00
Andy Wilkinson 7d6438ad9b Upgrade to Aether 0.9.1 2014-05-23 14:09:08 +01:00
Andy Wilkinson f21151e594 Dont’t auto-configure FreeMarker and Velocity without context-support
Boot’s auto-configuration for FreeMarker and Velocity relies on Spring’s
support for them that’s packaged in spring-context-support. Only
auto-configure them if their respective Spring classes are on the
classpath

Fixes #940
2014-05-23 11:36:25 +01:00
Dave Syer 4999d41145 Add test for servletMapping() 2014-05-23 11:05:29 +01:00
Phillip Webb 96a0d672af Rename SimpleDataSourceHealthIndicator
Rename SimpleDataSourceHealthIndicator to DataSourceHealthIndicator.
2014-05-23 10:58:40 +01:00
Phillip Webb aa03d9a41c Make Health and Status immutable
Update Health and Status objects to be immutable, update the existing
builder methods to return new instances and add static convenience
methods to Health.
2014-05-23 10:58:40 +01:00
Dave Syer 660d9e24dc Add servlet path to /error if it is customized
In addition I added some convenience methods to ServerProperties
(servletMapping() and servletPrefix()) for manipulating the
servlet path as provided by the user (e.g. normalizing it into
a valid Servlet mapping path for the DispatcherServlet).

Fixes gh-939, see also gh-936
2014-05-23 10:48:34 +01:00
Phillip Webb 8acd6fc799 Merge branch '1.0.x' 2014-05-23 10:09:42 +01:00
Phillip Webb a3c359ab84 Remove trailing whitespace 2014-05-23 10:08:55 +01:00
Henryk Konsek 42be7abacc Fix typo in Javadoc
Fixes gh-938
2014-05-23 10:08:24 +01:00
Phillip Webb 0897cfb51b Deprecate and warn on namingstrategy
Deprecate setNamingstrategy() and log a warning letting people know
that they should use `naming-strategy`.

Issue #928
2014-05-23 10:01:09 +01:00
Eric Dahl 3457cc4f39 Fix multiple typos in documentation, as well as "thread.deamon" typo in actuator 2014-05-22 21:18:08 -05:00
Christian Dupuis d20ed65c61 Update docs for new extended health support
fixes #930
2014-05-22 22:53:08 +02:00
Christian Dupuis 297d14f5f8 Polish 2014-05-22 22:44:45 +02:00
Andy Wilkinson aaa5b9ddf1 Continue to support spring.jpa.hibernate.namingstrategy
In 1.0, the property spring.jpa.hibernate.namingstrategy could be
used to configure Hibernate's naming strategy. This was at odds with
most other configuration where binding to namingStrategy would require
a property with some indication that it was two separate words, for
example: naming-strategy, naming_strategy, or namingStrategy

This commit adds a new setter, setNamingstrategy, to JpaProperties so
that an app that was using namingstrategy in 1.0 continues to work
in 1.1.

Issue #928
2014-05-22 21:24:50 +01:00
Phillip Webb 1a475102de Polish 2014-05-22 20:33:08 +01:00
Andy Wilkinson 94a255074f Upgrade to Spring Batch 3.0.0.RELEASE
Closes #906
2014-05-22 20:19:54 +01:00
Andy Wilkinson d8e783f856 Update SolrHealthIndicator to extend AbstractHealthIndicator 2014-05-22 19:51:33 +01:00
Phillip Webb 794808b6b8 Various improvements to the Gradle plugin
Refactor and rework several areas of the Gradle plugin:

- Refactor package structure into functional areas and configure each
  area separately via a new PluginFeatures interface.
- Convert BootRunTask to extend RunTask rather than attempting to
  find existing RunTasks.
- Simplify agent integration by no longer needing specific BootRunTask
  code.
- Update the repackage task to consider the `mainClassName` property
  in addition to `springBoot.mainClass`.
- Automatically set `mainClassName` when calling `run` or `runBoot`
  from `springBoot.mainClass` if there is one.
- Ensure that explicitly defined `main` options on JavaExec tasks always
  take precedence.

Fixes gh-547, gh-820, gh-886, gh-912
2014-05-22 18:08:22 +01:00
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