Commit Graph

11406 Commits (09898308ab46a462bff0cb8750a907ebb4fe49b5)
 

Author SHA1 Message Date
Madhura Bhave 8f26dc09b7 Merge branch '1.5.x' 8 years ago
Madhura Bhave d4b52a3538 Expose Health details if user has authority
If the Princial is a Spring Security Authentication object and the
request doesn't have the right roles, check the authorities.

Fixes gh-8471
8 years ago
Stephane Nicoll c64bc2accf Merge pull request #8433 from vpavic:polish-hibernate-deps
* pr/8433:
  Remove dependency management for `hibernate-entitymanager`
8 years ago
Vedran Pavic 1c789f1a8d Remove dependency management for `hibernate-entitymanager`
Closes gh-8433
8 years ago
Andy Wilkinson 9c88ba3b90 Merge branch '1.5.x' 8 years ago
Andy Wilkinson caefb23401 Merge pull request #8465 from Dave Syer
* gh-8334:
  Polish "Allow loader.path to refer to nested jars"
  Allow loader.path to refer to nested jars
8 years ago
Andy Wilkinson 6673d8eebc Polish "Allow loader.path to refer to nested jars"
Closes gh-8334
Closes gh-8465
8 years ago
Dave Syer 3701cce88f Allow loader.path to refer to nested jars
Previously, each entry in loader.path could only refer to a standard
jar file. Refering to such a jar would add all of the classes in
the root of the jar to the class path.

This commit adds support for referencing a directory within a jar file
that contains one or more nested jars. For example:

$ java -jar -Dloader.path='jar:file:./lib.jar/!BOOT-INF/lib' my.jar

This will add all of the classes in all of that jars in the
BOOT-INF/lib directory of lib.jar to the class path.

See gh-8334
8 years ago
Andy Wilkinson 5285a8db44 Merge branch '1.5.x' 8 years ago
Madhura Bhave 605b0aefc6 Simplify validation logic in ResourceServerProperties
Closes gh-8306
Closes gh-8317
8 years ago
Stephane Nicoll cb40ea485b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 3e0e4e81b9 Polish 8 years ago
Stephane Nicoll 5cc569fc91 Improve execution speed of `CacheAutoConfigurationTests`
As of Hazelcast 3.7, the bootstrap is pretty slow by default due to the
networking discovery. This commit disables both TCP/IP and multicast
discoveries.
8 years ago
Stephane Nicoll 4edd1aeaaf Merge branch '1.5.x' 8 years ago
Stephane Nicoll 3d97ffda6e Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 3e570a3ee2 Upgrade to Spring Data Hopper.SR8
Closes gh-8443
8 years ago
Andy Wilkinson b6e8a280fd Merge branch '1.5.x' 8 years ago
Andy Wilkinson 832ab053b2 Merge pull request #8346 from Dave Syer
* gh-7221:
  Polish "Tighten up PropertiesLauncher's contract"
  Tighten up PropertiesLauncher's contract
8 years ago
Andy Wilkinson b36c8a7c24 Polish "Tighten up PropertiesLauncher's contract"
See gh-8346
Closes gh-7221
8 years ago
Dave Syer e4c807b884 Tighten up PropertiesLauncher's contract
The main changes are:

- Switch to `loader.properties` instead of `application.properties`
- Search for `loader.properties` in `loader.home` as well as in
  the classpath
- Placeholder replacements in MANIFEST.MF (using `loader.properties`
  or system/env vars)

See gh-7221
Closes gh-8346
8 years ago
Stephane Nicoll 44eaf47553 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 5278baca01 Polish 8 years ago
Stephane Nicoll ea18fe58e4 Remove useless checked exception throw clause 8 years ago
Stephane Nicoll ad9d912009 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 0d61f92479 Ignore URI when local.mongo.port is set
This commit makes sure that if `local.mongo.port` is set, a `MongoClient`
on the embedded MongoDB instance is created. When an embedded instance
is detected, only the `host` property is used and the `uri` is ignored if
set.

This makes sure that the auto-configured `MongoClient` automatically
switches to the embedded server, even if a production uri has been
specified.

Closes gh-8219
8 years ago
Stephane Nicoll 926ba47d9b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 82d4bf619d Upgrade to Spring Data Ingalls.SR1
Closes gh-8444
8 years ago
Stephane Nicoll 653fd40bb6 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 5355d6da72 Upgrade to Spring Security 4.2.2.RELEASE
Closes gh-8431
8 years ago
Stephane Nicoll ed7c6e2063 Merge branch '1.5.x' 8 years ago
Stephane Nicoll b5b69cca03 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll f3537daff4 Merge pull request #8143 from michael-simons:doc-migration
* pr/8143:
  Fix indentation
  Clarify usage of @ImportResource in doc
8 years ago
Stephane Nicoll 09205a8fc8 Fix indentation
Closes gh-8143
8 years ago
Michael J. Simons f50a0f9707 Clarify usage of @ImportResource in doc
See gh-8143
8 years ago
Stephane Nicoll f59e96cf9f Merge branch '1.5.x' 8 years ago
Stephane Nicoll ccb0e6b53a Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 3e4ed59fdf Merge pull request #8460 from garyrussell:si
* pr/8460:
  Upgrade to Spring Integration 4.3.8.RELEASE
8 years ago
Gary Russell ba9853654a Upgrade to Spring Integration 4.3.8.RELEASE
Closes gh-8460
8 years ago
Stephane Nicoll a8baa30780 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 16fb8088e9 Upgrade to Spring AMQP 1.7.1.RELEASE
Closes gh-8461
8 years ago
Phillip Webb 58ac67eb27 Merge branch '1.5.x' 8 years ago
Phillip Webb 3ee7dae09b Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb fded87225c Merge pull request #8227 from mkw/gh-8224
* pr/8227:
  Refine engine counter logic
  Polish web containers stop contribution
  Ensure web containers are stopped after close
8 years ago
Phillip Webb f1012c104a Polish 8 years ago
Phillip Webb 5aafbc2a3b Refine engine counter logic
Update counter logic to prevent negative values. Since the stop method
can now be called more than once, it was possible for the counter to
move into negative values.

See gh-8227
8 years ago
Phillip Webb 7fda9c162e Polish web containers stop contribution
See gh-8227
8 years ago
Michael K. Werle 757aa647cf Ensure web containers are stopped after close
Update `EmbeddedServletContainer` implementations to ensure that stop
can be called even if start has not. This allows servers that are
partially started during `initialize()` to still be shut down.

This commit fixes a regression caused by commit 0af53b361f.

See gh-8036
Fixes gh-8224
Closes gh-8227
8 years ago
Phillip Webb c06a9771c2 Support list based role properties
Update `HealthMvcEndpoint` to respect `ManagementServerProperties`
roles. Prior to this commit the `HealthMvcEndpoint` directly loaded
roles rather than using bound properties. This meant that list values
from yaml were not respected.

Fixes gh-8314
8 years ago
Phillip Webb 987b6c956e Polish 8 years ago
Phillip Webb 57111aba22 Get published DataSource from EntityManager
Update DataSourceInitializedPublisher to always attempt to obtain the
published DataSource directly from the EntityManager. In the case where
the EntityManager doesn't provide a DataSource, the previous logic is
used.

Fixes gh-8296
8 years ago