Commit Graph

2654 Commits (29b388e6a934a01e7611e879edd08e1da1d23027)
 

Author SHA1 Message Date
Andy Wilkinson 29b388e6a9 Merge branch '1.1.x' 10 years ago
Andy Wilkinson cba50b8ee7 Upgrade to Groovy 2.3.5
Closes #1299
10 years ago
Andy Wilkinson 8583317651 Merge branch '1.1.x' 10 years ago
Andy Wilkinson bd577f1515 Rework Jetty startup so connectors are only started once
Previously the server was started to make the ServletContext
available, then, to prevent requests from being handled before the
application context had been started, the connectors were stopped.
Once application context startup had completed, the connectors were
then started again. In addition to being somewhat inefficient, this
caused problems on FreeBSD where stopping the connector didn't free
up the port quickly enough for the subsequent start to then be able
to bind to it.

This commit updates the Jetty startup logic to be closer to the logic
that's used for Tomcat. Before the server is started, the configured
connectors are cached and then removed. The server is then started
without any connectors. Once application context startup has
completed, the connectors are reinstated and started.

Fixes #968
10 years ago
Dave Syer 13c94172b0 Merge branch '1.1.x' 10 years ago
Dave Syer 8c15b13fda Change private method name 10 years ago
Dave Syer cc51296397 Merge branch '1.1.x' 10 years ago
Dave Syer 32ede50d19 Extract property sources from composite when binding
Often this change will not be important because you are binding to
a bean with strongly typed properties. A bean with a Map property,
on the other hand, won't oytherwise be able to reason about the
permitted keys so it will miss any non-enumerable property sources,
including composites whose nested sources are themselves enumerable.

Fixed gh-1294
10 years ago
Andy Wilkinson f97251b9cf Merge branch '1.1.x' 10 years ago
Andy Wilkinson f5c8a8879a Isolate CLI integration tests from any settings decryption failures 10 years ago
Andy Wilkinson 3c99bbf524 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 7bb1f7eb77 Polishing: use passed-in ssl instance rather than calling getSsl() 10 years ago
Andy Wilkinson 4d4cc076c6 Don't fail hard when settings.xml can't be decrypted by the CLI 10 years ago
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
10 years ago
Christian Dupuis d26ecbef04 Merge branch '1.1.x' 10 years ago
Christian Dupuis 68163a66a5 Change query in MongoHealthIndicator
This commit changes the query in MongoHealthIndicator from serverStatus to buildInfo to avoid unprivileged access and corresponding errors.

fixes #1289
10 years ago
Christian Dupuis 13ee41d04d Change query in MongoHealthIndicator
This commit changes the query in MongoHealthIndicator from serverStatus to buildInfo to avoid unprivileged access and corresponding errors.

