Commit Graph

9146 Commits (9057f9ae1fdebda916d009f43067d9f3999c7109)
 

Author SHA1 Message Date
Johnny Lim 0efa0038c3 Polish
Closes gh-5815
9 years ago
Stephane Nicoll 373cf83f99 Merge branch '1.3.x' 9 years ago
Cristian Greco 5d55d57f78 Fix doc about running native commands
Closes gh-5829
9 years ago
Stephane Nicoll ebb4b067a2 Use error attributes in custom error page 9 years ago
Phillip Webb 6d069de79f Add convention based status error pages
Update `spring-boot-sample-web-mustache` to show how convention based
status error pages can be used.

See gh-2691
9 years ago
Phillip Webb 0bf025af7b Add out-of-the-box support for status error pages
Allow convention based status error pages. Static HTML or templates
can be used by placing the appropriately named file under a `/error`
folder. For example:

	/src/main/resource/templates/error/404.ftl
or	/src/main/resource/public/error/404.html

Pages can also be named after the status series (5xx or 4xx).

Fixes gh-2691
9 years ago
Stephane Nicoll 0bd246a3ed Add reference to RESTEasy starter
Closes gh-5816
9 years ago
Phillip Webb 590bd5c084 Fixup warnings 9 years ago
Phillip Webb 08ef5f4b1f Make ErrorPageRegistry first class concern
Create ErrorPageRegistry and ErrorPageRegistrar interfaces that allow
error page registration to be a first class concern.

Prior to this commit ErrorPageFilter needed to implement
ConfigurableEmbeddedServletContainer in order to receive ErrorPage
registrations.

Closes gh-5789
9 years ago
Phillip Webb 609cb52cd4 Move to relocated web classes
Refactor code to move from recently deprecated classes.

Closes gh-5822
9 years ago
Phillip Webb aea18671c1 Restructure web related classes
Reorganize web related classes for better separation of concerns.
Mainly this involves moving classes from `o.s.b.context.embedded`
that aren't directly tied to embedded servlet containers to
`o.s.b.web` and relocating everything from `o.s.b.context.web`.

See gh-5822
9 years ago
Phillip Webb a7cb689f95 Move @LocalServerPort annotation
Move the @LocalServerPort to org.springframework.boot.context.embedded
since it's only really useful when working with embedded servlet
containers.

See gh-5822
9 years ago
Phillip Webb 3de48d2603 Refactor ServletComponentRegisteringPostProcessor
Rework ServletComponentRegisteringPostProcessor to break the direct link
to the `org.springframework.boot.context.embedded` package.

See gh-5822
9 years ago
Andy Wilkinson 9153ca9526 Auto-configure MockMvc with Spring Security
When Spring Security and its spring-security-test module are on the
classpath, `@WebMvcTest` will now auto-configure Spring Security and
configure its MockMvc-based test support. This behaviour can be
disabled using the new secure attribute on `@WebMvcTest` and
`@AutoConfigureMockMvc`.

Closes gh-5476
9 years ago
Andy Wilkinson 41ddda4a15 Support the use of @AliasFor with @PropertyMapping
Previously, when @AliasFor was used, the value of the mapped property
would be incorrect as the value of the canonical attribute would be
used, rather than the value of the alias.

This commit updates AnnotationsPropertySource to use a merged annotation
as the source of attribute values, thereby ensuring that any aliased
attributes are configured correctly.

Closes gh-5821
9 years ago
Phillip Webb f468aff47f Merge remote-tracking branch '1.3.x' 9 years ago
Phillip Webb ef7b511b0e Polish 9 years ago
Andy Wilkinson 34b6915607 Consider meta-annotations when creating an AnnotationsPropertySource
Previously, meta-annotations were not considered when looking for
annotations that may have property mappings but were considered when
looking for a `@PropertyMapping` annotation. This led to three
problems:

1. Properties that should have been included in the property source
   were not included
2. Properties that were included may have had the wrong name
3. Properties were included when they should not have been

`@DataJpaTests` provided a concrete example of all three problems:

1. The `replace` and `connection` attributes from
   `@AutoConfigureTestDatabase` were not included in the property
   source
2. The `showSql` attribute from `@DataJpaTest` was mapped as
   `spring.test.database.spring.jpa.show-sql`
3. The `useDefaultFilters` attribute from `@DataJpaTest` was included
   in the property source.

This commit updates AnnotationsPropertySource to consider
meta-annotations when looking for attributes that should be mapped.
This addresses the first problem. Furthermore,
AnnotationsPropertySource has been updated to no longer consider
meta-annotations when looking for a type-level property mapping.
This addresses the second and third problems.

