root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
1,643 Commits 26 Branches 365 Tags 289 MiB
Commit Graph

56 Commits

Author SHA1 Message Date
Phillip Webb 9d0ac86887 Polish 2014-03-21 11:38:46 -07:00
brockwmills 8b77a0298f Allow multiple connectors with Tomcat 
Update TomcatEmbeddedServletContainerFactory to allow for additional
containers (e.g. SSL or AJP in addition to HTTP).

Fixes gh-528
 2014-03-21 11:10:11 -07:00
Dave Syer 48636e3d6e Add additional grouping of property sources by profile 
Before this change the PropertySources loaded from external config
files were just added to the list for resolution in the order that
they were loaded. That worked for simple cases, but when there are
profiles active, and files themselves can activate profiles, it led
to users not being able to change default settings easily (either
on command line or in files, mostly in files).

The solution proposed here is to group PropertySources by profile
and resolve them in order of profile first, and then in order of
the files being loaded.

There are additional shenanigans because the order of the files
being loaded also has to be carefully defined. The rule for users
is that in a list of files to load (e.g. if set via
spring.config.location), the last one wins (natural if you think of
it as a merge of multiple maps). In addition, anything specified
by a user takes precedence over the defaults (which was broken in
some scenarios before).

Additionally, fixes profile ordering in @ConfigurationProperties(path=...)

Fixes gh-483
 2014-03-21 17:01:43 +00:00
Phillip Webb 47eb8180b3 Rename spring-boot-starter-shell -> remote-shell 
Fixes gh-462
 2014-03-21 09:05:56 -07:00
Phillip Webb 3193913899 Polish 2014-03-20 09:08:09 -07:00
Christian Dupuis d08d98492d Add Environment to shell context; disable shell banner if spring.main.show_banner is set to false 2014-03-20 15:23:24 +01:00
Christian Dupuis b760722234 Add endpoint command to shell 
fixex #461
 2014-03-20 11:05:27 +01:00
Phillip Webb a79ff19b00 Replace confusing '+' profile syntax. 
Replace the confusing `spring.profiles.active` `+` syntax with a new
`spring.profiles.include` property.

Fixes gh-483, Fixes gh-534
 2014-03-20 08:27:18 +00:00
Phillip Webb 338b32ebdb Add missing datasource properties to refdocs 
Fixes gh-504
 2014-03-19 16:47:35 -07:00
Phillip Webb 4024450c5f Rename `starter-shell-remote` to `starter-shell` 
Fixes gh-462
 2014-03-19 16:28:36 -07:00
Phillip Webb 77db6c0e06 Add YAML syntax highlighting in docs 
Also added JSON and tweaked properties settings.

Fixes gh-511
 2014-03-19 16:13:38 -07:00
Stephane Nicoll d6be3dfbb0 Add a note on maven filtering 
This commit adds a documentation note explaining how to change
the delimiters used to filter maven tokens as these conflict with the
delimiters used by Spring (i.e. ${foo:default}).
 2014-03-19 08:40:28 +00:00
Phillip Webb 24cc51c36f Fix typo 2014-03-18 20:46:13 -07:00
Phillip Webb 2929d33e37 Add links in Appendix B 
Fixes gh-491
 2014-03-18 13:17:37 -07:00
Stephane Nicoll 7813726e29 Review of the Appendix 
This commit reviews the Appendix of the Spring boot
doc, fixing mostly typos.
 2014-03-18 12:16:09 -07:00
Phillip Webb 913b6020d6 Minor doc polish 2014-03-18 11:26:15 -07:00
Phillip Webb 798229f530 Document rabbit.addresses property 2014-03-18 11:15:15 -07:00
Phillip Webb f4ebf8c80f Add clickable anchors to HTML docs 
Fixes gh-525
 2014-03-18 10:58:16 -07:00
Phillip Webb b697191e3e Format docbook css 2014-03-18 10:58:15 -07:00
Piotr Maj 2e74251d1b Add support for sorting json keys 
Add `jsonSortKeys` property to HttpMapperProperties.

Fixes gh-498
 2014-03-18 10:38:00 -07:00
Phillip Webb 5cb8e4100c Polish docs 
Minoir polish for wrapping at 90 and tabs instead of spaces.
 2014-03-18 10:23:54 -07:00