fixes #1289
10 years ago
Andy Wilkinson d04f325294 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 7945b29669 Correct the descriptions of two sample projects 10 years ago
Andy Wilkinson cef1ec43a6 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 664319009c Correct the profile name in Travis configuration 10 years ago
Dave Syer d5395bfa83 Merge branch '1.1.x' 10 years ago
Dave Syer ac2ab39a54 Use class name not value to support non-Hibernate JPA vendors
With this change I got a simple Eclipselink version of the data-jpa
sample working. I'll push that when I get time to research it a bit more
(I needed to set up a Java agent so either that might be a problem
for our integration tests if we can't work around it).

Fixes gh-1268.
10 years ago
Christian Dupuis 99b3240ab2 Ensure custom HTTP code mappings for /health don't remove default mappings
Previously any custom http code mapping would remove the default mappings. With this commit the behaviour is changed so that default mappings will stay if a custom mapping is registered. Certainly a default mapping can be overridden.

fixes #1264
10 years ago
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
10 years ago
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
10 years ago
Christian Dupuis 977c5a988c Ensure custom HTTP code mappings for /health don't remove default mappings
Previously any custom http code mapping would remove the default mappings. With this commit the behaviour is changed so that default mappings will stay if a custom mapping is registered. Certainly a default mapping can be overridden.

fixes #1264
10 years ago
Dave Syer 300e570f68 Reverse priority of property sources when extracting sub properties
Fixes gh-1259
10 years ago
Dave Syer a9b8563bb6 Fix typo (fixes gh-1273) 10 years ago
Andy Wilkinson 2ca5e8e5d6 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 0a70bd44ed Correct the default Logback config location in the documentation
Fixes #1247
10 years ago
Christian Dupuis 2f28a1017c Polish and re-add author name 10 years ago
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
10 years ago
Christian Dupuis 99971a6578 Fix HTTP status code mapping in HealthMvcEndpoint
refs #1264
10 years ago
Andy Wilkinson 3145edff3a Upgrade to Spring 4.1.0 and use Yaml support that migrated from Boot
Closes #813
10 years ago
Dave Syer 890fc71967 Merge branch '1.1.x' 10 years ago
Dave Syer 4a33ab5577 Make sure ErrorPageFilter is only applied once per request
Fixes gh-1257
10 years ago
Dave Syer 8cb90a5645 Merge branch '1.1.x' 10 years ago
Dave Syer 0c52817c88 Ensure order is preserved in Rabbit addresses
Using StringUtils.commaDelimitedListToSet() does not preserve order (why?),
so we have to use commaDelimitedListToStringArray().

Fixes gh-1262
10 years ago
Stephane Nicoll 120ad56a5c Replace @ConditionalOnExpression
This commit replaces @ConditionalOnExpression instances that are
checking for a specific value to @ConditionalOnPropertyValue
10 years ago
Stephane Nicoll 270809783c Merge @ConditionalOnPropertyValue
This commit merges the features of @ConditionalOnPropertyValue
to the existing @ConditionalOnProperty.

The "match" attribute provides the value to match against. By default,
the value should not be equal to "false" which is the existing default
of @ConditionalOnProperty. "defaultMatch" specifies if the value
should be present. The default matches also the existing behavior of
@ConditionalOnProperty.

Fixes gh-1000
10 years ago
Dave Syer fc9b160a72 Merge branch '1.1.x' 10 years ago
Dave Syer 8853c7c352 Ensure properties that are not enumerable can be resolved from placeholders
Before this change a property whose key was in a non-enumerable property source would
not resolve placeholders, leading to ${style} values in @ConfigurationProperties beans
even if the placeholders ere resolvable.
10 years ago
Stephane Nicoll d7d77f3d06 Add OnPropertyValueCondition annotation
This commit adds a new conditional annotation that checks if a
property has a given value. This allows to replace constructs
such as

@ConditionalOnExpression("'${app.myProperty:foo}' == 'foo'")

to

@ConditionalOnPropertyValue(property="app.myProperty",
        value="foo", defaultMatch=true)

Which is definitely more verbose but has the following advantages:

1. Works by default if the actual property in the environment is
   a bit different (i.e. my-property)
2. Works if the value of the property has a diferent case (FoO or
   FOO would match)
3. Gives a precise reporting in the auto configuration report

The defaultMatch flag is meant to mention that the condition should
also match if the value is not set; the auto-config report would
also have an explicit report about it.

Fixes gh-1000
10 years ago
Andy Wilkinson db2b20879d Merge branch '1.1.x' 10 years ago
Andy Wilkinson 672d713f99 Add dependency management for spock-spring and document its use
Closes #1234
10 years ago
Andy Wilkinson 41ca0f604a Merge branch '1.1.x' 10 years ago
Andy Wilkinson 847627810a Merge branch '1.1.x' 10 years ago
Andy Wilkinson 124418f83f Upgrade to HikariCP 1.4.0
Closes #1220
10 years ago
Andy Wilkinson 6cac7926d9 Upgrade to Groovy 2.3.4
Closes #1224
10 years ago