Closes gh-5794
9 years ago
Dave Syer ebb0ff8638 Merge remote-tracking branch 'origin/1.3.x' 9 years ago
Dave Syer 9c0679b1f4 Add support for spring.rabbitmq.ssl.algorithm
Rabbit client 3.6.* uses TLSv1.1 as the default algorithm which
many brokers are deisabling these days. Spring AMQP supports
changing the algorithm by name, so this is just a pass thru for
that.
9 years ago
Stephane Nicoll c85948ac0c Fix cache sample README
Closes gh-5800
9 years ago
Stephane Nicoll 4c877a67a2 Fix cache sample README
Closes gh-5807
9 years ago
Phillip Webb b8df4d454b Merge pull request #5806 from eddumelendez/gh-5800
* pr/5806:
  Fix spring-boot-sample-cache Infinispan example
9 years ago
Eddú Meléndez 81bf3867e3 Fix spring-boot-sample-cache Infinispan example
Closes gh-5800
Closes gh-5806
9 years ago
Phillip Webb 628cbcda5b Merge pull request #5807 from eddumelendez/polish-cache-sample
* pr/5807:
  Polish spring-boot-sample-cache README
9 years ago
Eddú Meléndez 7b9844f5de Polish spring-boot-sample-cache README
Closes gh-5807
9 years ago
Phillip Webb a2357e9050 Merge pull request #5809 from Shredder121/ansi-colors-test-move
* pr/5809:
  Move AnsiColorsTests to `src/test/java`
9 years ago
Ruben Dijkstra 36c0ceb92a Move AnsiColorsTests to `src/test/java`
Closes gh-5809
9 years ago
Phillip Webb 5df935a251 Merge pull request #5812 from fabriziocucci/patch-2
* pr/5812:
  Fix spring-boot-sample-data-neo4j description
9 years ago
Fabrizio Cucci c51efda2dc Fix spring-boot-sample-data-neo4j description
Replace "Redis" with "Neo4j".

Closes gh-5812
9 years ago
Andy Wilkinson aee3833351 Merge branch '1.3.x' 9 years ago
Andy Wilkinson 71fddc51df Upgrade to Spring Batch 3.0.7.RELEASE
Closes gh-5166
9 years ago
Stephane Nicoll 2cd68284fd Add reference to ff4j starter 9 years ago
Stephane Nicoll 93c495f69a Remove pid file
This shouldn't have been committed.
9 years ago
Phillip Webb 53d9aa60e1 Merge pull request #4836 from joshiste/issue-4255
* pr/4836:
  Add external-file-property to LogFileMvcEndpoint
9 years ago
Johannes Edmeier 49ef93602e Add external-file-property to LogFileMvcEndpoint
Add an additional property to LogFileMvcEndpoint to allow log files to
be read from an external location. This is helpful when a launch.script
is used to start the boot-application and the logfile is written by a
redirect of stdout/stderr.

Fixes gh-4255
Closes gh-4836
9 years ago
Phillip Webb 79c163c64e Merge pull request #5453 from cjstehno/master
* pr/5453:
  Fix remote shell to support custom banners
9 years ago
cjstehno 309f8484a7 Fix remote shell to support custom banners
Update the remote shell to use the `Banner` interface when possible.

Fixes gh-3988
Closes gh-5453
9 years ago
Phillip Webb b567959482 Add support for dynamic SSL key stores
Add a SslStoreProvider interface that can be used to load key and trust
stores from non file locations.

Fixes gh-5208
9 years ago
Phillip Webb 2679a6f0c6 Polish 9 years ago
Stephane Nicoll ad5674cbb0 Merge branch '1.3.x' 9 years ago
Stephane Nicoll ac8e87d79f Polish contribution
Closes gh-5782
9 years ago
Venil Noronha d5554e0aa1 Use static-locations properties to locate favicon
Closes gh-5751
9 years ago
Stephane Nicoll 1ef3327441 Move multipart.* properties to spring.http.multipart.*
Closes gh-3044
9 years ago
Stephane Nicoll 5f41e82a89 Merge branch '1.3.x' 9 years ago
Stephane Nicoll 247685e992 Add missing `@Documented`
Closes gh-5786
9 years ago
Stephane Nicoll 4cc559ae85 Merge pull request #5798 from izeye/polish-20160426
* pr/5798:
  Polish
9 years ago
Johnny Lim db2092e27d Polish
Closes gh-5798
9 years ago
Stephane Nicoll 34e3e3c820 Merge pull request #5797 from artembilan/SI-4.3.0.M2
* pr/5797:
  Upgrade to Spring Integration 4.3.0.M2
9 years ago
Artem Bilan 6be4ec2af5 Upgrade to Spring Integration 4.3.0.M2
Closes gh-5797
9 years ago