Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,036 Commits 23 Branches 0 Tags
899b8a04cbaf1810f3379cf886c5d8e2be21fc70
Commit Graph

9036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
899b8a04cb Merge branch '1.4.x' into 1.5.x 2016-10-14 09:20:02 +01:00
Andy Wilkinson
24f8c737fb Make relative PID_FOLDER and LOG_FOLDER absolute using jar's directory 
Closes gh-7092
Closes gh-7093
 2016-10-14 09:19:11 +01:00
Andy Wilkinson
57b7357be7 Merge branch '1.4.x' into 1.5.x 2016-10-13 16:55:21 +01:00
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
 2016-10-13 16:51:54 +01:00
Andy Wilkinson
29d4a01b30 Merge branch '1.4.x' into 1.5.x 2016-10-13 12:30:05 +01:00
Andy Wilkinson
7968c6b548 Assign on order to OnPropertyCondition 
Closes gh-7144
 2016-10-13 12:29:35 +01:00
Andy Wilkinson
cc04621dc2 Assign an order to OnResourceCondition 
Closes gh-7145
 2016-10-13 12:27:47 +01:00
Andy Wilkinson
2137491d03 Add dependency management for spring-session-data-geode 
Closes gh-7159
 2016-10-13 09:55:45 +01:00
Andy Wilkinson
a286d61acd Start building against Spring Retry 1.2.0 snapshots 
See gh-7136
 2016-10-13 09:22:10 +01:00
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
 2016-10-13 09:22:10 +01:00
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
 2016-10-12 13:32:39 -07:00
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
 2016-10-12 13:32:38 -07:00
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
 2016-10-12 13:32:38 -07:00
Madhura Bhave
90722a9bca Add @ConditionalOnCloudPlatform 
Add a @ConditionalOnCloudPlatform annotation that matches based on the
active ClouldPlatform.

Fixes gh-7155
 2016-10-12 13:32:37 -07:00
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
 2016-10-12 12:19:35 -07:00
Madhura Bhave
84d0e8acd8 Fix EndpointHandlerMappingTests path references 
Fix the TestEndpoint constructor to use an ID parameter rather than
path.
 2016-10-12 12:19:35 -07:00
Stephane Nicoll
2d995661f4 Merge branch '1.4.x' into 1.5.x 2016-10-12 10:37:26 +02:00
Stephane Nicoll
00a10bcf61 Restore checkstyle 
Rather than disabling checkstyle altogether, this commit enables it
again, relaxing the javadoc requirement only.

See gh-7142
 2016-10-12 10:37:15 +02:00
Stephane Nicoll
c6f23000be Merge branch '1.4.x' into 1.5.x 2016-10-12 10:30:19 +02:00
Stephane Nicoll
11cad9e0cb Fix sample in ref doc 
Closes gh-7142
 2016-10-12 10:27:51 +02:00
Stephane Nicoll
f254e1227f Merge branch '1.4.x' into 1.5.x 2016-10-12 10:03:59 +02:00
Stephane Nicoll
0d3318796e Merge branch '1.3.x' into 1.4.x 2016-10-12 10:03:41 +02:00
Stephane Nicoll
bd2956c3f0 Fix metricsFilter reference in doc 
Closes gh-7147
 2016-10-12 10:03:23 +02:00
Phillip Webb
d818a09ed8 Polish 2016-10-11 23:38:14 -07:00
Phillip Webb
d3e06c4627 Merge branch '1.4.x' into 1.5.x 2016-10-11 21:46:06 -07:00
Phillip Webb
db3f488d5a Polish 2016-10-11 17:54:00 -07:00
Stephane Nicoll
cfee9bab81 Deprecate remote shell support 
Closes gh-7044
 2016-10-11 17:39:28 +02:00
Stephane Nicoll
5976d44f6c Merge pull request #6666 from maciejwalkowiak:spring-amqp-idle-event-interval-property 
* pr/6666:
  Polish contribution
  Add Rabbit idleEventInterval property
 2016-10-11 17:03:59 +02:00