Stephane Nicoll 5ce1bdfb7f Review of the How-to part 
This commit reviews the How-to part of the Spring boot doc,
fixing mostly typos.

See gh-521
 2014-03-18 17:16:52 +00:00
Dave Syer 935131cdab Clarification regarding format of loader.path 2014-03-18 15:31:45 +00:00
Dave Syer a8ba80bbf4 Add build.gradle samples and docs for deployable WAR 
Fixes gh-518
 2014-03-18 09:29:35 +00:00
Dave Syer 9f532b653f Add docs for RestTemplates test utils 
Fixes gh-500
 2014-03-18 08:46:36 +00:00
Dave Syer d0cd1df978 Documentation for @IntegrationTest 
Fixes gh-499
 2014-03-18 08:37:04 +00:00
Phillip Webb d9de3f57bd Update test dependencies documentation 
Change working since test dependencies cannot easily be replaced.
 2014-03-17 14:30:16 -07:00
Phillip Webb 5ed6d456d2 Clarify log PID in documentation 2014-03-17 14:28:30 -07:00
Phillip Webb 156a2f5c63 Clarify YAML profile sample in documentation 2014-03-17 14:25:39 -07:00
Phillip Webb 345fa7a102 Simplify fluent builder documentation note. 2014-03-17 14:16:37 -07:00
Phillip Webb f0b6f6a516 Remove quotes from internal documentation links 
Remove quote-marks from internal documentation links and instead favor
italics.
 2014-03-17 14:14:45 -07:00
Phillip Webb 447b2be91d Fix lets -> let's in documentation 2014-03-17 13:41:56 -07:00
Stephane Nicoll 78f9afba90 Review first 8 parts of the doc 
This commit mostly fixes typos but also improves slightly specific
areas, adding links when it make sense.
 2014-03-17 12:39:30 -07:00
Dave Syer b8d85decad Fix typo 2014-03-17 08:19:21 +00:00
Phillip Webb 9f8c8c3fe7 Remove double quotes from sample in appendix B 
Fixes gh-492
 2014-03-17 00:07:53 -07:00
Phillip Webb 947b4f9d8f Add properties syntax highlighting for docs 
Fixes gh-495
 2014-03-17 00:04:57 -07:00
Phillip Webb 545f046745 Minor doc polish 2014-03-16 23:11:50 -07:00
Phillip Webb d0275b4734 Fix some broken documentation links 2014-03-15 16:02:20 -07:00
Phillip Webb 630d2ddefe Port Add Maven example for Tomcat 8 
Port Add Maven example for Tomcat 8 from markdown to asciidoc.
(originally from commit 15372cb737)
 2014-03-15 13:02:02 -07:00
Phillip Webb 9f112ff8e0 Port ViewResolver docs 
Port documentation originally added in commit b56bd0a10c
 2014-03-15 13:02:02 -07:00
Phillip Webb 72e3715ba9 Add missing main.basedir property to docs pom 2014-03-15 13:02:02 -07:00
Phillip Webb 2747c01e81 Set correct github tag for generated docs 2014-03-15 13:02:02 -07:00
Josh Long a1a62785be Add cloud deployment documentation 
Add a "cloud deployment" section to the Spring Boot reference
manual.

See gh-295
 2014-03-13 13:47:22 -07:00
Phillip Webb 7a46ed0866 Port "how-to" section to the reference manual 
Copy the existing markdown How-to readme content to the user manual,
converting to asciidoc.

See gh-295
 2014-03-13 13:47:22 -07:00
Phillip Webb 163509b5e5 Add initial reference manual documentation 
See gh-295
 2014-03-13 13:47:22 -07:00
Phillip Webb abba0d63fe Add documentation tool-chain 
Generate html, pdf and epub documentation using asciidoctor+docbook.

See gh-295
 2014-03-13 13:47:22 -07:00
Spring Buildmaster b0d4e8ae69 Next development version 2014-03-03 22:46:12 -08:00
Spring Buildmaster cb8668a151 Release version 1.0.0.RC4 2014-03-03 22:46:05 -08:00
Spring Buildmaster 1367d57e8c Next development version 2014-02-13 13:19:12 -08:00
Spring Buildmaster eaff1677a7 Release version 1.0.0.RC3 2014-02-13 13:18:56 -08:00