Commit Graph

9830 Commits (8d6c6bae9f63701d09ae4fd7ec055d4445f8b491)
 

Author SHA1 Message Date
Stephane Nicoll cc14e04b5a Merge branch '1.5.x' 8 years ago
Stephane Nicoll 980fb16d9d Merge pull request #7166 from artembilan:SI_Java_DSL_1.2.GA
* pr/7166:
  Upgrade to Spring Integration Java DSL 1.2.0.RELEASE
8 years ago
Artem Bilan c9aee66792 Upgrade to Spring Integration Java DSL 1.2.0.RELEASE
Closes gh-7166
8 years ago
Andy Wilkinson 471c13c28d Merge branch '1.5.x' 8 years ago
Andy Wilkinson 18db285ad2 Upgrade to Spring Retry 1.2.0.RC1
Closes gh-7136
8 years ago
Andy Wilkinson f48545bd57 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 899b8a04cb Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 24f8c737fb Make relative PID_FOLDER and LOG_FOLDER absolute using jar's directory
Closes gh-7092
Closes gh-7093
8 years ago
Andy Wilkinson 84c9c7bd92 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 57b7357be7 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 03deff9a1c Handle relative pid folder correctly in the launch script
Previously, a relative PID folder was not handled correctly when
running stop, status, or force_reload. This meant that a service
could be started when configured to use a relative pid file, but
then could not be stopped.

The PID folder should be treated as relative to the service's jar
file. This commit updates stop, status, and force_reload to push the
jar file's directory so that this is now the case for those three
commands.

Closes gh-7092
8 years ago
Andy Wilkinson 7c870ea4fb Merge branch '1.5.x' 8 years ago
Andy Wilkinson 29d4a01b30 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 7968c6b548 Assign on order to OnPropertyCondition
Closes gh-7144
8 years ago
Andy Wilkinson cc04621dc2 Assign an order to OnResourceCondition
Closes gh-7145
8 years ago
Andy Wilkinson d1f164e1d3 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 2137491d03 Add dependency management for spring-session-data-geode
Closes gh-7159
8 years ago
Andy Wilkinson e02de48c59 Merge branch '1.5.x' 8 years ago
Andy Wilkinson a286d61acd Start building against Spring Retry 1.2.0 snapshots
See gh-7136
8 years ago
Andy Wilkinson 4922975e00 Start building against Spring AMQP 1.6.4 snapshots
1.6.4 snapshots are required for compatibility with Spring Retry 1.2

See gh-7158
8 years ago
Phillip Webb 277d01ab53 Merge branch '1.5.x' 8 years ago
Madhura Bhave 7352d8e303 Improve EndpointHandlerMapping subclassing support
Update EndpointHandlerMapping so that it can be subclasses easily.
Subclasses can override the `path` that is used to map the endpoint,
allowing different mapping strategies to be used.

See gh-7108
8 years ago
Madhura Bhave 0be8a30276 Add EndpointHandlerMapping.getEndpoints(Class)
Add an additional method to EndpointHandlerMapping which allows
endpoints of a specific type to be returned.

See gh-7108
8 years ago
Madhura Bhave 7f1ff968a1 Support NamedMvcEndpoints
Introduce a new NamedMvcEndpoint interface which can be used when an
MvcEndpoint also has a logical name. Existing MvcEndpoints have been
reworked to implement the NamedMvcEndpoint interface.

Fixes gh-7156
8 years ago
Madhura Bhave 90722a9bca Add @ConditionalOnCloudPlatform
Add a @ConditionalOnCloudPlatform annotation that matches based on the
active ClouldPlatform.

Fixes gh-7155
8 years ago
Madhura Bhave 0f5007d69d Drop superfluous disabled check
Remove EndpointWebMvcManagementContextConfiguration `disabled` logic
since the configuration should even be processed when the management
port is `-1`.

Closes gh-7154
8 years ago
Madhura Bhave 84d0e8acd8 Fix EndpointHandlerMappingTests path references
Fix the TestEndpoint constructor to use an ID parameter rather than
path.
8 years ago
Stephane Nicoll d65a843856 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 2d995661f4 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 00a10bcf61 Restore checkstyle
Rather than disabling checkstyle altogether, this commit enables it
again, relaxing the javadoc requirement only.

See gh-7142
8 years ago
Stephane Nicoll d5c3a8ac76 Merge branch '1.5.x' 8 years ago
Stephane Nicoll c6f23000be Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 11cad9e0cb Fix sample in ref doc
Closes gh-7142
8 years ago
Stephane Nicoll b0cbe1fdc7 Merge branch '1.5.x' 8 years ago
Stephane Nicoll f254e1227f Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 0d3318796e Merge branch '1.3.x' into 1.4.x 8 years ago
Stephane Nicoll bd2956c3f0 Fix `metricsFilter` reference in doc
Closes gh-7147
8 years ago
Phillip Webb 01900c8342 Merge branch '1.5.x' 8 years ago
Phillip Webb d818a09ed8 Polish 8 years ago
Phillip Webb d3e06c4627 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb db3f488d5a Polish 8 years ago
Stephane Nicoll 264d8442da Fix build 8 years ago
Stephane Nicoll c5cc626d48 Remove remote shell support
See gh-7044
8 years ago
Stephane Nicoll 66a3df454f Merge branch '1.5.x' 8 years ago
Stephane Nicoll cfee9bab81 Deprecate remote shell support
Closes gh-7044
8 years ago
Stephane Nicoll 7f2806bd19 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 5976d44f6c Merge pull request #6666 from maciejwalkowiak:spring-amqp-idle-event-interval-property
* pr/6666:
  Polish contribution
  Add Rabbit idleEventInterval property
8 years ago
Stephane Nicoll 6fb53f90e5 Polish contribution
Closes gh-6666
8 years ago
Maciej Walkowiak 47ec8630c8 Add Rabbit idleEventInterval property
This commit adds a property to configure how often idle container events
should be published.

See gh-6666
8 years ago
Stephane Nicoll c50a352999 Merge branch '1.5.x' 8 years ago