Stephane Nicoll
6fb53f90e5 Polish contribution 
Closes gh-6666
 2016-10-11 17:03:10 +02:00
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
 2016-10-11 15:49:10 +02:00
Stephane Nicoll
ea3deae010 Merge pull request #6645 from plamentotev:maven-run-work-dir 
* pr/6645:
  Polish contribution
  Add workingDirectory option for Maven plugin run/start
 2016-10-11 15:36:51 +02:00
Stephane Nicoll
28ed59ca6e Polish contribution 
Closes gh-6645
 2016-10-11 15:36:35 +02:00
Plamen Totev
3cccc732df Add workingDirectory option for Maven plugin run/start 
Add configuration option that specifies the working directory to use to
run/start the application via the Maven plugin.

Closes gh-6243
 2016-10-11 15:36:27 +02:00
Andy Wilkinson
f0b235cbc5 Merge branch '1.4.x' into 1.5.x 2016-10-11 13:04:59 +01:00
Andy Wilkinson
0333416952 Update WelcomePageHandlerMapping to handle reqs with no Accept header 
Closes gh-7138
 2016-10-11 13:02:36 +01:00
Stephane Nicoll
18c3d42f45 Merge branch '1.4.x' into 1.5.x 2016-10-11 08:32:43 +02:00
Stephane Nicoll
b1d2552ede Merge pull request #7137 from michael-simons:polish_application-properties-docs 
* pr/7137:
  Add missing parentheses
 2016-10-11 08:31:59 +02:00
Michael J. Simons
e87cf937e1 Add missing parentheses 
Closes gh-7137
 2016-10-11 08:31:44 +02:00
Stephane Nicoll
98f14f2ee9 Polish documentation 
Closes gh-2642
 2016-10-11 08:30:18 +02:00
Stephane Nicoll
0c9015fdb7 Merge pull request #6571 from herau:master 
* pr/6571:
  Polish contribution
  Manage Tomcat queued connections
 2016-10-10 11:37:38 +02:00
Stephane Nicoll
ab2a2579c8 Polish contribution 
Closes gh-6571
 2016-10-10 11:37:21 +02:00
Aurélien Leboulanger
7efdb91641 Manage Tomcat queued connections 
Adding two tomcat server properties:
- server.tomcat.accept-count
- server.tomcat.max-connections

Closes gh-6433
 2016-10-10 11:37:12 +02:00
Stephane Nicoll
d5b2f67b5f Merge pull request #6543 from vpavic:database-initializers 
* pr/6543:
  Polish contribution
  Improve database initializers
 2016-10-10 10:43:29 +02:00
Stephane Nicoll
3e1425ebed Polish contribution 
Closes gh-6543
 2016-10-10 10:43:12 +02:00
Vedran Pavic
286a928347 Improve database initializers 
This commit improves database initializers for Spring Batch and Spring
Session by introducing `AbstractDatabaseInitializer` which eliminates
duplicated logic in existing initializers. Additionally, database
platform resolution now relies on `DatabaseDriver`.

See gh-6543
 2016-10-10 09:53:40 +02:00
Andy Wilkinson
d2d911ba94 Merge branch '1.4.x' into 1.5.x 2016-10-07 17:08:20 +01:00
Andy Wilkinson
a5b4c8e6db Make cycle clearer in bean currently in creation failure analysis 
Note: the fully-qualified references to @Configuration in some of the
test configuration classes are required to work around a bug in javac.
1.8.0_102 (and earlier). Without them, compilation fails as it cannot
resolve the symbol despite the import statement and the unqualified
references working elsewhere in the same source file.

Closes gh-7056
 2016-10-07 17:07:44 +01:00
Stephane Nicoll
98b30416ca Merge branch '1.4.x' into 1.5.x 2016-10-07 14:21:28 +02:00
Stephane Nicoll
9861cb7e9c Expand the note regarding LiveReload 
See gh-7080
 2016-10-07 14:21:12 +02:00
Stephane Nicoll
5435f03690 Merge branch '1.4.x' into 1.5.x 2016-10-07 14:15:19 +02:00