Commit Graph

5742 Commits

Author SHA1 Message Date
Andrew Landsverk
487ab1a60a Prevent restart when META-INF/maven/** changes
These files are modified by Eclipse for some reason when you change files
like Thymeleaf HTML files. `META-INF/maven/**` has been added to the
default exclusion.

Closes gh-3295
Closes gh-3297
2015-06-23 14:05:25 +02:00
Dave Syer
92a6e3188b Correct Spring Data REST docs 2015-06-23 09:41:28 +01:00
Phillip Webb
0f977ce864 Polish 2015-06-23 00:47:32 -07:00
Phillip Webb
1ce617f1ae Polish sample package names 2015-06-23 00:47:12 -07:00
Phillip Webb
9c0335fc29 Merge pull request #2764 from bsodzik/1.2.x
* pr/2764:
  Add `spring.pid.fail-on-write-error` support
2015-06-22 23:44:57 -07:00
Tomasz Przybyła
becced5f0b Add spring.pid.fail-on-write-error support
Update `ApplicationPidFileWriter` to support a 'fail on write error'
properties which allows the user to exit the application if the PID
file cannot be written.

This commit also deprecates `spring.pidfile` in favor of
`spring.pid.file` so that the new property can be added without overlap.

Fixes gh-2764
2015-06-22 23:43:58 -07:00
Phillip Webb
c13ff96b78 Fix misnamed jOOQ sample module 2015-06-22 22:12:28 -07:00
Phillip Webb
d9466cfcf5 Merge pull request #2804 from aahlenst/jooq-starter
* pr/2804:
  Document jOOQ support
  Add jOOQ sample application
  Add support for jOOQ
2015-06-22 22:06:42 -07:00
Phillip Webb
7fd07b6588 Document jOOQ support
Closes gh-2804
2015-06-22 21:20:12 -07:00
Phillip Webb
ab1cc829c1 Add jOOQ sample application
See gh-2804
2015-06-22 21:20:12 -07:00
Andreas Ahlenstorf
a08b09563b Add support for jOOQ
Add auto-configuration and a starter POM for jOOQ.

See gh-2804
2015-06-22 21:20:12 -07:00
Andy Wilkinson
9da14fe62a Merge branch '1.2.x' 2015-06-22 16:27:27 +01:00
Andy Wilkinson
6fd3042462 Align servlet container error handling with executable jar/war behavior
Previously, when an exception was thrown by a Controller in an
application deployed to a servlet container the exception that was
handled would be Spring Framework’s NestedServletException rather than
the exception thrown by the application. Furthermore, when an exception
was thrown or the response was used to send an error, the
javax.servlet.error.request_uri request attribute would not be set. This
differed from the behaviour in an executable jar/war where the exception
would be the one thrown by the application, and the request_uri
attribute would be set.

This commit updates ErrorPageFilter, which is only involved in a servlet
container, to unwrap a NestedServletException so that it’s the
application’s exception that’s handled, and to set the request_uri
attribute in the event of an exception being thrown or an error being
sent.

Closes gh-3249
2015-06-22 16:27:00 +01:00
Andy Wilkinson
d3d713d0c9 Merge branch '1.2.x' 2015-06-22 15:30:15 +01:00
olivier bourgain
5ed2a9632b Make InMemoryTraceRepository thread-safe
Closes gh-3027
2015-06-22 15:30:00 +01:00
Andy Wilkinson
24ef2e506b Merge branch '1.2.x' 2015-06-22 15:24:10 +01:00
Andy Wilkinson
8681a8ad2a Map empty virtual host to "/" when parsed from an address
Previously, an address that ended in a "/" would result in the virtual
host being an empty string. This was inconsistent with setVirtualHost
which would map an empty string to "/".

This commit updates the address parsing logic to call setVirtualHost
rather than assigning the value directly to this.virtualHost. This
ensures that the special handling for an empty string is applied
consistently.

Closes gh-3304
2015-06-22 15:20:41 +01:00
Andy Wilkinson
074771ec12 Merge branch '1.2.x' 2015-06-22 14:10:35 +01:00
Andy Wilkinson
cd62596e82 Provide default for SpringApplication main class in servlet container
By default, SpringApplication attempts to deduce the application class
by looking for a main method in the stack. This does not work when
the application is launched by a servlet container via
SpringBootServletInitializer as there's either no main method in the
stack, or the main method is that of the servlet container, rather
than the application.

This commit updates SpringBootServletInitializer to configure the
main class of the SpringApplication that it creates to be the
application's SpringBootServletInitializer subclass. This is done
prior to calling configure, so the main class can still be specified
by the application if required.

Closes gh-3061
2015-06-22 14:07:40 +01:00
Andy Wilkinson
d30dd1fa98 Merge branch '1.2.x' 2015-06-22 13:44:42 +01:00
Andy Wilkinson
01ba0f7571 Make RemoteIpValve's protocolHeaderHttpsValue configurable via the env
Closes gh-3289
2015-06-22 13:44:09 +01:00
Andy Wilkinson
7d845391b0 Start building against Spring Integration 4.2.0 snapshots
See gh-3286
2015-06-22 11:01:46 +01:00
Andy Wilkinson
cd4209d863 Remove dependency management for ActiveMQ’s non-JAR modules
Closes gh-3206
2015-06-22 10:46:23 +01:00
Andy Wilkinson
ad86897c63 Provide dependency management for spring-boot-starter-artemis
Closes gh-3246
2015-06-22 10:46:22 +01:00
Andy Wilkinson
289c5d5f08 Add dependency management for sprng-session-data-redis
Closes gh-2318
2015-06-22 10:46:22 +01:00
Andy Wilkinson
db1f4891e3 Don’t rely on org.json:json being pulled in transitively
Previously, spring-boot required org.json:json to be on the compile
classpath, but it was only there by virtue of it being a transitive
dependency of another of spring-boot’s dependency. This commit makes
it clear that spring-boot has an (optional) dependency on org.json:json
by having an explicit dependency declaration for it. Additionally, the
name of the version property and the alphabetical ordering in
spring-boot-dependencies have been corrected.

Closes gh-3290
2015-06-22 10:46:22 +01:00
Stephane Nicoll
347cbb1ca4 Merge branch '1.2.x' 2015-06-22 10:44:37 +02:00
Stephane Nicoll
5f2ffdb9e2 Update SnakeYAML link
Closes gh-3302
2015-06-22 10:44:23 +02:00
Stephane Nicoll
7f3944ee2a Merge branch '1.2.x' 2015-06-21 06:40:43 +02:00
Josh Thornhill
a1e3a5a861 Fix missing space in logging message
Closes gh-3298
2015-06-21 06:40:24 +02:00
Phillip Webb
8fb0441602 Merge pull request #2913 from akonczak/master
* pr/2913:
  Enable non local node Elasticsearch instances
2015-06-19 16:24:12 -07:00
Artur Konczak
2e66f17491 Enable non local node Elasticsearch instances
Update ElasticsearchAutoConfiguration to allow `http.enabled` and
`node.local` settings to be specified by ElasticsearchProperties.

Fixes gh-2805
Closes gh-2913
2015-06-19 16:20:23 -07:00
Phillip Webb
f22c91ac94 Add chkconfig comment to launch script
Update the embedded launch script to include a `chkconfig` comment. This
solves the "Service doesn't support chkconfig" error when executing
the chkconfig command.

Fixes gh-3115
2015-06-19 15:43:05 -07:00
Phillip Webb
f65dfe4bcb Fix javadoc errors and warnings 2015-06-19 14:04:55 -07:00
Phillip Webb
890554e8d6 Exclude commons-logging from infinispan-spring4
Update `spring-boot-dependencies` to exclude `commons-logging` from
`infinispan-spring4`. The version pulled in was very old and included
a transitive dependency to `servlet-api` 2.4.

Fixes gh-3291
2015-06-19 14:02:16 -07:00
Phillip Webb
805263ac62 Add org.json:json to spring-boot-dependencies
Fixes gh-3290
2015-06-19 14:02:16 -07:00
Stephane Nicoll
2ff9299bcf Fix typo 2015-06-19 15:53:17 +02:00
Phillip Webb
8f16ebd059 Use Spring Data Gosling snapshots
Upgrade to Spring Data Gosling snapshot version in preparation for
Gosling-M2.

See gh-3288
2015-06-18 23:51:14 -07:00
Phillip Webb
a48ed907e4 Merge branch '1.2.x' 2015-06-18 23:26:14 -07:00
Phillip Webb
2b13736ae8 Merge pull request #3255 from mbenson/open-files
* gh-3255:
  Ignore failures when closing war files in tests
2015-06-18 23:25:50 -07:00
Matt Benson
38e935ee5e Ignore failures when closing war files in tests
Update WarPackagingTests to ignore any IOExceptions when closing
created war files. Exceptions were sometimes thrown when running on a
Linux NTFS mount.

Fixes gh-3255
2015-06-18 23:23:07 -07:00
Phillip Webb
3458b94612 Merge pull request #3243 from joshiste/init-improvements
* init-improvements:
  Update executable jar documentation
  Improve executable jar launch script
2015-06-18 23:11:35 -07:00
Phillip Webb
c417e90215 Update executable jar documentation
See gh-3243
2015-06-18 23:11:12 -07:00
Johannes Stelzer
f0bb60bf9d Improve executable jar launch script
Update the launch script used in fully executable jars to:

- Include LSB-Header comments
- Source `.conf` files either next to the jar for additional script
  configuration

Fixes gh-3243
2015-06-18 23:11:07 -07:00
Phillip Webb
a0dde9f17d Merge pull request #3246 from eddumelendez/gh-3154
* gh-3154:
  Document Apache Artemis support
  Add Apache Artemis Starter POM
  Add Apache Artemis support
2015-06-18 21:54:03 -07:00
Phillip Webb
3e4bbf05cd Document Apache Artemis support
See gh-3154
2015-06-18 21:00:34 -07:00
Phillip Webb
6877c4c40f Add Apache Artemis Starter POM
See gh-3154
2015-06-18 21:00:33 -07:00
Eddú Meléndez
8859824efc Add Apache Artemis support
Add auto-configuration support for Apache Artemis which was formed when
HornetQ was donated to the Apache Foundation. The majority of this code
is based on the HornetQ auto-configuration.

Fixes gh-3154
Closes gh-3246
2015-06-18 20:23:31 -07:00
Phillip Webb
e6d5d7c7ab Fix failing MongoDataAutoConfigurationTests 2015-06-18 14:44:16 -07:00
Phillip Webb
2f16a01dd5 Polish 2015-06-18 14:11:40 -07:00